callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

respect the frame's border width.

Browse Source 
2004-05-03  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpframe.c (gimp_frame_size_allocate): respect
	the frame's border width.

	* app/widgets/gimpcolorframe.[ch]: derive from GimpFrame.

	* app/gui/convert-dialog.c
	* app/gui/info-window.c
	* app/gui/palette-import-dialog.c
	* app/gui/resize-dialog.c: use GimpFrames, changed some spacings.
This commit is contained in:
Sven Neumann
2004-05-02 22:33:33 +00:00
committed by Sven Neumann
parent 80cc1c0ef4
commit 96ab019dd9
12 changed files with 75 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libgimpwidgets/gimpframe.c
View File

@ -149,8 +149,8 @@ gimp_frame_size_request (GtkWidget *widget,
requisition->height += child_requisition.height;
}
requisition->width += GTK_CONTAINER (widget)->border_width;
requisition->height += GTK_CONTAINER (widget)->border_width;
requisition->width += 2 * GTK_CONTAINER (widget)->border_width;
requisition->height += 2 * GTK_CONTAINER (widget)->border_width;
}
static void
@ -171,6 +171,7 @@ gimp_frame_size_allocate (GtkWidget *widget,
{
GtkAllocation label_allocation;
GtkRequisition label_requisition;
gint border_width = GTK_CONTAINER (widget)->border_width;
gfloat xalign;
gtk_widget_get_child_requisition (frame->label_widget,
@ -181,10 +182,10 @@ gimp_frame_size_allocate (GtkWidget *widget,
else
xalign = 1.0 - frame->label_xalign;
label_allocation.x = (allocation->x +
label_allocation.x = (allocation->x + border_width +
xalign * (gfloat) (allocation->width -
label_requisition.width));
label_allocation.y = allocation->y;
label_allocation.y = allocation->y + border_width;
label_allocation.width = label_requisition.width;
label_allocation.height = label_requisition.height;