Skip to content

Commit

Permalink
theming: Give Clutter.Color priority over Cogl.Color
Browse files Browse the repository at this point in the history
While now there's only Cogl.Color, in previous versions we had both so
giving Cogl priority broke the theming support

Closes: #2307
  • Loading branch information
3v1n0 committed Oct 3, 2024
1 parent 16efec3 commit 68cfb19
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion appIconIndicators.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ class RunningIndicatorDots extends RunningIndicatorBase {
const {settings} = Docking.DockManager;
if (!settings.applyCustomTheme) {
// Adjust for the backlit case
const Color = Cogl.Color ?? Clutter.Color;
const Color = Clutter.Color ?? Cogl.Color;

if (settings.unityBacklitItems) {
// Use dominant color for dots too if the backlit is enables
Expand Down
2 changes: 1 addition & 1 deletion theming.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export class ThemeManager {

({backgroundColor} = settings);
// backgroundColor is a string like rgb(0,0,0)
const Color = Cogl.Color ?? Clutter.Color;
const Color = Clutter.Color ?? Cogl.Color;
const [ret, color] = Color.from_string(backgroundColor);
if (!ret) {
logError(new Error(`${backgroundColor} is not a valid color string`));
Expand Down

0 comments on commit 68cfb19

Please sign in to comment.