Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFC] [WIP] HamburgerMenu Scrolling #2892

Closed
wants to merge 6 commits into from
Closed

[RFC] [WIP] HamburgerMenu Scrolling #2892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1239ffc
Merge pull request #1 from MahApps/develop
amkuchta Mar 15, 2017
ffc5aec
Updates HamburgerView.xaml to address #2857 [WIP]
amkuchta Mar 15, 2017
3819d6c
[WIP] Adding Exterior floating watermark goodness... ComboBoxes are w…
amkuchta Mar 16, 2017
7662361
Updates to enable users to move floating watermarks to the exterior o…
amkuchta Mar 16, 2017
66616f4
Merge pull request #2 from amkuchta/watermark-enhancement
amkuchta Mar 16, 2017
f5cefb6
Merge branch 'develop' into develop
amkuchta Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...Metro.Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/DateExamples.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
HorizontalAlignment="Center"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.Watermark="Select a date" />
<DatePicker Width="200"
Margin="0, 10, 0, 0"
HorizontalAlignment="Center"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.Watermark="Exterior Floating Watermark"
Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"/>
<DatePicker Width="200"
Margin="0, 10, 0, 0"
HorizontalAlignment="Center"
Expand Down Expand Up @@ -169,6 +175,15 @@
Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
Controls:TextBoxHelper.UseFloatingWatermark="True"/>
<Controls:DateTimePicker Margin="0,5" Culture="{Binding Path=SelectedItem, ElementName=DateTimePickerCulture, TargetNullValue={x:Static globalization:CultureInfo.CurrentCulture}}"
HandVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerHandVisibility, Mode=TwoWay}"
IsClockVisible="{Binding Path=IsChecked, ElementName=DateTimePickerIsClockVisible, Mode=TwoWay}"
IsEnabled="{Binding Path=IsChecked, ElementName=DateTimePickerIsEnabled, Mode=TwoWay}"
IsReadOnly="{Binding Path=IsChecked, ElementName=DateTimePickerIsReadOnly, Mode=TwoWay}"
Orientation="{Binding Path=SelectedItem, ElementName=DateTimePickerOrientation, Mode=TwoWay}"
PickerVisibility="{Binding Path=SelectedItem, ElementName=DateTimePickerPickerVisibility, Mode=TwoWay}"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"/>
<GroupBox Header="Current time">
<StackPanel>
<Controls:DateTimePicker x:Name="DateTimePicker"
Expand Down
86 changes: 66 additions & 20 deletions ....Samples/MahApps.Metro.Demo/MahApps.Metro.Demo.Shared/ExampleViews/SelectionExamples.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
xmlns:MetroDemo="clr-namespace:MetroDemo"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}"
d:DesignHeight="600"
d:DesignWidth="800"
d:DataContext="{d:DesignInstance MetroDemo:MainWindowViewModel}">
mc:Ignorable="d">

