[gtk+/gtk-2-24] Win32: Honor the geometry when GDK_HINT_MAX_SIZE is set.



commit 280fc402be5fb46b66bcd32056963bb1afb8b54b
Author: Cody Russell <cody jhu edu>
Date:   Thu Oct 31 15:54:28 2013 -0500

    Win32: Honor the geometry when GDK_HINT_MAX_SIZE is set.
    
    The MINMAXINFO struct was being populated based upon geometry hints when
    GDK_HINT_MAX_SIZE flag was enabled, then promptly having its values blown
    away with default values.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=711110

 gdk/win32/gdkevents-win32.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 1cde4fc..8b345cb 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3303,6 +3303,11 @@ gdk_event_translate (MSG  *msg,
          mmi->ptMaxTrackSize.x = maxw > 0 && maxw < G_MAXSHORT ? maxw : G_MAXSHORT;
          mmi->ptMaxTrackSize.y = maxh > 0 && maxh < G_MAXSHORT ? maxh : G_MAXSHORT;
        }
+      else
+       {
+         mmi->ptMaxTrackSize.x = 30000;
+         mmi->ptMaxTrackSize.y = 30000;
+       }
 
       if (impl->hint_flags & (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE))
        {
@@ -3315,8 +3320,7 @@ gdk_event_translate (MSG  *msg,
                                     mmi->ptMaxSize.x, mmi->ptMaxSize.y));
          return_val = TRUE;
        }
-      mmi->ptMaxTrackSize.x = 30000;
-      mmi->ptMaxTrackSize.y = 30000;
+
       return_val = TRUE;
       break;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]