brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core/place: Fix and enable centered find_next_cascade

Browse Source 
We use place_centered to start the cascade from the center of the
usable work_area; sorting now takes either the top left or top right window
corner as a reference using window_distance_cmp.

Helps: https://gitlab.gnome.org/GNOME/mutter/-/issues/2123
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4202>
This commit is contained in:
Mattia Formichetti 2025-01-03 22:24:30 +01:00 committed by Marge Bot
parent c606d1e670
commit 4d280086fe
1 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/core/place.c
View File

@ -168,13 +168,15 @@ find_next_cascade (MetaWindow *window,
/* visible windows on relevant workspaces */ /* visible windows on relevant workspaces */
GList *windows, GList *windows,
int *new_x, int *new_x,
int *new_y) int *new_y,
gboolean place_centered)
{ {
MetaDisplay *display = meta_window_get_display (window); MetaDisplay *display = meta_window_get_display (window);
MetaContext *context = meta_display_get_context (display); MetaContext *context = meta_display_get_context (display);
MetaBackend *backend = meta_context_get_backend (context); MetaBackend *backend = meta_context_get_backend (context);
GList *tmp; GList *tmp;
GList *sorted; GList *sorted;
int adjusted_center_x, adjusted_center_y;
int cascade_origin_x, cascade_x, cascade_y; int cascade_origin_x, cascade_x, cascade_y;
int x_threshold, y_threshold; int x_threshold, y_threshold;
MtkRectangle frame_rect; MtkRectangle frame_rect;
@ -201,21 +203,48 @@ find_next_cascade (MetaWindow *window,
current = meta_backend_get_current_logical_monitor (backend); current = meta_backend_get_current_logical_monitor (backend);
meta_window_get_work_area_for_logical_monitor (window, current, &work_area); meta_window_get_work_area_for_logical_monitor (window, current, &work_area);
sorted = g_list_copy (windows);
if (ltr)
sorted = g_list_sort_with_data (sorted, northwest_cmp, &work_area);
else
sorted = g_list_sort_with_data (sorted, northeast_cmp, &work_area);
meta_window_get_frame_rect (window, &frame_rect); meta_window_get_frame_rect (window, &frame_rect);
window_width = frame_rect.width; window_width = frame_rect.width;
window_height = frame_rect.height; window_height = frame_rect.height;
cascade_origin_x = ltr sorted = g_list_copy (windows);
? MAX (0, work_area.x) if (place_centered)
: work_area.x + work_area.width - window_width; {
WindowDistanceComparisonData window_distance_data = {
.area = work_area,
.window = frame_rect,
.ltr = ltr,
};
sorted = g_list_sort_with_data (sorted, window_distance_cmp,
&window_distance_data);
}
else if (ltr)
{
sorted = g_list_sort_with_data (sorted, northwest_cmp, &work_area);
}
else
{
sorted = g_list_sort_with_data (sorted, northeast_cmp, &work_area);
}
adjusted_center_x = work_area.x + work_area.width / 2 - window_width / 2;
adjusted_center_y = work_area.y + work_area.height / 2 - window_height / 2;
if (place_centered)
{
cascade_origin_x = adjusted_center_x;
}
else if (ltr)
{
cascade_origin_x = MAX (0, work_area.x);
}
else
{
cascade_origin_x = work_area.x + work_area.width - window_width;
}
cascade_x = cascade_origin_x; cascade_x = cascade_origin_x;
cascade_y = MAX (0, work_area.y); cascade_y = MAX (0, place_centered ? adjusted_center_y : work_area.y);
/* Find first cascade position that's not used. */ /* Find first cascade position that's not used. */
@ -259,7 +288,7 @@ find_next_cascade (MetaWindow *window,
(work_area.y + work_area.height))) (work_area.y + work_area.height)))
{ {
cascade_x = cascade_origin_x; cascade_x = cascade_origin_x;
cascade_y = MAX (0, work_area.y); cascade_y = MAX (0, place_centered ? adjusted_center_y : work_area.y);
cascade_stage += 1; cascade_stage += 1;
if (ltr) if (ltr)
@ -979,6 +1008,8 @@ meta_window_place (MetaWindow *window,
meta_topic (META_DEBUG_PLACEMENT, "Centered window %s on monitor %d", meta_topic (META_DEBUG_PLACEMENT, "Centered window %s on monitor %d",
window->desc, logical_monitor->number); window->desc, logical_monitor->number);
find_next_cascade (window, windows, &x, &y, place_centered);
} }
else else
{ {
@ -989,7 +1020,7 @@ meta_window_place (MetaWindow *window,
/* No good fit? Fall back to cascading... */ /* No good fit? Fall back to cascading... */
if (!find_first_fit (window, windows, logical_monitor, if (!find_first_fit (window, windows, logical_monitor,
&x, &y)) &x, &y))
find_next_cascade (window, windows, &x, &y); find_next_cascade (window, windows, &x, &y, place_centered);
} }
/* Maximize windows if they are too big for their work area (bit of /* Maximize windows if they are too big for their work area (bit of