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

core/place: Simplify meta_window_place

Browse Source 
This is a preparatory commit, it refactors away of the
done_check_denied_focus label, simplifying the control flow.

The only functional difference is that now the auto-maximization when
windows don't fit the work_area is always applied.

The next commits will adapt find_next_cascade to properly handle this.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4202>
This commit is contained in:
Mattia Formichetti 2025-01-03 16:59:07 +01:00 committed by Marge Bot
parent b3fd815bed
commit 970ac8ff50
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/place.c
View File

@ -776,7 +776,8 @@ meta_window_place (MetaWindow *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);
g_autoptr (GList) windows = NULL; g_autoptr (GList) windows = NULL;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor = NULL;
gboolean place_centered = FALSE;
meta_topic (META_DEBUG_PLACEMENT, "Placing window %s", window->desc); meta_topic (META_DEBUG_PLACEMENT, "Placing window %s", window->desc);
@ -912,14 +913,16 @@ meta_window_place (MetaWindow *window,
* on the sides of the parent window or something. * on the sides of the parent window or something.
*/ */
if (window_place_centered (window)) windows = find_windows_relevant_for_placement (window);
logical_monitor = meta_backend_get_current_logical_monitor (backend);
place_centered = window_place_centered (window);
if (place_centered)
{ {
/* Center on current monitor */ /* Center on current monitor */
MtkRectangle work_area; MtkRectangle work_area;
MtkRectangle frame_rect; MtkRectangle frame_rect;
logical_monitor = meta_backend_get_current_logical_monitor (backend);
meta_window_get_work_area_for_logical_monitor (window, meta_window_get_work_area_for_logical_monitor (window,
logical_monitor, logical_monitor,
&work_area); &work_area);
@ -930,13 +933,18 @@ 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);
goto done_check_denied_focus;
} }
else
{
/* "Origin" placement algorithm */
x = logical_monitor->rect.x;
y = logical_monitor->rect.y;
windows = find_windows_relevant_for_placement (window); /* No good fit? Fall back to cascading... */
if (!find_first_fit (window, windows, logical_monitor,
logical_monitor = meta_backend_get_current_logical_monitor (backend); &x, &y))
find_next_cascade (window, windows, &x, &y);
}
/* 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
* a hack here). Assume undecorated windows probably don't intend to * a hack here). Assume undecorated windows probably don't intend to
@ -963,18 +971,6 @@ meta_window_place (MetaWindow *window,
} }
} }
/* "Origin" placement algorithm */
x = logical_monitor->rect.x;
y = logical_monitor->rect.y;
if (find_first_fit (window, windows, logical_monitor,
&x, &y))
goto done_check_denied_focus;
/* No good fit? Fall back to cascading... */
find_next_cascade (window, windows, &x, &y);
done_check_denied_focus:
/* If the window is being denied focus and isn't a transient of the /* If the window is being denied focus and isn't a transient of the
* focus window, we do NOT want it to overlap with the focus window * focus window, we do NOT want it to overlap with the focus window
* if at all possible. This is guaranteed to only be called if the * if at all possible. This is guaranteed to only be called if the