Skip to content

Better encapsulation of styles #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Better encapsulation of styles #173

wants to merge 12 commits into from

Conversation

Samuel-B-D
Copy link
Contributor

@Samuel-B-D Samuel-B-D commented Jun 11, 2025 •
edited
Loading

  • All 3 themes can now be included with a short tag just like the stock FluentTheme & SimpleTheme
    • <DevolutionsDevExpressTheme />
    • <DevolutionsMacOsTheme />
    • <DevolutionsLinuxYaruTheme />
  • Limit as much as possible "global styles"; scope within ControlTheme whenever possible
  • For the very few remaining cases where we might want to provide useful global styles, ensure opting-out is possible
    • For now, only the MacOs theme still have global styles
      • They can be opted-out by specifying <DevolutionsMacOsTheme GlobalStyles="False" />
      • The global styles are also separately available as <DevolutionsMacOsThemeGlobalStyles />
  • The SampleApp will now start by default with the theme that's currently loaded for the designer (useful change when working on the themes)

Samuel-B-D added 5 commits June 9, 2025 11:12
@Samuel-B-D
Removed Styles.axaml global override on the Linux theme and properly …
b93987a 
…applied them to the relevant ControlTheme(s) where necessary
@Samuel-B-D
WIP
8c2f2ac
@Samuel-B-D
Ensure our themes provide styles that are well-contained within Contr…
a2cc8aa 
…olTheme encapsulation.

Some useful global styles still exists (namely, greying out <Svg> included inside <MenuItem.Icon> on MacOs), but these can be opted-out, and also available to be separately included
@Samuel-B-D
Merge branch 'master' of github.com:Devolutions/avalonia-themes into …
f186bcd 
…only-expose-control-themes-and-resources--no-global-styles-overrides
@Samuel-B-D
undo accidental formatting change
78ea34d
apman
apman reviewed Jun 12, 2025
View reviewed changes
Copy link
Contributor

@apman apman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't looked at everything yet .. (and won't review all of the code), but here are a few things I noticed so far

Oh, and something with the new MacOS menu is not quite right yet. (top image is on master)
image

apman
apman reviewed Jun 13, 2025
View reviewed changes
apman
apman reviewed Jun 13, 2025
View reviewed changes
@Samuel-B-D
Copy link
Contributor Author

I haven't looked at everything yet .. (and won't review all of the code), but here are a few things I noticed so far

Oh, and something with the new MacOS menu is not quite right yet. (top image is on master) image

Oops that's an issue indeed, I'll have a look at it

@Samuel-B-D
PR review fixes
01f4aaa
@Samuel-B-D
remove internal comment
e10c9cf
@Samuel-B-D
Multiple fixes:
851f986 
⁻ Removed all duplicate inclusions
- Added a "ThemePreviewer" to the MacOs & DevExpress project to resolve issue with previewing the dark theme
@Samuel-B-D
PR review fixes
137c70e
@Samuel-B-D
Revert experimental change that didn't work
0d93ff5
@Samuel-B-D
reran formatter
4664374
@Samuel-B-D
fixes
249ea09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apman apman apman left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Samuel-B-D @apman