AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 02:57:38 +00:00
Code Issues Projects Releases Wiki Activity

GtkWindow: Fix the shadow width logic

Browse Source 
Previous commit 305b34a "GtkWindow: fix move/get position with CSD"
introduced a regression because some windows presumably use shadows but
actually don't, resulting in a negative offset being wrongly applied.

Problem is that get_shadow_width() would return non-zero shadows even
for windows that have no shadow, thus causing the negative offset.

Fix the logic in get_shadow_width() and gtk_window_should_use_csd() so
that get_shadow_width() returns accurate values.

Bugzilla: https://bugzilla.gnome.org/show_bug.cgi?id=756618
This commit is contained in:
Olivier Fourdan 2015-10-30 17:38:25 +01:00
parent 9f04efd316
commit a5b1cdd0c1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkwindow.c
View File

@ -5948,15 +5948,18 @@ gtk_window_should_use_csd (GtkWindow *window)
GtkWindowPrivate *priv = window->priv;
const gchar *csd_env;
if (priv->csd_requested)
return TRUE;
if (!priv->decorated)
return FALSE;
if (priv->type == GTK_WINDOW_POPUP)
return FALSE;
if (priv->csd_requested)
return TRUE;
if (priv->use_client_shadow)
return TRUE;
#ifdef GDK_WINDOWING_BROADWAY
if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
@ -6676,8 +6679,10 @@ get_shadow_width (GtkWindow *window,
if (!priv->decorated)
return;
if (!priv->client_decorated &&
!(gtk_window_should_use_csd (window) &&
if (!priv->client_decorated)
return;
if (!(gtk_window_should_use_csd (window) &&
gtk_window_supports_client_shadow (window)))
return;