diff options
author | Elliot Lee <sopwith@redhat.com> | 2000-06-20 20:22:05 +0000 |
---|---|---|
committer | Elliot Lee <sopwith@src.gnome.org> | 2000-06-20 20:22:05 +0000 |
commit | 8f4f35b392510a8b480dd0c7e6030ab834f6aa43 (patch) | |
tree | 43279f2410f52f6548858709bbb344ac4d9054e8 /gtk/gtkwindow.c | |
parent | dd7510dccbf51df37e0d02d31f4daed4e52152e6 (diff) | |
download | gtk+-8f4f35b392510a8b480dd0c7e6030ab834f6aa43.tar.gz |
(follow-on from previous commit)
(follow-on from previous commit)
2000-06-18 Elliot Lee <sopwith@redhat.com>
* gtk/gtkwindow.c: Don't allow creation of a window bigger than the screen.
* gtk/gtkrange.c: Fix the mega-jumpy-with-lagged-events scrollbar
problem by calculating event position relative to the trough
rather than the slider.
* gtk/gtkdnd.c, gtk/gtkcolorsel.c: Include FB headers if appropriate.
* gdk/gdkgc.h: Add GDK_NOR.
* configure.in, Makefile.am: Add modules top level dir
* configure.in: Only use pangox library if building x11 target.
* gdk/gdkdnd.h: Add GDK_DRAG_PROTO_LOCAL enum for future intra-app use.
Diffstat (limited to 'gtk/gtkwindow.c')
-rw-r--r-- | gtk/gtkwindow.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 1be60d5b03..11a0d83cff 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -33,6 +33,8 @@ #include "x11/gdkx.h" #elif defined (GDK_WINDOWING_WIN32) #include "win32/gdkwin32.h" +#elif defined (GDK_WINDOWING_FB) +#include "linux-fb/gdkfb.h" #elif defined (GDK_WINDOWING_NANOX) #include "nanox/gdkprivate-nanox.h" #endif @@ -1826,6 +1828,9 @@ gtk_window_compute_default_size (GtkWindow *window, *width = info->width > 0 ? info->width : *width; *height = info->height > 0 ? info->height : *height; } + + *width = MIN(*width, gdk_screen_width()); + *height = MIN(*width, gdk_screen_height()); } /* Constrain a window size to obey the hints passed in geometry |