elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-26 07:51:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

PointerLocator: Support floating, monitor specific scale (#1606)

Browse Source
This commit is contained in:
David Hewitt 2023-04-04 19:46:30 +01:00 committed by GitHub
parent 7599756924
commit 6da34ada40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/InternalUtils.vala
View File

@ -363,6 +363,14 @@ namespace Gala {
return (int) Math.round (value * scale_factor) / scale_factor;
}
/**
* Multiplies an integer by a floating scaling factor, and then
* returns the result rounded to the nearest integer
*/
public static int scale_to_int (int value, float scale_factor) {
return (int) (Math.round ((float)value * scale_factor));
}
private static Gtk.StyleContext selection_style_context = null;
public static Gdk.RGBA get_theme_accent_color () {
if (selection_style_context == null) {

29
src/Widgets/PointerLocator.vala
View File

@ -21,13 +21,13 @@ namespace Gala {
private const int HEIGHT_PX = 300;
private const int ANIMATION_TIME_MS = 300;
private const uint BORDER_WIDTH_PX = 1;
private const int BORDER_WIDTH_PX = 1;
private const double BACKGROUND_OPACITY = 0.7;
public weak WindowManager wm { get; construct; }
private int scaling_factor = 1;
private float scaling_factor = 1.0f;
private int surface_width = WIDTH_PX;
private int surface_height = HEIGHT_PX;
@ -48,25 +48,20 @@ namespace Gala {
settings = new GLib.Settings ("org.gnome.desktop.interface");
pipeline = new Cogl.Pipeline (Clutter.get_default_backend ().get_cogl_context ());
update_surface ();
set_size (WIDTH_PX * scaling_factor, HEIGHT_PX * scaling_factor);
var pivot = Graphene.Point ();
pivot.init (0.5f, 0.5f);
pivot_point = pivot;
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update_surface);
}
private void update_surface () {
var cur_scale = InternalUtils.get_ui_scaling_factor ();
private void update_surface (float cur_scale) {
if (surface == null || cur_scale != scaling_factor) {
scaling_factor = cur_scale;
surface_width = WIDTH_PX * scaling_factor;
surface_height = HEIGHT_PX * scaling_factor;
surface_width = InternalUtils.scale_to_int (WIDTH_PX, scaling_factor);
surface_height = InternalUtils.scale_to_int (HEIGHT_PX, scaling_factor);
surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, surface_width, surface_height);
set_size (surface_width, surface_height);
}
}
@ -74,6 +69,7 @@ namespace Gala {
var radius = int.min (surface_width / 2, surface_height / 2);
var cr = new Cairo.Context (surface);
var border_width = InternalUtils.scale_to_int (BORDER_WIDTH_PX, scaling_factor);
// Clear the surface
cr.save ();
@ -87,14 +83,14 @@ namespace Gala {
cr.translate (surface_width / 2, surface_height / 2);
cr.move_to (radius - BORDER_WIDTH_PX, 0);
cr.arc (0, 0, radius - BORDER_WIDTH_PX * scaling_factor, 0, 2 * Math.PI);
cr.arc (0, 0, radius - border_width, 0, 2 * Math.PI);
cr.close_path ();
cr.set_line_width (0);
cr.set_source (fill_color);
cr.fill_preserve ();
cr.set_line_width (BORDER_WIDTH_PX * scaling_factor);
cr.set_line_width (border_width);
cr.set_source (stroke_color);
cr.stroke ();
@ -148,10 +144,13 @@ namespace Gala {
stroke_color = new Cairo.Pattern.rgb (rgba.red, rgba.green, rgba.blue);
fill_color = new Cairo.Pattern.rgba (rgba.red, rgba.green, rgba.blue, BACKGROUND_OPACITY);
unowned var tracker = wm.get_display ().get_cursor_tracker ();
unowned var display = wm.get_display ();
unowned var tracker = display.get_cursor_tracker ();
Graphene.Point coords = {};
tracker.get_pointer (out coords, null);
update_surface (display.get_monitor_scale (display.get_current_monitor ()));
x = coords.x - (width / 2);
y = coords.y - (width / 2);