<TabControl Margin="10" TabStripPlacement="Left">
<TabControl Margin="10"
TabStripPlacement="Left">
<TabItem Header="List/GridView">
<UniformGrid Rows="2" Columns="2">
<UniformGrid Columns="2"
Rows="2">
<ListView Margin="5"
BorderThickness="0"
SelectedIndex="0"
Expand All @@ -39,8 +41,10 @@
Style="{StaticResource VirtualisedMetroListView}">
<ListView.View>
<GridView>
<GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="artist" />
<GridViewColumn DisplayMemberBinding="{Binding ArtistId}"
Header="ID" />
<GridViewColumn DisplayMemberBinding="{Binding Name}"
Header="artist" />
</GridView>
</ListView.View>
</ListView>
Expand All @@ -52,16 +56,19 @@
Style="{StaticResource VirtualisedMetroListView}">
<ListView.View>
<GridView>
<GridViewColumn DisplayMemberBinding="{Binding ArtistId}" Header="ID" />
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="artist" />
<GridViewColumn DisplayMemberBinding="{Binding ArtistId}"
Header="ID" />
<GridViewColumn DisplayMemberBinding="{Binding Name}"
Header="artist" />
</GridView>
</ListView.View>
</ListView>
</UniformGrid>
</TabItem>
<TabItem Header="TreeView">
<UniformGrid Rows="2">
<TreeView ItemsSource="{Binding Artists}" Style="{StaticResource VirtualisedMetroTreeView}">
<TreeView ItemsSource="{Binding Artists}"
Style="{StaticResource VirtualisedMetroTreeView}">
<TreeView.ItemTemplate>
<HierarchicalDataTemplate ItemsSource="{Binding Albums}">
<TextBlock Text="{Binding Name}" />
Expand All @@ -86,8 +93,10 @@
<TreeViewItem Header="Item 3"
IsExpanded="True"
IsSelected="True">
<TreeViewItem Header="Item 3.1" IsExpanded="True">
<TreeViewItem Header="Item 3.1.1" IsExpanded="True" />
<TreeViewItem Header="Item 3.1"
IsExpanded="True">
<TreeViewItem Header="Item 3.1.1"
IsExpanded="True" />
<TreeViewItem Header="Item 3.1.2" />
</TreeViewItem>
<TreeViewItem Header="Item 3.2" />
Expand All @@ -97,7 +106,8 @@
</UniformGrid>
</TabItem>
<TabItem Header="ListBox">
<UniformGrid Columns="2" Rows="2">
<UniformGrid Columns="2"
Rows="2">
<ListBox Margin="1"
DisplayMemberPath="Name"
ItemsSource="{Binding Artists}"
Expand Down Expand Up @@ -127,9 +137,10 @@
</UniformGrid>
</TabItem>
<TabItem Header="ComboBox">
<StackPanel HorizontalAlignment="Left" Orientation="Vertical">
<StackPanel HorizontalAlignment="Left"
Orientation="Vertical">
<ComboBox Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
Controls:TextBoxHelper.ClearTextButton="True"
Controls:TextBoxHelper.Watermark="Please select an item..."
SelectedIndex="0">
Expand All @@ -144,10 +155,44 @@
<ComboBoxItem Content="Item 4" />
</ComboBox>
<ComboBox Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
Controls:TextBoxHelper.ClearTextButton="True"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
Controls:TextBoxHelper.Watermark="Exterior Floating..."
SelectedIndex="0">
<ComboBox.ContextMenu>
<ContextMenu>
<MenuItem Header="Test" />
</ContextMenu>
</ComboBox.ContextMenu>
<ComboBoxItem Content="Item 1" />
<ComboBoxItem Content="Item 2" />
<ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />
<ComboBoxItem Content="Item 4" />
</ComboBox>
<ComboBox Width="200"
Margin="0,10,0,0"
Controls:TextBoxHelper.ClearTextButton="True"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.Watermark="Editable..."
IsEditable="True"
SelectedIndex="0">
<ComboBox.ContextMenu>
<ContextMenu IsEnabled="False"
Visibility="Collapsed" />
</ComboBox.ContextMenu>
<ComboBoxItem Content="Item 1" />
<ComboBoxItem Content="Item 2" />
<ComboBoxItem Content="Very long Item 3 for MahApps.Metro" />
<ComboBoxItem Content="Item 4" />
</ComboBox>
<ComboBox Width="200"
Margin="0,10,0,0"
Controls:TextBoxHelper.ClearTextButton="True"
Controls:TextBoxHelper.FloatingWatermarkLocation="Exterior"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.Watermark="Editable (Exterior Watermark)..."
IsEditable="True"
SelectedIndex="0">
<ComboBox.ContextMenu>
Expand All @@ -160,7 +205,7 @@
<ComboBoxItem Content="Item 4" />
</ComboBox>
<ComboBox Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
Controls:TextBoxHelper.UseFloatingWatermark="True"
Controls:TextBoxHelper.Watermark="Autocompletion"
DisplayMemberPath="Title"
Expand All @@ -171,7 +216,7 @@
Text="{Binding Path=Title}" />
<ComboBox x:Name="groupingComboBox"
Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
Controls:ComboBoxHelper.EnableVirtualizationWithGrouping="True"
Controls:TextBoxHelper.Watermark="Autocompletion with grouping/virtualization"
DisplayMemberPath="Title"
Expand All @@ -191,7 +236,7 @@
</ComboBox.GroupStyle>
</ComboBox>
<ComboBox Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
IsEnabled="False"
SelectedIndex="0">
<ComboBoxItem Content="Item 1" />
Expand All @@ -200,13 +245,14 @@
<ComboBoxItem Content="Item 4" />
</ComboBox>
<ComboBox Width="200"
Margin="0, 10, 0, 0"
Margin="0,10,0,0"
Controls:TextBoxHelper.Watermark="Autocompletion"
DisplayMemberPath="Title"
IsEditable="True"
IsEnabled="False"
ItemsSource="{Binding Albums}"
Text="{Binding Path=Title, Mode=TwoWay}" />
Text="{Binding Path=Title,
Mode=TwoWay}" />
</StackPanel>
</TabItem>
</TabControl>
Expand Down
Loading