summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2015-10-13 20:53:39 +0800
committerJonas Ådahl <jadahl@gmail.com>2015-10-14 10:32:31 +0800
commit364732f2e6439d3f2e8c02092d30b7aeac0e5bb8 (patch)
treeed835e64b5530ae4cb843e4bb66fd2a2dbf64897
parentd4699cf51d77d1748b7a0f0fe93956d01359ba99 (diff)
downloadgtk+-364732f2e6439d3f2e8c02092d30b7aeac0e5bb8.tar.gz
GtkWindow: Enlarge the type hint private field
Make it what it is - the enum - so that that it is sure that the hint will fit in the field. Without this, any hint that doesn't fit in 3 bits will be truncated to the 3 least significant bits, causing unexpected behaviour. https://bugzilla.gnome.org/show_bug.cgi?id=756496
-rw-r--r--gtk/gtkwindow.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index efde8423ca..bc8ba327a3 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -227,11 +227,6 @@ struct _GtkWindowPrivate
guint stick_initially : 1;
guint transient_parent_group : 1;
guint type : 4; /* GtkWindowType */
- guint type_hint : 3; /* GdkWindowTypeHint if the hint is
- * one of the original eight. If not,
- * then it contains
- * GDK_WINDOW_TYPE_HINT_NORMAL
- */
guint urgent : 1;
guint gravity : 5; /* GdkGravity */
guint csd_requested : 1;
@@ -243,6 +238,8 @@ struct _GtkWindowPrivate
guint use_subsurface : 1;
+ GdkWindowTypeHint type_hint;
+
GtkGesture *multipress_gesture;
GtkGesture *drag_gesture;