Skip to content

Rework workspace clone layouting #2619

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Rework workspace clone layouting #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions src/Widgets/MultitaskingView/WindowCloneContainer.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ public class Gala.WindowCloneContainer : ActorTarget {
public signal void window_selected (Meta.Window window);
public signal void requested_close ();

public int padding_top { get; set; default = 12; }
public int padding_left { get; set; default = 12; }
public int padding_right { get; set; default = 12; }
public int padding_bottom { get; set; default = 12; }
public Mtk.Rectangle area { get; set; }

public WindowManager wm { get; construct; }
public WindowListModel windows { get; construct; }
Expand Down Expand Up @@ -140,13 +137,6 @@ public class Gala.WindowCloneContainer : ActorTarget {
return (int) (seq_b - seq_a);
});

Mtk.Rectangle area = {
padding_left,
padding_top,
(int) width - padding_left - padding_right,
(int) height - padding_top - padding_bottom
};

foreach (var tilable in calculate_grid_placement (area, windows)) {
tilable.clone.take_slot (tilable.rect, !view_toggle);
}
Expand Down
23 changes: 17 additions & 6 deletions src/Widgets/MultitaskingView/WorkspaceClone.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ public class Gala.WorkspaceClone : ActorTarget {
}
});

clip_to_allocation = true;

add_child (background);
add_child (window_container);

Expand Down Expand Up @@ -234,18 +236,27 @@ public class Gala.WorkspaceClone : ActorTarget {

var scale = (float)(monitor.height - Utils.scale_to_int (TOP_OFFSET + BOTTOM_OFFSET, monitor_scale)) / monitor.height;
var pivot_y = Utils.scale_to_int (TOP_OFFSET, monitor_scale) / (monitor.height - monitor.height * scale);
background.set_pivot_point (0.5f, pivot_y);
background.set_pivot_point (0f, pivot_y);

var initial_width = monitor.width;
var target_width = monitor.width * scale + WorkspaceRow.WORKSPACE_GAP * 2;
var target_width = monitor.width * scale;

var target_height = monitor.height * scale;

add_target (new PropertyTarget (MULTITASKING_VIEW, this, "width", typeof (float), (float) initial_width, (float) target_width));
add_target (new PropertyTarget (MULTITASKING_VIEW, window_container, "width", typeof (float), (float) initial_width, (float) target_width));
add_target (new PropertyTarget (MULTITASKING_VIEW, this, "width", typeof (float), (float) initial_width + WorkspaceRow.WORKSPACE_GAP, (float) target_width + WorkspaceRow.WORKSPACE_GAP));
add_target (new PropertyTarget (MULTITASKING_VIEW, background, "scale-x", typeof (double), 1d, (double) scale));
add_target (new PropertyTarget (MULTITASKING_VIEW, background, "scale-y", typeof (double), 1d, (double) scale));

window_container.padding_top = Utils.scale_to_int (TOP_OFFSET, monitor_scale);
window_container.padding_left = window_container.padding_right = (int) (monitor.width - monitor.width * scale) / 2;
window_container.padding_bottom = Utils.scale_to_int (BOTTOM_OFFSET, monitor_scale);
background.x = WorkspaceRow.WORKSPACE_GAP / 2;
window_container.x = WorkspaceRow.WORKSPACE_GAP / 2;

window_container.area = {
12,
Utils.scale_to_int (TOP_OFFSET, monitor_scale),
(int) (target_width - 24),
(int) target_height
};
}

#if OLD_ICON_GROUPS
Expand Down
3 changes: 2 additions & 1 deletion src/Widgets/MultitaskingView/WorkspaceRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ public class Gala.WorkspaceRow : ActorTarget {
set_allocation (allocation);

double progress = get_current_progress (SWITCH_WORKSPACE);
var monitor_width = display.get_monitor_geometry (display.get_primary_monitor ()).width;
int index = 0;
for (var child = get_first_child (); child != null; child = child.get_next_sibling ()) {
float preferred_width;
child.get_preferred_width (-1, null, out preferred_width);

var child_x = (float) Math.round ((progress + index) * (preferred_width + WORKSPACE_GAP));
var child_x = (float) Math.round ((progress + index) * preferred_width + (monitor_width - preferred_width) / 2);

child.allocate_preferred_size (child_x, 0);

Expand Down
5 changes: 1 addition & 4 deletions src/Widgets/WindowOverview.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,7 @@ public class Gala.WindowOverview : ActorTarget, RootTarget, ActivatableComponent
model.items_changed.connect (on_items_changed);

window_clone_container = new WindowCloneContainer (wm, model, scale, true) {
padding_top = TOP_GAP,
padding_left = BORDER,
padding_right = BORDER,
padding_bottom = BOTTOM_GAP,
area = { BORDER, TOP_GAP, geometry.width - 2 * BORDER, geometry.height - TOP_GAP - BOTTOM_GAP },
width = geometry.width,
height = geometry.height,
x = geometry.x,
Expand Down