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

window: Move frame_bounds to WindowX11

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3254>
This commit is contained in:
Bilal Elmoussaoui
2023-09-07 10:47:24 +02:00
committed by Marge Bot
parent bcb069f454
commit d1b04ffb55
6 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/window.c
View File

@ -99,6 +99,10 @@
#include "wayland/meta-window-wayland.h"
#endif
#ifdef HAVE_X11_CLIENT
#include "x11/window-x11-private.h"
#endif
#ifdef HAVE_XWAYLAND
#include "wayland/meta-window-xwayland.h"
#endif
@ -315,8 +319,6 @@ meta_window_finalize (GObject *object)
{
MetaWindow *window = META_WINDOW (object);
g_clear_pointer (&window->frame_bounds, mtk_region_unref);
if (window->transient_for)
g_object_unref (window->transient_for);
@ -3992,8 +3994,16 @@ meta_window_move_resize_internal (MetaWindow *window,
meta_window_update_monitor (window, update_monitor_flags);
}
if ((result & META_MOVE_RESIZE_RESULT_FRAME_SHAPE_CHANGED) && window->frame_bounds)
g_clear_pointer (&window->frame_bounds, mtk_region_unref);
#ifdef HAVE_X11_CLIENT
if (window->client_type == META_WINDOW_CLIENT_TYPE_X11)
{
MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
MetaWindowX11Private *priv = meta_window_x11_get_private (window_x11);
if ((result & META_MOVE_RESIZE_RESULT_FRAME_SHAPE_CHANGED) && priv->frame_bounds)
g_clear_pointer (&priv->frame_bounds, mtk_region_unref);
}
#endif
meta_window_foreach_transient (window, maybe_move_attached_window, NULL);
@ -6791,34 +6801,6 @@ meta_window_get_frame_type (MetaWindow *window)
}
}
/**
* meta_window_get_frame_bounds:
* @window: a #MetaWindow
*
* Gets a region representing the outer bounds of the window's frame.
*
* Return value: (transfer none) (nullable): a #MtkRegion
* holding the outer bounds of the window, or %NULL if the window
* doesn't have a frame.
*/
MtkRegion *
meta_window_get_frame_bounds (MetaWindow *window)
{
if (!window->frame_bounds)
{
#ifdef HAVE_X11_CLIENT
MetaFrame *frame = meta_window_x11_get_frame (window);
#else
/* Only for now, as this method would be moved to a window-x11 in the upcoming commits */
MetaFrame *frame = NULL;
#endif
if (frame)
window->frame_bounds = meta_frame_get_frame_bounds (frame);
}
return window->frame_bounds;
}
/**
* meta_window_is_attached_dialog:
* @window: a #MetaWindow