Skip to content

Avoid using Gdk.RGBA #2598

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

Merged
merged 2 commits into from
Oct 29, 2025
Merged

Avoid using Gdk.RGBA #2598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d489029
Avoid using Gdk.RGBA
lenemter Oct 28, 2025
49cec61
Merge branch 'main' into lenemter/remove-gdk-rgba
lenemter Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 36 additions & 31 deletions lib/Drawing/Color.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,25 @@ namespace Gala.Drawing {
* A class containing an RGBA color and methods for more powerful color manipulation.
*/
public class Color : GLib.Object {
public const Gdk.RGBA LIGHT_BACKGROUND = { (250f / 255f), (250f / 255f), (250f / 255f), 1};
public const Gdk.RGBA DARK_BACKGROUND = { (51 / 255f), (51 / 255f), (51 / 255f), 1};
public const Gdk.RGBA LIGHT_BORDER = { 0, 0, 0, 0.2f};
public const Gdk.RGBA DARK_BORDER = { 0, 0, 0, 0.75f};
public const Gdk.RGBA LIGHT_HIGHLIGHT = { 255, 255, 255, 1};
public const Gdk.RGBA DARK_HIGHLIGHT = { 255, 255, 255, 0.05f};
public const Gdk.RGBA TOOLTIP_BACKGROUND = { 0, 0, 0, 1};
public const Gdk.RGBA TOOLTIP_TEXT_COLOR = { 1, 1, 1, 1};
#if !HAS_MUTTER47
public const Clutter.Color LIGHT_BACKGROUND = { 250, 250, 250, 255};
public const Clutter.Color DARK_BACKGROUND = { 51, 51, 51, 255};
public const Clutter.Color LIGHT_BORDER = { 0, 0, 0, 51};
public const Clutter.Color DARK_BORDER = { 0, 0, 0, 191};
public const Clutter.Color LIGHT_HIGHLIGHT = { 255, 255, 255, 255};
public const Clutter.Color DARK_HIGHLIGHT = { 255, 255, 255, 13};
public const Clutter.Color TOOLTIP_BACKGROUND = { 0, 0, 0, 255};
public const Clutter.Color TOOLTIP_TEXT_COLOR = { 255, 255, 255, 255};
#else
public const Cogl.Color LIGHT_BACKGROUND = { 250, 250, 250, 255};
public const Cogl.Color DARK_BACKGROUND = { 51, 51, 51, 255};
public const Cogl.Color LIGHT_BORDER = { 0, 0, 0, 51};
public const Cogl.Color DARK_BORDER = { 0, 0, 0, 191};
public const Cogl.Color LIGHT_HIGHLIGHT = { 255, 255, 255, 255};
public const Cogl.Color DARK_HIGHLIGHT = { 255, 255, 255, 13};
public const Cogl.Color TOOLTIP_BACKGROUND = { 0, 0, 0, 255};
public const Cogl.Color TOOLTIP_TEXT_COLOR = { 255, 255, 255, 255};
#endif

/**
* The value of the red channel, with 0 being the lowest value and 1.0 being the greatest value.
Expand Down Expand Up @@ -93,15 +104,6 @@ namespace Gala.Drawing {
this.A = A;
}

/**
* Constructs a new {@link Gala.Drawing.Color} from a {@link Gdk.RGBA}.
*
* @param color the {@link Gdk.RGBA}
*/
public Color.from_rgba (Gdk.RGBA color) {
set_from_rgba (color);
}

/**
* Constructs a new {@link Gala.Drawing.Color} from a string.
*
Expand All @@ -112,14 +114,20 @@ namespace Gala.Drawing {
* * A RGB color in the form “rgb(r,g,b)” (In this case the color will have full opacity)
* * A RGBA color in the form “rgba(r,g,b,a)”
*
* For more details on formatting and how this function works see {@link Gdk.RGBA.parse}
* For more details on formatting and how this function works see {@link Clutter.Color.from_string}
*
* @param color the string specifying the color
*/
public Color.from_string (string color) {
Gdk.RGBA rgba = Gdk.RGBA ();
rgba.parse (color);
set_from_rgba (rgba);
#if !HAS_MUTTER47
var parsed_color = Clutter.Color.from_string (color);
#else
var parsed_color = Cogl.Color.from_string (color);
#endif
R = parsed_color.red / 255.0;
G = parsed_color.green / 255.0;
B = parsed_color.blue / 255.0;
A = parsed_color.alpha / 255.0;
}

/**
Expand Down Expand Up @@ -508,13 +516,17 @@ namespace Gala.Drawing {
* Note: that this string representation may lose some precision, since r, g and b are represented
* as 8-bit integers. If this is a concern, you should use a different representation.
*
* This returns the same string as a {@link Gdk.RGBA} would return in {@link Gdk.RGBA.to_string}
* This returns the same string as a {@link Clutter.Color} would return in {@link Clutter.Color.to_string}
*
* @return the text string
*/
public string to_string () {
Gdk.RGBA rgba = {(float)R, (float)G, (float)B, (float)A};
return rgba.to_string ();
#if !HAS_MUTTER47
Clutter.Color color = { (uint8) (R * 255), (uint8) (G * 255), (uint8) (B * 255), (uint8) (A * 255) };
#else
Cogl.Color color = { (uint8) (R * 255), (uint8) (G * 255), (uint8) (B * 255), (uint8) (A * 255) };
#endif
return color.to_string ();
}

/**
Expand Down Expand Up @@ -546,12 +558,5 @@ namespace Gala.Drawing {

return (alpha << 24) | (red << 16) | (green << 8) | blue;
}

private void set_from_rgba (Gdk.RGBA color) {
R = color.red;
G = color.green;
B = color.blue;
A = color.alpha;
}
}
}
20 changes: 2 additions & 18 deletions src/Widgets/MultitaskingView/Tooltip.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,19 @@ public class Gala.Tooltip : Clutter.Actor {
private Gala.Text text_actor;

construct {
#if HAS_MUTTER47
Cogl.Color text_color = {
#else
Clutter.Color text_color = {
#endif
(uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.red * uint8.MAX,
(uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.green * uint8.MAX,
(uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.blue * uint8.MAX,
(uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.alpha * uint8.MAX,
};

text_actor = new Gala.Text () {
margin_left = 6,
margin_top = 6,
margin_bottom = 6,
margin_right = 6,
ellipsize = Pango.EllipsizeMode.MIDDLE,
color = text_color
color = Drawing.Color.TOOLTIP_TEXT_COLOR
};

add_child (text_actor);

layout_manager = new Clutter.BinLayout ();
background_color = {
(uint8) (Drawing.Color.TOOLTIP_BACKGROUND.red * uint8.MAX),
(uint8) (Drawing.Color.TOOLTIP_BACKGROUND.green * uint8.MAX),
(uint8) (Drawing.Color.TOOLTIP_BACKGROUND.blue * uint8.MAX),
(uint8) (Drawing.Color.TOOLTIP_BACKGROUND.alpha * uint8.MAX)
};
background_color = Drawing.Color.TOOLTIP_BACKGROUND;

add_effect (new RoundedCornersEffect (3, 1.0f));
}
Expand Down
24 changes: 11 additions & 13 deletions src/Widgets/WindowSwitcher/WindowSwitcher.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
highlight_color = Drawing.Color.DARK_HIGHLIGHT;
}

background_color.alpha = 0.6f;

#if HAS_MUTTER47
caption.color = Cogl.Color.from_string (caption_color);
#else
Expand All @@ -195,19 +193,19 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {
);

ctx.set_source_rgba (
background_color.red,
background_color.green,
background_color.blue,
background_color.alpha
background_color.red / 255.0,
background_color.green / 255.0,
background_color.blue / 255.0,
0.6
);
ctx.fill_preserve ();

ctx.set_line_width (stroke_width);
ctx.set_source_rgba (
border_color.red,
border_color.green,
border_color.blue,
border_color.alpha
border_color.red / 255.0,
border_color.green / 255.0,
border_color.blue / 255.0,
border_color.alpha / 255.0
);
ctx.stroke ();
ctx.restore ();
Expand All @@ -221,9 +219,9 @@ public class Gala.WindowSwitcher : CanvasActor, GestureTarget, RootTarget {

ctx.set_line_width (stroke_width);
ctx.set_source_rgba (
highlight_color.red,
highlight_color.green,
highlight_color.blue,
highlight_color.red / 255.0,
highlight_color.green / 255.0,
highlight_color.blue / 255.0,
0.3
);
ctx.stroke ();
Expand Down