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

Revert "window: Check if we can use CSD before enabling them"

Browse Source 
This reverts commit c5e5ee6749.

It turns out that this commit breaks the default sizing of GtkWindow,
which in turn causes the window to be smaller than the handle size,
which ends up sending invalid rectangles to Cairo.

We'll have to find another way to fix the CSD issue.

See also: https://bugzilla.gnome.org/show_bug.cgi?id=751140

https://bugzilla.gnome.org/show_bug.cgi?id=750343
This commit is contained in:
Emmanuele Bassi 2015-06-22 14:19:29 +01:00
parent 4e155d784d
commit 97e728580c
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gtk/gtkwindow.c
View File

@ -4057,32 +4057,6 @@ gtk_window_supports_client_shadow (GtkWindow *window)
return TRUE;
}
static gboolean
gtk_window_can_use_csd (GtkWindow *window)
{
const gchar *csd_env;
#ifdef GDK_WINDOWING_BROADWAY
if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
#ifdef GDK_WINDOWING_MIR
if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
csd_env = g_getenv ("GTK_CSD");
/* If GTK_CSD is unset we default to CSD support */
return csd_env == NULL || (strcmp (csd_env, "1") == 0);
}
static void
gtk_window_enable_csd (GtkWindow *window)
{
@ -4090,10 +4064,6 @@ gtk_window_enable_csd (GtkWindow *window)
GtkWidget *widget = GTK_WIDGET (window);
GdkVisual *visual;
/* If the environment does not support CSD, then there's no point in enabling them */
if (!gtk_window_can_use_csd (window))
return;
/* We need a visual with alpha for client shadows */
if (priv->use_client_shadow)
{
@ -5870,6 +5840,7 @@ static gboolean
gtk_window_should_use_csd (GtkWindow *window)
{
GtkWindowPrivate *priv = window->priv;
const gchar *csd_env;
if (priv->csd_requested)
return TRUE;
@ -5880,7 +5851,24 @@ gtk_window_should_use_csd (GtkWindow *window)
if (priv->type == GTK_WINDOW_POPUP)
return FALSE;
return gtk_window_can_use_csd (window);
#ifdef GDK_WINDOWING_BROADWAY
if (GDK_IS_BROADWAY_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
#ifdef GDK_WINDOWING_MIR
if (GDK_IS_MIR_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
return TRUE;
#endif
csd_env = g_getenv ("GTK_CSD");
return (g_strcmp0 (csd_env, "1") == 0);
}
static void