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

WindowSwitcher: Support floating point scale factors (#1632)

Browse Source
This commit is contained in:
David Hewitt 2023-04-07 16:33:54 +01:00 committed by GitHub
parent ff5914a745
commit 4393018d4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Widgets/WindowSwitcher.vala
View File

@ -31,7 +31,7 @@ namespace Gala {
private WindowIcon? cur_icon = null;
private int scaling_factor = 1;
private float scaling_factor = 1.0f;
// For some reason, on Odin, the height of the caption loses
// its padding after the first time the switcher displays. As a
@ -46,7 +46,8 @@ namespace Gala {
var gtk_settings = Gtk.Settings.get_default ();
granite_settings = Granite.Settings.get_default ();
scaling_factor = InternalUtils.get_ui_scaling_factor ();
unowned var display = wm.get_display ();
scaling_factor = display.get_monitor_scale (display.get_current_monitor ());
canvas = new Clutter.Canvas ();
canvas.scale_factor = scaling_factor;
@ -76,7 +77,8 @@ namespace Gala {
unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (() => {
var cur_scale = InternalUtils.get_ui_scaling_factor ();
unowned var disp = wm.get_display ();
var cur_scale = disp.get_monitor_scale (disp.get_current_monitor ());
if (cur_scale != scaling_factor) {
scaling_factor = cur_scale;
canvas.scale_factor = scaling_factor;
@ -95,7 +97,7 @@ namespace Gala {
widget_path.iter_set_object_name (-1, "window");
var style_context = new Gtk.StyleContext ();
style_context.set_scale (scaling_factor);
style_context.set_scale ((int)Math.round (scaling_factor));
style_context.set_path (widget_path);
style_context.add_class ("background");
style_context.add_class ("csd");
@ -137,7 +139,7 @@ namespace Gala {
(uint8) (rgba.alpha * 255)
);
var rect_radius = WRAPPER_BORDER_RADIUS * scaling_factor;
var rect_radius = InternalUtils.scale_to_int (WRAPPER_BORDER_RADIUS, scaling_factor);
indicator = new Clutter.Actor ();
indicator.margin_left = indicator.margin_top =
indicator.margin_right = indicator.margin_bottom = 0;
@ -231,7 +233,7 @@ namespace Gala {
container.destroy_all_children ();
foreach (unowned var window in windows) {
var icon = new WindowIcon (window, ICON_SIZE * scaling_factor);
var icon = new WindowIcon (window, InternalUtils.scale_to_int (ICON_SIZE, scaling_factor));
if (window == current_window) {
cur_icon = icon;
}
@ -260,7 +262,7 @@ namespace Gala {
var app = window_tracker.get_app_for_window (current_window);
foreach (unowned var window in windows) {
if (window_tracker.get_app_for_window (window) == app) {
var icon = new WindowIcon (window, ICON_SIZE * scaling_factor);
var icon = new WindowIcon (window, InternalUtils.scale_to_int (ICON_SIZE, scaling_factor));
if (window == current_window) {
cur_icon = icon;
}
@ -273,8 +275,6 @@ namespace Gala {
}
private void open_switcher () {
var display = wm.get_display ();
if (container.get_n_children () == 0) {
Clutter.get_default_backend ().get_default_seat ().bell_notify ();
return;
@ -285,35 +285,36 @@ namespace Gala {
}
container.margin_left = container.margin_top =
container.margin_right = container.margin_bottom = (WRAPPER_PADDING * 2 * scaling_factor);
container.margin_right = container.margin_bottom = InternalUtils.scale_to_int (WRAPPER_PADDING * 2, scaling_factor);
var l = container.layout_manager as Clutter.FlowLayout;
l.column_spacing = l.row_spacing = WRAPPER_PADDING * scaling_factor;
l.column_spacing = l.row_spacing = InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor);
indicator.visible = false;
var indicator_size = (ICON_SIZE + WRAPPER_PADDING * 2) * scaling_factor;
var indicator_size = InternalUtils.scale_to_int ((ICON_SIZE + WRAPPER_PADDING * 2), scaling_factor);
indicator.set_size (indicator_size, indicator_size);
((Clutter.Canvas) indicator.content).set_size (indicator_size, indicator_size);
caption.visible = false;
caption.margin_bottom = caption.margin_top = WRAPPER_PADDING * scaling_factor;
caption.margin_bottom = caption.margin_top = InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor);
var display = wm.get_display ();
var monitor = display.get_current_monitor ();
var geom = display.get_monitor_geometry (monitor);
float container_width;
container.get_preferred_width (
ICON_SIZE * scaling_factor + container.margin_left + container.margin_right,
InternalUtils.scale_to_int (ICON_SIZE, scaling_factor) + container.margin_left + container.margin_right,
null,
out container_width
);
if (container_width + MIN_OFFSET * scaling_factor * 2 > geom.width) {
container.width = geom.width - MIN_OFFSET * scaling_factor * 2;
if (container_width + InternalUtils.scale_to_int (MIN_OFFSET, scaling_factor) * 2 > geom.width) {
container.width = geom.width - InternalUtils.scale_to_int (MIN_OFFSET, scaling_factor) * 2;
}
float nat_width, nat_height;
container.get_preferred_size (null, null, out nat_width, null);
nat_width -= (WRAPPER_PADDING * scaling_factor) / container.get_n_children ();
nat_width -= InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor) / container.get_n_children ();
container.get_preferred_size (null, null, null, out nat_height);
@ -448,8 +449,8 @@ namespace Gala {
// Make caption smaller than the wrapper, so it doesn't overflow.
caption.width = width - WRAPPER_PADDING * 2 * scaling_factor;
caption.set_position (
WRAPPER_PADDING * scaling_factor,
(int) (height - caption_height / 2 - (WRAPPER_PADDING * scaling_factor * 2))
InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor),
(int) (height - caption_height / 2 - InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor) * 2)
);
}
@ -475,8 +476,8 @@ namespace Gala {
}
// Move the indicator without animating it.
indicator.x = container.margin_left + (container.get_n_children () > 1 ? x : 0) - (WRAPPER_PADDING * scaling_factor);
indicator.y = container.margin_top + y - (WRAPPER_PADDING * scaling_factor);
indicator.x = container.margin_left + (container.get_n_children () > 1 ? x : 0) - InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor);
indicator.y = container.margin_top + y - InternalUtils.scale_to_int (WRAPPER_PADDING, scaling_factor);
update_caption_text ();
}