AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

csd: properly check titlebar visibility

Browse Source 
Now that we are using child-visible to hide titlebars, we need to
adjust the visibility checks in various places to take it into account.

https://bugzilla.gnome.org/show_bug.cgi?id=709323
This commit is contained in:
Matthias Clasen 2013-10-05 23:17:02 -04:00
parent 66445fec1d
commit 9490e7064e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkwindow.c
View File

@ -5503,7 +5503,9 @@ gtk_window_map (GtkWidget *widget)
if (child != NULL && gtk_widget_get_visible (child)) if (child != NULL && gtk_widget_get_visible (child))
gtk_widget_map (child); gtk_widget_map (child);
if (priv->title_box != NULL && gtk_widget_get_visible (priv->title_box)) if (priv->title_box != NULL &&
gtk_widget_get_visible (priv->title_box) &&
gtk_widget_get_child_visible (priv->title_box))
gtk_widget_map (priv->title_box); gtk_widget_map (priv->title_box);
gdk_window = gtk_widget_get_window (widget); gdk_window = gtk_widget_get_window (widget);
@ -7323,7 +7325,9 @@ get_active_region_type (GtkWindow *window, GdkEventAny *event, gint x, gint y)
return i; return i;
} }
if (priv->title_box != NULL && gtk_widget_get_visible (priv->title_box)) if (priv->title_box != NULL &&
gtk_widget_get_visible (priv->title_box) &&
gtk_widget_get_child_visible (priv->title_box))
{ {
gtk_widget_get_allocation (priv->title_box, &allocation); gtk_widget_get_allocation (priv->title_box, &allocation);
if (allocation.x <= x && allocation.x + allocation.width > x && if (allocation.x <= x && allocation.x + allocation.width > x &&
@ -9374,7 +9378,9 @@ gtk_window_draw (GtkWidget *widget,
gtk_style_context_restore (context); gtk_style_context_restore (context);
} }
if (priv->title_box && gtk_widget_get_visible (priv->title_box)) if (priv->title_box &&
gtk_widget_get_visible (priv->title_box) &&
gtk_widget_get_child_visible (priv->title_box))
title_height = priv->title_height; title_height = priv->title_height;
else else
title_height = 0; title_height = 0;