From 31b94537ac3265c45222bac40c7b148a6c25f513 Mon Sep 17 00:00:00 2001 From: Dong Bin <14807942+rabbitism@users.noreply.github.com> Date: Fri, 16 Dec 2022 02:01:32 +0800 Subject: [PATCH] feat: add ScrollBar and ScrollViewer theme. (#9) --- src/Semi.Avalonia.Demo/Pages/Overview.axaml | 177 ++++++----- .../Pages/RadioButtonDemo.axaml | 4 +- src/Semi.Avalonia/Controls/Controls.axaml | 3 +- src/Semi.Avalonia/Controls/ScrollViewer.axaml | 281 ++++++++++++++++++ src/Semi.Avalonia/Themes/Light/Light.axaml | 1 + .../Themes/Light/ScrollViewer.axaml | 11 + 6 files changed, 395 insertions(+), 82 deletions(-) create mode 100644 src/Semi.Avalonia/Controls/ScrollViewer.axaml create mode 100644 src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml diff --git a/src/Semi.Avalonia.Demo/Pages/Overview.axaml b/src/Semi.Avalonia.Demo/Pages/Overview.axaml index 629004e..3b12151 100644 --- a/src/Semi.Avalonia.Demo/Pages/Overview.axaml +++ b/src/Semi.Avalonia.Demo/Pages/Overview.axaml @@ -3,86 +3,105 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450" d:DesignWidth="800" mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Option 1 - Option 2 + + + + + + + + + + + - - - 选项 1 - 选项 2 + + + + + + + + + + + + + + + + + + + + + + Option 1 + Option 2 - + + + 选项 1 + 选项 2 + + + + + + + Option 1 + Description 1 + + + + + Option 2 + Description 2 + + + + + Avalonia + WPF + UWP + + + + Tab Content 1 + + + Tab Content 2 + + + Tab Content 3 + + + + + Card + + + Shadow on hover + + + Shadow + + - - - - Option 1 - Description 1 - - - - - Option 2 - Description 2 - - - - - Avalonia - WPF - UWP - - - - Tab Content 1 - - Tab Content 2 - Tab Content 3 - - - - Card - - - Shadow on hover - - - Shadow - - - + diff --git a/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml b/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml index bb655cd..9c4a440 100644 --- a/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml +++ b/src/Semi.Avalonia.Demo/Pages/RadioButtonDemo.axaml @@ -14,8 +14,8 @@ - 小1 - 小2 + 小1 + 小2 diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml index 8d57c8d..82ce358 100644 --- a/src/Semi.Avalonia/Controls/Controls.axaml +++ b/src/Semi.Avalonia/Controls/Controls.axaml @@ -6,8 +6,9 @@ - + + diff --git a/src/Semi.Avalonia/Controls/ScrollViewer.axaml b/src/Semi.Avalonia/Controls/ScrollViewer.axaml new file mode 100644 index 0000000..81944b4 --- /dev/null +++ b/src/Semi.Avalonia/Controls/ScrollViewer.axaml @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml index 7352bc2..4775f36 100644 --- a/src/Semi.Avalonia/Themes/Light/Light.axaml +++ b/src/Semi.Avalonia/Themes/Light/Light.axaml @@ -7,6 +7,7 @@ + diff --git a/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml new file mode 100644 index 0000000..c7b67ff --- /dev/null +++ b/src/Semi.Avalonia/Themes/Light/ScrollViewer.axaml @@ -0,0 +1,11 @@ + + 12 + 8 + + + + + +