dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix to work without menubar, don't reset GDK_HINT_USER_POS. 

2008-03-25  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):
	fix to work without menubar, don't reset GDK_HINT_USER_POS.


svn path=/trunk/; revision=25217
This commit is contained in:
Michael Natterer 2008-03-25 10:08:19 +00:00 committed by Michael Natterer
parent 809f4fe608
commit 90c932f705
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-25 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell.c (gimp_display_shell_style_set):
fix to work without menubar, don't reset GDK_HINT_USER_POS.
2008-03-25 Sven Neumann <sven@gimp.org>
* app/gui/gui.c (gui_restore_after_callback): focus the image

21
app/display/gimpdisplayshell.c
View File

@ -590,20 +590,27 @@ gimp_display_shell_style_set (GtkWidget *widget,
GtkStyle *prev_style)
{
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (widget);
GtkRequisition menubar_req;
GtkRequisition statusbar_req;
GtkRequisition requisition;
GdkGeometry geometry;
GTK_WIDGET_CLASS (parent_class)->style_set (widget, prev_style);
gtk_widget_size_request (shell->menubar, &menubar_req);
gtk_widget_size_request (shell->statusbar, &statusbar_req);
gtk_widget_size_request (shell->statusbar, &requisition);
geometry.min_width = statusbar_req.width;
geometry.min_height = statusbar_req.height + menubar_req.height + 1;
geometry.min_width = requisition.width;
geometry.min_height = requisition.height;
if (shell->menubar)
{
gtk_widget_size_request (shell->menubar, &requisition);
geometry.min_height += requisition.height + 1;
}
gtk_window_set_geometry_hints (GTK_WINDOW (widget), NULL,
&geometry, GDK_HINT_MIN_SIZE);
&geometry,
GDK_HINT_MIN_SIZE |
GDK_HINT_USER_POS);
}
static void