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

Jump to bottom

Wraped the demo pages in a scrollviewer for a better user expierience #3523

Merged
merged 4 commits into from
Jun 5, 2019
Merged

Wraped the demo pages in a scrollviewer for a better user expierience #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3715b3b
Wraped the demo pages in a scrollviewer for a better user expierience
timunie Jun 5, 2019
0fbc51d
(GH-3521) Improve the ScrollViewer usage
punker76 Jun 5, 2019
2bcff8c
Add Improvement to GitReleaseManager
punker76 Jun 5, 2019
26092b0
(GH-3521) Workaround for RichTextBox behaves oddly inside a ScrollViewer
punker76 Jun 5, 2019
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
1 change: 1 addition & 0 deletions GitReleaseManager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ issue-labels-include:
- Bug
- Feature
- Feature Request
- Improvement
issue-labels-exclude:
- Internal Refactoring
- Build
Expand Down
74 changes: 36 additions & 38 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,43 +11,41 @@
d:DesignWidth="800"
mc:Ignorable="d">

<ScrollViewer Margin="15">
<ItemsControl Margin="5"
Grid.IsSharedSizeScope="True"
ItemsSource="{Binding BrushResources}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid MinHeight="40"
Margin="0 5"
ToolTip="{Binding}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" SharedSizeGroup="BrushHex" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Ellipse x:Name="BrushResource"
Grid.Column="0"
Width="30"
Height="30"
Stroke="{DynamicResource GrayBrush2}">
<i:Interaction.Behaviors>
<behaviors:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
</i:Interaction.Behaviors>
</Ellipse>
<TextBlock Grid.Column="1"
Margin="10"
VerticalAlignment="Center"
FontSize="{DynamicResource NormalFontSize}"
Text="{Binding ElementName=BrushResource, Path=(Shape.Fill)}" />
<TextBlock Grid.Column="2"
Margin="10"
VerticalAlignment="Center"
FontSize="{DynamicResource NormalFontSize}"
Text="{Binding}" />
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
<ItemsControl Margin="10"
Grid.IsSharedSizeScope="True"
ItemsSource="{Binding BrushResources}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Grid MinHeight="40"
Margin="0 5"
ToolTip="{Binding}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" SharedSizeGroup="BrushHex" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Ellipse x:Name="BrushResource"
Grid.Column="0"
Width="30"
Height="30"
Stroke="{DynamicResource GrayBrush2}">
<i:Interaction.Behaviors>
<behaviors:BindableResourceBehavior ResourceName="{Binding}" Property="{x:Static Shape.FillProperty}" />
</i:Interaction.Behaviors>
</Ellipse>
<TextBlock Grid.Column="1"
Margin="10"
VerticalAlignment="Center"
FontSize="{DynamicResource NormalFontSize}"
Text="{Binding ElementName=BrushResource, Path=(Shape.Fill)}" />
<TextBlock Grid.Column="2"
Margin="10"
VerticalAlignment="Center"
FontSize="{DynamicResource NormalFontSize}"
Text="{Binding}" />
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>

</UserControl>
406 changes: 201 additions & 205 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml
View file
Open in desktop

Large diffs are not rendered by default.

524 changes: 270 additions & 254 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml
View file
Open in desktop

Large diffs are not rendered by default.

1,850 changes: 923 additions & 927 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 53 additions & 55 deletions src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,65 +102,63 @@
</ResourceDictionary>
</UserControl.Resources>

<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid>

<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>


<Label Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
HorizontalAlignment="Left"
Content="Simple SplitView example"
Style="{DynamicResource DescriptionHeaderStyle}" />

<ContentControl Grid.Row="1"
Grid.Column="0"
Margin="10 5 5 5"
DataContext="{Binding ElementName=SimpleSplitview}"
Template="{StaticResource ConfigDataTemplate}" />

<controls:SplitView x:Name="SimpleSplitview"
Grid.Row="1"
Grid.Column="1"
Margin="5"
DisplayMode="Inline"
IsPaneOpen="True"
OpenPaneLength="150"
PaneBackground="Red"
PaneClosing="Splitview_PaneClosing">
<controls:SplitView.Pane>
<Grid Margin="48 0 0 0" Background="LightGreen">
<TextBlock Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
Foreground="White"
Text="Pane content area"
TextWrapping="Wrap" />
</Grid>
</controls:SplitView.Pane>

<Grid Background="CornflowerBlue">
<TextBlock Margin="20"
<Grid>

<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>


<Label Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="2"
HorizontalAlignment="Left"
Content="Simple SplitView example"
Style="{DynamicResource DescriptionHeaderStyle}" />

<ContentControl Grid.Row="1"
Grid.Column="0"
Margin="10 5 5 5"
DataContext="{Binding ElementName=SimpleSplitview}"
Template="{StaticResource ConfigDataTemplate}" />

<controls:SplitView x:Name="SimpleSplitview"
Grid.Row="1"
Grid.Column="1"
Margin="5"
DisplayMode="Inline"
IsPaneOpen="True"
OpenPaneLength="150"
PaneBackground="Red"
PaneClosing="Splitview_PaneClosing">
<controls:SplitView.Pane>
<Grid Margin="48 0 0 0" Background="LightGreen">
<TextBlock Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
Foreground="White"
Text="This is the main content area and should be blue"
Text="Pane content area"
TextWrapping="Wrap" />
</Grid>

</controls:SplitView>
</Grid>
</ScrollViewer>
</controls:SplitView.Pane>

<Grid Background="CornflowerBlue">
<TextBlock Margin="20"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="20"
Foreground="White"
Text="This is the main content area and should be blue"
TextWrapping="Wrap" />
</Grid>

</controls:SplitView>
</Grid>
</UserControl>
Loading