Skip to content

ThemeSelector Update Phase2#418

Draft
rabbitism wants to merge 5 commits intomainfrom
theme
Draft

ThemeSelector Update Phase2#418
rabbitism wants to merge 5 commits intomainfrom
theme

Conversation

@rabbitism
Copy link
Copy Markdown
Member

@rabbitism rabbitism commented Sep 20, 2024 •
edited
Loading

  1. ThemeSelector now has a new property: ThemeSource.
  2. ThemeToggleButton actually controls ThemeSource if it is not set.
  3. Instead of maintaining a nullable boolean as internal state, ThemeToggleButton now just looking for next Theme available in ThemeSource.
  4. ThemeToggleButton always respect RequestThemeVariant on initialized. if it is set.
  5. Introduce a new Control, ThemeSelector. It behaves like a combobox.

Further fix of #340

@rabbitism rabbitism requested a review from zdpcdt September 20, 2024 14:39
zdpcdt
zdpcdt reviewed Sep 23, 2024
View reviewed changes
Comment thread demo/Ursa.Demo/App.axaml Outdated
@rabbitism @zdpcdt
Update demo/Ursa.Demo/App.axaml
d14a23e 
Co-authored-by: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
zdpcdt
zdpcdt reviewed Sep 23, 2024
View reviewed changes
Comment thread src/Ursa/Controls/ThemeSelector/ThemeSelectorBase.cs
{
AvaloniaObject? result = TargetScope;
result ??= this.GetLogicalAncestors().OfType<ThemeVariantScope>().FirstOrDefault();
result ??= TargetScope;
Copy link
Copy Markdown
Collaborator

@zdpcdt zdpcdt Sep 23, 2024

Choose a reason for hiding this comment

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

Is the line duplicated?

Copy link
Copy Markdown
Member Author

@rabbitism rabbitism Sep 23, 2024

Choose a reason for hiding this comment

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

yes its redundant.

@zdpcdt
Copy link
Copy Markdown
Collaborator

zdpcdt commented Sep 23, 2024

In Controller+ThreeState mode, if the system defaults to Dark theme, the toggle can switch between three states. If the system defaults to Light theme, the toggle can only switch between two states

@rabbitism rabbitism marked this pull request as draft September 23, 2024 13:25
@rabbitism rabbitism mentioned this pull request Nov 2, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zdpcdt zdpcdt zdpcdt left review comments

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

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@rabbitism @zdpcdt