AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-14 14:20:21 +00:00
Code Issues Projects Releases Wiki Activity

gdk/toplevelsize: Add way to set margin

Browse Source 
Will be used to communicate the shadow margin, instead of using
gdk_surface_set_shadow_width().

Also set these values in gtkwindow.c.
This commit is contained in:
Jonas Ådahl 2020-11-24 15:51:56 +01:00
parent e07fde5c81
commit 13b4a4b24c
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gdk/gdktoplevelsize.c
View File

@ -118,6 +118,20 @@ gdk_toplevel_size_set_min_size (GdkToplevelSize *size,
size->min_height = min_height; size->min_height = min_height;
} }
void
gdk_toplevel_size_set_margin (GdkToplevelSize *size,
int left,
int right,
int top,
int bottom)
{
size->margin.is_valid = TRUE;
size->margin.left = left;
size->margin.right = right;
size->margin.top = top;
size->margin.bottom = bottom;
}
void void
gdk_toplevel_size_validate (GdkToplevelSize *size) gdk_toplevel_size_validate (GdkToplevelSize *size)
{ {

7
gdk/gdktoplevelsize.h
View File

@ -54,6 +54,13 @@ void gdk_toplevel_size_set_min_size (GdkToplevelSize *
int min_width, int min_width,
int min_height); int min_height);
GDK_AVAILABLE_IN_ALL
void gdk_toplevel_size_set_margin (GdkToplevelSize *size,
int left,
int right,
int top,
int bottom);
G_END_DECLS G_END_DECLS
#endif /* __GDK_TOPLEVEL_SIZE_H__ */ #endif /* __GDK_TOPLEVEL_SIZE_H__ */

8
gdk/gdktoplevelsizeprivate.h
View File

@ -30,6 +30,14 @@ struct _GdkToplevelSize
int height; int height;
int min_width; int min_width;
int min_height; int min_height;
struct {
gboolean is_valid;
int left;
int right;
int top;
int bottom;
} margin;
}; };
void gdk_toplevel_size_init (GdkToplevelSize *size, void gdk_toplevel_size_init (GdkToplevelSize *size,

7
gtk/gtkwindow.c
View File

@ -4364,6 +4364,13 @@ toplevel_compute_size (GdkToplevel *toplevel,
min_height = MIN (min_height + shadow.top + shadow.bottom, height); min_height = MIN (min_height + shadow.top + shadow.bottom, height);
gdk_toplevel_size_set_min_size (size, min_width, min_height); gdk_toplevel_size_set_min_size (size, min_width, min_height);
if (priv->use_client_shadow)
{
gdk_toplevel_size_set_margin (size,
shadow.left, shadow.right,
shadow.top, shadow.bottom);
}
} }
static void static void