From cddfd875bc5798934a1074b89ea1399e4406ff3d Mon Sep 17 00:00:00 2001 From: Mattia Formichetti Date: Mon, 16 Dec 2024 22:16:13 +0100 Subject: [PATCH] core: Port to meta_window_stack_position_compare Part-of: --- src/core/display.c | 10 +++++----- src/core/window.c | 2 +- src/x11/session.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/display.c b/src/core/display.c index be555b2b5..7257231a7 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2361,7 +2361,7 @@ meta_display_unmanage_windows (MetaDisplay *display, winlist = meta_display_list_windows (display, META_LIST_INCLUDE_OVERRIDE_REDIRECT); - winlist = g_slist_sort (winlist, meta_display_stack_cmp); + winlist = g_slist_sort (winlist, meta_window_stack_position_compare); g_slist_foreach (winlist, (GFunc)g_object_ref, NULL); /* Unmanage all windows */ @@ -2416,7 +2416,7 @@ meta_display_sort_windows_by_stacking (MetaDisplay *display, { GSList *copy = g_slist_copy (windows); - copy = g_slist_sort (copy, meta_display_stack_cmp); + copy = g_slist_sort (copy, meta_window_stack_position_compare); return copy; } @@ -3594,11 +3594,11 @@ update_window_visibilities (MetaDisplay *display, } /* Sort bottom to top */ - unplaced = g_list_sort (unplaced, window_stack_cmp); - should_hide = g_list_sort (should_hide, window_stack_cmp); + unplaced = g_list_sort (unplaced, meta_window_stack_position_compare); + should_hide = g_list_sort (should_hide, meta_window_stack_position_compare); /* Sort top to bottom */ - should_show = g_list_sort (should_show, window_stack_cmp); + should_show = g_list_sort (should_show, meta_window_stack_position_compare); should_show = g_list_reverse (should_show); COGL_TRACE_BEGIN_SCOPED (MetaDisplayShowUnplacedWindows, diff --git a/src/core/window.c b/src/core/window.c index eda81e650..3ee51b7a3 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -7186,7 +7186,7 @@ meta_window_find_tile_match (MetaWindow *window, MtkRectangle above_rect, bottommost_rect, topmost_rect; MetaWindowDrag *window_drag; - if (meta_stack_windows_cmp (window->display->stack, match, window) > 0) + if (meta_window_stack_position_compare (match, window) > 0) { topmost = match; bottommost = window; diff --git a/src/x11/session.c b/src/x11/session.c index 566e21f0f..0f67af9e7 100644 --- a/src/x11/session.c +++ b/src/x11/session.c @@ -953,7 +953,7 @@ save_state (MetaContext *context) windows = meta_display_list_windows (display, META_LIST_DEFAULT); stack_position = 0; - windows = g_slist_sort (windows, meta_display_stack_cmp); + windows = g_slist_sort (windows, meta_window_stack_position_compare); tmp = windows; stack_position = 0;