elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-09-11 15:15:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wayland-testing' of https://github.com/elementary/gala into wayland-testing

Browse Source
This commit is contained in:
lenemter 2023-09-26 09:35:09 +09:00
commit d346a55a71
3 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/InternalUtils.vala
View File

@ -318,21 +318,22 @@ namespace Gala {
return (int) (Math.round ((float)value * scale_factor));
}
private static Gtk.StyleContext selection_style_context = null;
// private static Gtk.StyleContext selection_style_context = null;
public static Gdk.RGBA get_theme_accent_color () {
if (selection_style_context == null) {
var label_widget_path = new Gtk.WidgetPath ();
label_widget_path.append_type (GLib.Type.from_name ("label"));
label_widget_path.iter_set_object_name (-1, "selection");
// if (selection_style_context == null) {
// var label_widget_path = new Gtk.WidgetPath ();
// label_widget_path.append_type (GLib.Type.from_name ("label"));
// label_widget_path.iter_set_object_name (-1, "selection");
selection_style_context = new Gtk.StyleContext ();
selection_style_context.set_path (label_widget_path);
}
// // selection_style_context = new Gtk.StyleContext ();
// // selection_style_context.set_path (label_widget_path);
// }
return (Gdk.RGBA) selection_style_context.get_property (
Gtk.STYLE_PROPERTY_BACKGROUND_COLOR,
Gtk.StateFlags.NORMAL
);
// return (Gdk.RGBA) selection_style_context.get_property (
// Gtk.STYLE_PROPERTY_BACKGROUND_COLOR,
// Gtk.StateFlags.NORMAL
// );
return { 0, 0, 255 };
}
/**

29
src/Widgets/Tooltip.vala
View File

@ -10,7 +10,7 @@
public class Gala.Tooltip : Clutter.Actor {
private static Clutter.Color text_color;
private static Gtk.Border padding;
private static Gtk.StyleContext style_context;
// private static Gtk.StyleContext style_context;
/**
* Canvas to draw the Tooltip background.
@ -52,20 +52,23 @@ public class Gala.Tooltip : Clutter.Actor {
tooltip_widget_path.iter_add_class (pos, Gtk.STYLE_CLASS_CSD);
tooltip_widget_path.iter_add_class (pos, Gtk.STYLE_CLASS_BACKGROUND);
style_context = new Gtk.StyleContext ();
style_context.set_path (tooltip_widget_path);
// style_context = new Gtk.StyleContext ();
// style_context.set_path (tooltip_widget_path);
padding = style_context.get_padding (Gtk.StateFlags.NORMAL);
// padding = style_context.get_padding (Gtk.StateFlags.NORMAL);
tooltip_widget_path.append_type (typeof (Gtk.Label));
// tooltip_widget_path.append_type (typeof (Gtk.Label));
var label_style_context = new Gtk.StyleContext ();
label_style_context.set_path (tooltip_widget_path);
// Gtk.StyleContext label_style_context = null;
// var label_style_context = new Gtk.StyleContext ();
// label_style_context.set_path (tooltip_widget_path);
var text_rgba = (Gdk.RGBA) label_style_context.get_property (
Gtk.STYLE_PROPERTY_COLOR,
Gtk.StateFlags.NORMAL
);
// var text_rgba = (Gdk.RGBA) label_style_context.get_property (
// Gtk.STYLE_PROPERTY_COLOR,
// Gtk.StateFlags.NORMAL
// );
Gdk.RGBA text_rgba = { 0, 0, 0, 0};
text_color = Clutter.Color () {
red = (uint8) text_rgba.red * uint8.MAX,
@ -133,8 +136,8 @@ public class Gala.Tooltip : Clutter.Actor {
ctx.save ();
style_context.render_background (ctx, 0, 0, width, height);
style_context.render_frame (ctx, 0, 0, width, height);
// style_context.render_background (ctx, 0, 0, width, height);
// style_context.render_frame (ctx, 0, 0, width, height);
ctx.restore ();

8
src/Widgets/WindowClone.vala
View File

@ -880,10 +880,10 @@ public class Gala.WindowClone : Clutter.Actor {
var label_widget_path = new Gtk.WidgetPath ();
label_widget_path.append_type (typeof (Gtk.Label));
var style_context = new Gtk.StyleContext ();
style_context.add_class (Granite.STYLE_CLASS_CARD);
style_context.add_class (Granite.STYLE_CLASS_ROUNDED);
style_context.set_path (label_widget_path);
// var style_context = new Gtk.StyleContext ();
// style_context.add_class (Granite.STYLE_CLASS_CARD);
// style_context.add_class (Granite.STYLE_CLASS_ROUNDED);
// style_context.set_path (label_widget_path);
border_radius = style_context.get_property (
Gtk.STYLE_PROPERTY_BORDER_RADIUS,