From 3715b3bdfd5ec567c6ef6bc8e5239db88d59127f Mon Sep 17 00:00:00 2001 From: timunie <47110241+timunie@users.noreply.github.com> Date: Wed, 5 Jun 2019 18:01:15 +0200 Subject: [PATCH 1/4] Wraped the demo pages in a scrollviewer for a better user expierience Added scollviewer wirh Scrollbarvisibility set to Auto, except for the item-controls. There the vertical scrollviewer is set to disabled to prevent an infinite long page --- .../MahApps.Metro.Demo/MainWindow.xaml | 65 +++++++++++++++---- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml index 85ce7042c9..54f6063d7b 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml @@ -239,43 +239,82 @@ - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + From 0fbc51d527d1c218264d4bbaecf7bacf87f63d45 Mon Sep 17 00:00:00 2001 From: punker76 Date: Wed, 5 Jun 2019 22:19:20 +0200 Subject: [PATCH 2/4] (GH-3521) Improve the ScrollViewer usage --- .../ExampleViews/ColorExample.xaml | 74 +- .../ExampleViews/ProgressBars.xaml | 406 ++-- .../ExampleViews/SelectionExamples.xaml | 524 ++--- .../ExampleViews/Sliders.xaml | 1850 ++++++++--------- .../ExampleViews/SplitViewExamples.xaml | 108 +- .../ExampleViews/TabControlExamples.xaml | 747 ++++--- .../ExampleViews/TilesExample.xaml | 164 +- .../MahApps.Metro.Demo/MainWindow.xaml | 64 +- src/MahApps.Metro/Themes/MetroTabControl.xaml | 21 +- 9 files changed, 1976 insertions(+), 1982 deletions(-) diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml index bc197ac42b..c46073acef 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ColorExample.xaml @@ -11,43 +11,41 @@ d:DesignWidth="800" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml index 97869ce86d..f9a571feb8 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ProgressBars.xaml @@ -29,216 +29,212 @@ - - - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml index 0a92ec1cda..8dad34f24d 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SelectionExamples.xaml @@ -12,276 +12,292 @@ - - - + + + + - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - Test 1 - Test 2 - Test 3 - Test 4 - - - Test 1 - Test 2 - Test 3 - Test 4 - - + + Test 1 + Test 2 + Test 3 + Test 4 + + + Test 1 + Test 2 + Test 3 + Test 4 + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml index ec3623e36d..847efae078 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/Sliders.xaml @@ -27,938 +27,934 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml index 633a0b90e1..c5943fe90e 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml @@ -102,65 +102,63 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml index d846857ad3..77f266f812 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TabControlExamples.xaml @@ -27,184 +27,91 @@ - - - - - - + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml index 2eefda19b2..26d630577c 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TilesExample.xaml @@ -29,90 +29,86 @@ - - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml index 54f6063d7b..f829c53a3a 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml @@ -239,80 +239,80 @@ - + - + - + - - - + - + - + - + - - - + - + - - - + - + - + - + diff --git a/src/MahApps.Metro/Themes/MetroTabControl.xaml b/src/MahApps.Metro/Themes/MetroTabControl.xaml index 32bf0b24d0..9b3daaa1e0 100644 --- a/src/MahApps.Metro/Themes/MetroTabControl.xaml +++ b/src/MahApps.Metro/Themes/MetroTabControl.xaml @@ -6,8 +6,7 @@ - + @@ -83,8 +82,7 @@ - + @@ -161,16 +159,13 @@ - From 2bcff8c95369989064d9849af597807c9a85c0bb Mon Sep 17 00:00:00 2001 From: punker76 Date: Wed, 5 Jun 2019 22:24:24 +0200 Subject: [PATCH 3/4] Add Improvement to GitReleaseManager --- GitReleaseManager.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index 28eeca215a..b2e047f1ab 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -15,6 +15,7 @@ issue-labels-include: - Bug - Feature - Feature Request +- Improvement issue-labels-exclude: - Internal Refactoring - Build From 26092b024cd0b462c2c9bd7582deb03b1341e932 Mon Sep 17 00:00:00 2001 From: punker76 Date: Wed, 5 Jun 2019 22:59:37 +0200 Subject: [PATCH 4/4] (GH-3521) Workaround for RichTextBox behaves oddly inside a ScrollViewer The workaround would be to bind the Documents PageWidth to the RichTextBox's ActualWidth --- .../MahApps.Metro.Demo/ExampleViews/TextExamples.xaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml index 5e2b546c76..978188d891 100644 --- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml +++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml @@ -185,7 +185,12 @@ Controls:TextBoxHelper.SelectAllOnFocus="True" IsDocumentEnabled="True" SpellCheck.IsEnabled="True"> - + + @@ -200,7 +205,7 @@ Padding="5" IsDocumentEnabled="True" IsReadOnly="True"> - + @@ -215,7 +220,7 @@ Padding="5" IsDocumentEnabled="True" IsEnabled="False"> - +