[gtk+/gtk-2-24] exstyle changed after the window size adjustment
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] exstyle changed after the window size adjustment
- Date: Sun, 16 Mar 2014 12:59:52 +0000 (UTC)
commit 7ff6e601c3300d4adb0aa224ab128ce3f4f56f5f
Author: Pavel <pavel pamsoft cz>
Date: Mon Jan 21 20:31:20 2013 +0100
exstyle changed after the window size adjustment
Originaly the size of the window based on the client area size has
been calculated first and then variables dwStyle and dwExStyle have
been changed. Thus the window size has been calculated for different
windows type then eventually used when calling CreateWindowEx. This
caused for example the Gimp tool windows to have different size than
formerly saved in session. The whole code calculating the window size
is moved after the last adjustment of dwExStyle variable in this patch.
Signed-off-by: Hans Breuer <hans breuer org>
gdk/win32/gdkwindow-win32.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 9740ef8..bd64237 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -621,6 +621,21 @@ _gdk_window_impl_new (GdkWindow *window,
GDK_NOTE (MISC, g_print ("... GDK_INPUT_ONLY, system colormap\n"));
}
+ if (attributes_mask & GDK_WA_TITLE)
+ title = attributes->title;
+ else
+ title = get_default_title ();
+ if (!title || !*title)
+ title = "";
+
+ impl->native_event_mask = GDK_STRUCTURE_MASK | event_mask;
+
+ if (attributes_mask & GDK_WA_TYPE_HINT)
+ gdk_window_set_type_hint (window, attributes->type_hint);
+
+ if (impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY)
+ dwExStyle |= WS_EX_TOOLWINDOW;
+
switch (private->window_type)
{
case GDK_WINDOW_TOPLEVEL:
@@ -703,21 +718,6 @@ _gdk_window_impl_new (GdkWindow *window,
y = private->y + private->parent->abs_y - offset_y;
}
- if (attributes_mask & GDK_WA_TITLE)
- title = attributes->title;
- else
- title = get_default_title ();
- if (!title || !*title)
- title = "";
-
- impl->native_event_mask = GDK_STRUCTURE_MASK | event_mask;
-
- if (attributes_mask & GDK_WA_TYPE_HINT)
- gdk_window_set_type_hint (window, attributes->type_hint);
-
- if (impl->type_hint == GDK_WINDOW_TYPE_HINT_UTILITY)
- dwExStyle |= WS_EX_TOOLWINDOW;
-
klass = RegisterGdkClass (private->window_type, impl->type_hint);
wtitle = g_utf8_to_utf16 (title, -1, NULL, NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]