Skip to content

WindowClone: Fix some warnings on allocate #2610

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
Nov 8, 2025
Merged

WindowClone: Fix some warnings on allocate #2610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c9964
WindowClone: Fix some warnings on allocate
leolost2605 Oct 30, 2025
af40560
Merge branch 'main' into leolost/window-clone-allocate-warnings
lenemter Nov 8, 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
17 changes: 6 additions & 11 deletions src/Widgets/MultitaskingView/WindowClone.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public class Gala.WindowClone : ActorTarget, RootTarget {

var input_rect = window.get_buffer_rect ();
var outer_rect = window.get_frame_rect ();
var clone_scale_factor = width / outer_rect.width;
var clone_scale_factor = outer_rect.width != 0 ? width / outer_rect.width : 1f;

// Compensate for invisible borders of the texture
float clone_x = (input_rect.x - outer_rect.x) * clone_scale_factor;
Expand All @@ -327,12 +327,6 @@ public class Gala.WindowClone : ActorTarget, RootTarget {

clone.set_scale (clone_scale_factor, clone_scale_factor);

float clone_width, clone_height;
clone.get_preferred_size (null, null, out clone_width, out clone_height);

var clone_alloc = InternalUtils.actor_box_from_rect (0, 0, clone_width, clone_height);
clone.allocate (clone_alloc);

Clutter.ActorBox shape_alloc = {
-ACTIVE_SHAPE_SIZE,
-ACTIVE_SHAPE_SIZE,
Expand Down Expand Up @@ -364,11 +358,12 @@ public class Gala.WindowClone : ActorTarget, RootTarget {
var monitor_index = display.get_monitor_index_for_rect (Mtk.Rectangle.from_graphene_rect (rect, ROUND));
var monitor_scale = display.get_monitor_scale (monitor_index);

float window_title_max_width = box.get_width () - Utils.scale_to_int (TITLE_MAX_WIDTH_MARGIN, monitor_scale);
float window_title_height, window_title_nat_width;
window_title.get_preferred_size (null, null, out window_title_nat_width, out window_title_height);
float window_title_min_width, window_title_nat_width, window_title_height;
window_title.get_preferred_size (out window_title_min_width, null, out window_title_nat_width, out window_title_height);

float window_title_max_width = float.max (window_title_min_width, box.get_width () - Utils.scale_to_int (TITLE_MAX_WIDTH_MARGIN, monitor_scale));

var window_title_width = window_title_nat_width.clamp (0, window_title_max_width);
var window_title_width = float.min (window_title_nat_width, window_title_max_width);

float window_title_x = (box.get_width () - window_title_width) / 2;
float window_title_y = (window_icon.visible ? window_icon_y : box.get_height ()) - (window_title_height / 2) - Utils.scale_to_int (18, monitor_scale);
Expand Down