Skip to content

Commit

Permalink
[Avalonia] Theme adjustments and fixes between light and dark themes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ruben2776
Ruben2776 committed Sep 30, 2024
1 parent 406b533 commit 0075cf9
Show file tree
Hide file tree
Showing 7 changed files with 237 additions and 225 deletions.
276 changes: 143 additions & 133 deletions src/PicView.Avalonia.Win32/Views/ExifWindow.axaml
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/PicView.Avalonia/PicViewTheme/ResourceDictionaries/MainColors.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@

<Color x:Key="BackgroundAlpha">#442e2e2e</Color>

<Color x:Key="MenuBackgroundColor">#292929</Color>
<Color x:Key="MenuBackgroundColor">#F6292929</Color>
<Color x:Key="MenuButtonColor">#2F2F2F</Color>

<Color x:Key="ContextMenuBackgroundColor">#EE2b2b2b</Color>
<Color x:Key="ContextMenuTextColor">#EDEBEB</Color>
Expand Down Expand Up @@ -88,6 +89,7 @@
<Color x:Key="BackgroundAlpha">#32FFFFFF</Color>

<Color x:Key="MenuBackgroundColor">#ECF8F8F8</Color>
<Color x:Key="MenuButtonColor">#fff</Color>

<Color x:Key="ContextMenuBackgroundColor">#E3FFFFFF</Color>
<Color x:Key="ContextMenuTextColor">#2B251E</Color>
Expand Down
130 changes: 65 additions & 65 deletions src/PicView.Avalonia/Views/ExifView.axaml
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -195,7 +195,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="99"
Classes="ButtonBorder altHover"
Expand Down Expand Up @@ -223,7 +223,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="160"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand Down Expand Up @@ -251,7 +251,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="160"
Canvas.Top="99"
Classes="ButtonBorder altHover"
Expand All @@ -278,7 +278,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="144"
Classes="ButtonBorder altHover"
Expand All @@ -305,7 +305,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="160"
Canvas.Top="144"
Classes="ButtonBorder altHover"
Expand Down
12 changes: 6 additions & 6 deletions src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,15 @@
Mode=OneWay}"
Width="45">
<Path
Data="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
Data="{StaticResource CloseGeometry}"
Fill="{DynamicResource MainTextColor}"
Height="10"
Stretch="Fill"
Width="10" />
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand Down Expand Up @@ -234,7 +234,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="160"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -260,7 +260,7 @@


<SplitButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="99"
Classes="ButtonBorder altHover"
Expand Down Expand Up @@ -380,7 +380,7 @@
</SplitButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="160"
Canvas.Top="99"
Classes="ButtonBorder altHover"
Expand All @@ -397,7 +397,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="145"
Classes="ButtonBorder altHover"
Expand Down
14 changes: 7 additions & 7 deletions src/PicView.Avalonia/Views/UC/Menus/SettingsMenu.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@
Mode=OneWay}"
Width="45">
<Path
Data="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
Data="{StaticResource CloseGeometry}"
Fill="{DynamicResource MainTextColor}"
Height="10"
Stretch="Fill"
Width="10" />
</Button>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -130,7 +130,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -149,7 +149,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="104"
Classes="ButtonBorder altHover"
Expand All @@ -168,7 +168,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="104"
Classes="ButtonBorder altHover"
Expand All @@ -187,7 +187,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="150"
Classes="ButtonBorder altHover"
Expand All @@ -207,7 +207,7 @@
</ToggleButton>

<ToggleButton
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="150"
Classes="ButtonBorder altHover"
Expand Down
14 changes: 7 additions & 7 deletions src/PicView.Avalonia/Views/UC/Menus/ToolsMenu.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@
Mode=OneWay}"
Width="45">
<Path
Data="M242.72 256l100.07-100.07c12.28-12.28 12.28-32.19 0-44.48l-22.24-22.24c-12.28-12.28-32.19-12.28-44.48 0L176 189.28 75.93 89.21c-12.28-12.28-32.19-12.28-44.48 0L9.21 111.45c-12.28 12.28-12.28 32.19 0 44.48L109.28 256 9.21 356.07c-12.28 12.28-12.28 32.19 0 44.48l22.24 22.24c12.28 12.28 32.2 12.28 44.48 0L176 322.72l100.07 100.07c12.28 12.28 32.2 12.28 44.48 0l22.24-22.24c12.28-12.28 12.28-32.19 0-44.48L242.72 256z"
Data="{StaticResource CloseGeometry}"
Fill="{DynamicResource Brush0}"
Height="10"
Stretch="Fill"
Width="10" />
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -141,7 +141,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="53"
Classes="ButtonBorder altHover"
Expand All @@ -166,7 +166,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="104"
Classes="ButtonBorder altHover"
Expand All @@ -192,7 +192,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="104"
Classes="ButtonBorder altHover"
Expand All @@ -214,7 +214,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="7"
Canvas.Top="150"
Classes="ButtonBorder altHover"
Expand All @@ -238,7 +238,7 @@
</Button>

<Button
Background="{DynamicResource SecondaryButtonBackgroundColor}"
Background="{DynamicResource MenuButtonColor}"
Canvas.Left="182"
Canvas.Top="150"
Classes="ButtonBorder altHover"
Expand Down

0 comments on commit 0075cf9

Please sign in to comment.