Skip to content

CleanGeek - lift the control styles into Themes/Shell.axaml - #8

Merged
techygeekshome merged 2 commits into
mainfrom
techygeekshome-patch-3
Aug 30, 2026
Merged

CleanGeek - lift the control styles into Themes/Shell.axaml#8
techygeekshome merged 2 commits into
mainfrom
techygeekshome-patch-3

Conversation

@techygeekshome

Copy link
Copy Markdown
Owner

Needs a run on Windows before merging - I cannot test it there, and the whole point is that nothing changes visually.

CleanGeek and DriverGeek were the last two apps keeping their control styles inline in Views/MainWindow.axaml. DiskGeek and PDFGeek carry a Themes/Dark.axaml + Themes/Shell.axaml pair. This gives CleanGeek the same shape.

The style block is moved byte for byte. It is also byte-identical to the one in the matching DriverGeek PR - the two apps had the same seven selectors.

It is included at window scope, exactly where the block sat:

<Window.Styles>
  <StyleInclude Source="avares://CleanGeek/Themes/Shell.axaml" />
</Window.Styles>

Not app scope, deliberately. Application.Styles is built before Application.Resources, so a StaticResource lookup there cannot see the palette; and app scope would also start applying the bare TextBlock and Button.ghost rules to the shared About window. Keeping it at window scope makes this a move rather than a change of behaviour.

Builds clean, and all four screens were rendered headless from the real XAML afterwards - nav highlight, ghost buttons and text colours all identical to before.

Same two-file structure as DiskGeek and PDFGeek: Themes/Dark.axaml for the palette, Themes/Shell.axaml for the control styles. The block is byte-identical to the one that was inline in Views/MainWindow.axaml. It is included at *window* scope, exactly where the block sat, so the styles apply to the same controls as before and the StaticResource lookups keep working - a move, not a change of scope.
@techygeekshome
techygeekshome merged commit b74f813 into main Aug 30, 2026
1 check passed
@techygeekshome
techygeekshome deleted the techygeekshome-patch-3 branch August 30, 2026 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant