From 0b5920cc3a9d86fe7f9e2693f8e6b5789977bfd2 Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Sun, 17 May 2026 14:53:55 -0500 Subject: [PATCH 1/7] First redesign MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **`Themes/ModernTheme.xaml`** *(new file, merged via App.xaml)* - **ContextMenu** — white background, subtle `#D8DEE9` border, system drop shadow, `Segoe UI 13` - **MenuItem** — full `ControlTemplate`: rounded hover tiles (`#EFF6FF`), blue text on hover (`#1D4ED8`), SVG checkmark for checkable items (stay on top), graceful disabled state (`#94A3B8`) - **Separator** — slim 1 px `#E8ECF0` line with breathing room **SettingsWindow.xaml** — full style overhaul: - **Sidebar** — deep navy `#111B2E` with a dark border; app title in crisp `#E2E8F0`, version in muted `#4B6080` - **Sidebar nav buttons** — transparent base, rounded 8 px hover tile `#1E2D45`, custom `ControlTemplate` so system colours don't bleed through - **Sidebar tool buttons** — subtle navy `#192540` fill, hover lightens, disabled dims cleanly - **Content area** — `#F2F5F9` background so white cards visually float - **CardGroupBox** — proper card with 10 px rounded corners, `#F7F9FC` header strip separated by a 1 px rule, body padding 16 px - **TextBox** — 6 px corners, blue focus ring (`#3B82F6`), light blue focus background - **Button** — 6 px corners, hover/press states, disabled dimming - **Typography** — labels `#1E293B`, descriptions `#64748B`, slider values `#64748B`, hyperlinks `#2563EB` - **Spacing** — content padding increased to 20 px all sides, bottom padding added so last card isn't clipped **MainWindow.xaml / App.xaml** — `UseLayoutRounding="True"` and `FontFamily="Segoe UI"` wired in; `ModernTheme.xaml` merged at application level so the context menu picks it up globally. \ --- DesktopClock/App.xaml | 8 +- DesktopClock/MainWindow.xaml | 1 + DesktopClock/SettingsWindow.xaml | 271 ++++++++++++++++++++++----- DesktopClock/Themes/ModernTheme.xaml | 136 ++++++++++++++ 4 files changed, 372 insertions(+), 44 deletions(-) create mode 100644 DesktopClock/Themes/ModernTheme.xaml diff --git a/DesktopClock/App.xaml b/DesktopClock/App.xaml index 9ee2242..035f7c0 100644 --- a/DesktopClock/App.xaml +++ b/DesktopClock/App.xaml @@ -2,5 +2,11 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml"> - + + + + + + + \ No newline at end of file diff --git a/DesktopClock/MainWindow.xaml b/DesktopClock/MainWindow.xaml index bcab05d..32279ab 100644 --- a/DesktopClock/MainWindow.xaml +++ b/DesktopClock/MainWindow.xaml @@ -9,6 +9,7 @@ d:DataContext="{d:DesignInstance Type=local:MainWindow}" mc:Ignorable="d" Title="DesktopClock" + UseLayoutRounding="True" AllowsTransparency="True" Background="Transparent" WindowStyle="None" diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index ed5927c..5b9e762 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -8,6 +8,8 @@ d:DataContext="{d:DesignInstance Type=local:SettingsWindowViewModel}" mc:Ignorable="d" Title="DesktopClock Settings" + FontFamily="Segoe UI" + UseLayoutRounding="True" Width="{Binding Source={x:Static p:Settings.Default}, Path=SettingsWindowWidth, Mode=TwoWay}" Height="{Binding Source={x:Static p:Settings.Default}, Path=SettingsWindowHeight, Mode=TwoWay}" MinWidth="800" @@ -15,95 +17,270 @@ ResizeMode="CanResize" WindowStartupLocation="CenterScreen"> + + + + + + + + + + + @@ -111,11 +288,15 @@ TargetType="TextBlock"> + + + @@ -125,10 +306,11 @@ - + Background="#111B2E" + BorderBrush="#0A111E" + BorderThickness="0,0,1,0" + MinWidth="210"> + @@ -136,13 +318,15 @@ + Margin="10,0,10,14"> + FontSize="18" + FontWeight="Bold" + Foreground="#E2E8F0" /> + Foreground="#4B6080" + FontSize="12" + Margin="0,2,0,0" /> + Margin="20,20,20,20"> diff --git a/DesktopClock/Themes/ModernTheme.xaml b/DesktopClock/Themes/ModernTheme.xaml new file mode 100644 index 0000000..ece03ed --- /dev/null +++ b/DesktopClock/Themes/ModernTheme.xaml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + From d483c30fb7cb4c6e7d3dd03d7b6bd4035565d730 Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Sun, 17 May 2026 15:27:16 -0500 Subject: [PATCH 2/7] more windows 11 style > I like it but let's go in a direction that fits closer to the modern Windows 11 fluent design for 2026 since this is a Windows app --- DesktopClock/SettingsWindow.xaml | 210 +++++++++++++++------------ DesktopClock/Themes/ModernTheme.xaml | 99 +++++++------ 2 files changed, 177 insertions(+), 132 deletions(-) diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index 5b9e762..613d62b 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -18,16 +18,25 @@ WindowStartupLocation="CenterScreen"> - + + + - + - + - + @@ -158,17 +177,20 @@ - + @@ -223,38 +248,40 @@ - + + @@ -306,11 +336,11 @@ - + @@ -318,14 +348,16 @@ + Margin="10,0,10,16"> + FontSize="20" + FontWeight="SemiBold" + FontFamily="Segoe UI Variable Display, Segoe UI" + Foreground="#1B1B1B" /> @@ -406,7 +438,7 @@ - + From efb418c8ea822df16fddb3b7f148b649ea480874 Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Sun, 17 May 2026 15:31:06 -0500 Subject: [PATCH 3/7] Revert "more windows 11 style" This reverts commit d483c30fb7cb4c6e7d3dd03d7b6bd4035565d730. --- DesktopClock/SettingsWindow.xaml | 210 ++++++++++++--------------- DesktopClock/Themes/ModernTheme.xaml | 99 ++++++------- 2 files changed, 132 insertions(+), 177 deletions(-) diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index 613d62b..5b9e762 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -18,25 +18,16 @@ WindowStartupLocation="CenterScreen"> - - - + - + - + - + @@ -177,20 +158,17 @@ - + @@ -248,40 +223,38 @@ - + - @@ -336,11 +306,11 @@ - + @@ -348,16 +318,14 @@ + Margin="10,0,10,14"> + FontSize="18" + FontWeight="Bold" + Foreground="#E2E8F0" /> @@ -438,7 +406,7 @@ - + From f48884c1df5995a005e1e087e4e4a355546e9a08 Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Sun, 17 May 2026 15:31:10 -0500 Subject: [PATCH 4/7] Revert "First redesign" This reverts commit 0b5920cc3a9d86fe7f9e2693f8e6b5789977bfd2. --- DesktopClock/App.xaml | 8 +- DesktopClock/MainWindow.xaml | 1 - DesktopClock/SettingsWindow.xaml | 271 +++++---------------------- DesktopClock/Themes/ModernTheme.xaml | 136 -------------- 4 files changed, 44 insertions(+), 372 deletions(-) delete mode 100644 DesktopClock/Themes/ModernTheme.xaml diff --git a/DesktopClock/App.xaml b/DesktopClock/App.xaml index 035f7c0..9ee2242 100644 --- a/DesktopClock/App.xaml +++ b/DesktopClock/App.xaml @@ -2,11 +2,5 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml"> - - - - - - - + \ No newline at end of file diff --git a/DesktopClock/MainWindow.xaml b/DesktopClock/MainWindow.xaml index 32279ab..bcab05d 100644 --- a/DesktopClock/MainWindow.xaml +++ b/DesktopClock/MainWindow.xaml @@ -9,7 +9,6 @@ d:DataContext="{d:DesignInstance Type=local:MainWindow}" mc:Ignorable="d" Title="DesktopClock" - UseLayoutRounding="True" AllowsTransparency="True" Background="Transparent" WindowStyle="None" diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index 5b9e762..ed5927c 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -8,8 +8,6 @@ d:DataContext="{d:DesignInstance Type=local:SettingsWindowViewModel}" mc:Ignorable="d" Title="DesktopClock Settings" - FontFamily="Segoe UI" - UseLayoutRounding="True" Width="{Binding Source={x:Static p:Settings.Default}, Path=SettingsWindowWidth, Mode=TwoWay}" Height="{Binding Source={x:Static p:Settings.Default}, Path=SettingsWindowHeight, Mode=TwoWay}" MinWidth="800" @@ -17,270 +15,95 @@ ResizeMode="CanResize" WindowStartupLocation="CenterScreen"> - - - - - - - - - - - @@ -288,15 +111,11 @@ TargetType="TextBlock"> - - - @@ -306,11 +125,10 @@ - + Background="#FAFAFA" + BorderBrush="#E1E4E8" + BorderThickness="0,0,1,0"> + @@ -318,15 +136,13 @@ + Margin="8,0,20,4"> + FontSize="20" + FontWeight="SemiBold" /> + Foreground="#5B6F8E" + Margin="0,0,0,6" /> + Margin="16,16,16,0"> diff --git a/DesktopClock/Themes/ModernTheme.xaml b/DesktopClock/Themes/ModernTheme.xaml deleted file mode 100644 index ece03ed..0000000 --- a/DesktopClock/Themes/ModernTheme.xaml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - From ce7a0d51ca2f05ce7ebb5c2a855fe5509795e031 Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Sun, 17 May 2026 19:59:14 -0500 Subject: [PATCH 5/7] third version (fluent design) > refine our theme visuals including the settings window and context menus. create a clean coherent modern design that fits with Windows 11 fluent design visuals. Do not overextend and apply overly-heavy styles or regress support for older versions of Windows. --- DesktopClock/App.xaml | 263 ++++++++++++++++++++++++++++++- DesktopClock/SettingsWindow.xaml | 204 ++++++++++++++++++++---- 2 files changed, 435 insertions(+), 32 deletions(-) diff --git a/DesktopClock/App.xaml b/DesktopClock/App.xaml index 9ee2242..2699cfe 100644 --- a/DesktopClock/App.xaml +++ b/DesktopClock/App.xaml @@ -1,6 +1,263 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index ed5927c..c492d2d 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -16,10 +16,44 @@ WindowStartupLocation="CenterScreen"> - - + - + @@ -136,12 +281,12 @@ + Margin="8,2,20,4"> @@ -222,12 +367,13 @@ + Margin="20,18,20,0"> From c609b26cf76688b9f88245d9420008e1e825726b Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Fri, 22 May 2026 16:07:07 -0500 Subject: [PATCH 6/7] Revert "third version (fluent design)" This reverts commit ce7a0d51ca2f05ce7ebb5c2a855fe5509795e031. --- DesktopClock/App.xaml | 263 +------------------------------ DesktopClock/SettingsWindow.xaml | 204 ++++-------------------- 2 files changed, 32 insertions(+), 435 deletions(-) diff --git a/DesktopClock/App.xaml b/DesktopClock/App.xaml index 2699cfe..9ee2242 100644 --- a/DesktopClock/App.xaml +++ b/DesktopClock/App.xaml @@ -1,263 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index c492d2d..ed5927c 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -16,44 +16,10 @@ WindowStartupLocation="CenterScreen"> - - + - + @@ -281,12 +136,12 @@ + Margin="8,0,20,4"> @@ -367,13 +222,12 @@ + Margin="16,16,16,0"> From a1b9878e36308f1c6297bb19f6a0674e2583753f Mon Sep 17 00:00:00 2001 From: Daniel Chalmers Date: Fri, 22 May 2026 16:23:04 -0500 Subject: [PATCH 7/7] opus 4.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Key visual improvements:** - **GroupBox cards** → rounded 8px border with subtle shadow (replaces classic WPF chrome) - **Buttons** → rounded 4px corners with clean hover/pressed states - **Context menu** → rounded 8px corners, soft shadow, modern MenuItem hover - **Sidebar** → uses theme tokens instead of hardcoded hex colors - **Typography** → Segoe UI Variable (Win11 font, falls back to Segoe UI on older Windows), slightly larger 13px base size --- DesktopClock/App.xaml | 10 +- DesktopClock/SettingsWindow.xaml | 119 +------- DesktopClock/Themes/FluentTheme.xaml | 394 +++++++++++++++++++++++++++ 3 files changed, 412 insertions(+), 111 deletions(-) create mode 100644 DesktopClock/Themes/FluentTheme.xaml diff --git a/DesktopClock/App.xaml b/DesktopClock/App.xaml index 9ee2242..7e4bff6 100644 --- a/DesktopClock/App.xaml +++ b/DesktopClock/App.xaml @@ -1,6 +1,12 @@ - - + + + + + + + \ No newline at end of file diff --git a/DesktopClock/SettingsWindow.xaml b/DesktopClock/SettingsWindow.xaml index ed5927c..42d4146 100644 --- a/DesktopClock/SettingsWindow.xaml +++ b/DesktopClock/SettingsWindow.xaml @@ -1,4 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + WindowStartupLocation="CenterScreen" + FontFamily="Segoe UI Variable Text, Segoe UI" + FontSize="13" + UseLayoutRounding="True"> + @@ -125,8 +26,8 @@ @@ -141,7 +42,7 @@ FontSize="20" FontWeight="SemiBold" /> @@ -227,7 +128,7 @@ ScrollChanged="SettingsScrollViewer_ScrollChanged" Loaded="SettingsScrollViewer_Loaded"> + Margin="24,24,24,0"> diff --git a/DesktopClock/Themes/FluentTheme.xaml b/DesktopClock/Themes/FluentTheme.xaml new file mode 100644 index 0000000..35ef132 --- /dev/null +++ b/DesktopClock/Themes/FluentTheme.xaml @@ -0,0 +1,394 @@ + + + + + + + 4 + 8 + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +