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

WindowManager: Always use the scale factor from primary monitor

Browse Source
This commit is contained in:
David Hewitt 2023-04-20 16:10:39 +02:00 committed by Corentin Noël
parent fc5cd3e2f7
commit 503d699680
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/WindowManager.vala
View File

@ -562,7 +562,8 @@ namespace Gala {
} }
animating_nudge = true; animating_nudge = true;
var nudge_gap = NUDGE_GAP * InternalUtils.get_ui_scaling_factor (); var scale = get_display ().get_monitor_scale (get_display ().get_primary_monitor ());
var nudge_gap = InternalUtils.scale_to_int ((int)NUDGE_GAP, scale);
float dest = 0; float dest = 0;
if (!switch_workspace_with_gesture) { if (!switch_workspace_with_gesture) {
@ -1167,11 +1168,11 @@ namespace Gala {
Meta.Rectangle icon = {}; Meta.Rectangle icon = {};
if (actor.get_meta_window ().get_icon_geometry (out icon)) { if (actor.get_meta_window ().get_icon_geometry (out icon)) {
// Fix icon position and size according to ui scaling factor. // Fix icon position and size according to ui scaling factor.
int ui_scale = InternalUtils.get_ui_scaling_factor (); float ui_scale = get_display ().get_monitor_scale (get_display ().get_monitor_index_for_rect (icon));
icon.x *= ui_scale; icon.x = InternalUtils.scale_to_int (icon.x, ui_scale);
icon.y *= ui_scale; icon.y = InternalUtils.scale_to_int (icon.y, ui_scale);
icon.width *= ui_scale; icon.width = InternalUtils.scale_to_int (icon.width, ui_scale);
icon.height *= ui_scale; icon.height = InternalUtils.scale_to_int (icon.height, ui_scale);
float scale_x = (float)icon.width / actor.width; float scale_x = (float)icon.width / actor.width;
float scale_y = (float)icon.height / actor.height; float scale_y = (float)icon.height / actor.height;
@ -1930,8 +1931,9 @@ namespace Gala {
main_container.width = move_primary_only ? monitor_geom.width : screen_width; main_container.width = move_primary_only ? monitor_geom.width : screen_width;
main_container.height = move_primary_only ? monitor_geom.height : screen_height; main_container.height = move_primary_only ? monitor_geom.height : screen_height;
var monitor_scale = display.get_monitor_scale (primary);
var x2 = move_primary_only ? monitor_geom.width : screen_width; var x2 = move_primary_only ? monitor_geom.width : screen_width;
x2 += WORKSPACE_GAP * InternalUtils.get_ui_scaling_factor (); x2 += WORKSPACE_GAP * monitor_scale;
if (direction == Meta.MotionDirection.RIGHT) if (direction == Meta.MotionDirection.RIGHT)
x2 = -x2; x2 = -x2;