Commit 96ab019d authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

respect the frame's border width.

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.
parent 80cc1c0e
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.
2004-05-03 Michael Natterer <mitch@gimp.org>
* app/actions/dockable-commands.c (dockable_add_tab_cmd_callback):
......
......@@ -132,13 +132,13 @@ convert_dialog_new (GimpImage *gimage,
G_CALLBACK (indexed_destroy_callback),
dialog);
main_vbox = gtk_vbox_new (FALSE, 4);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->shell)->vbox),
main_vbox);
gtk_widget_show (main_vbox);
frame = gtk_frame_new (_("General Palette Options"));
frame = gimp_frame_new (_("General Palette Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
......@@ -287,7 +287,7 @@ convert_dialog_new (GimpImage *gimage,
dialog->palette_type);
/* the dither type */
frame = gtk_frame_new (_("Dithering Options"));
frame = gimp_frame_new (_("Dithering Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
......@@ -321,15 +321,10 @@ convert_dialog_new (GimpImage *gimage,
for transparent/animated GIFs */
if (gimp_image_has_alpha (gimage))
{
frame = gtk_frame_new (_("[ Warning ]"));
frame = gimp_frame_new (_("[ Warning ]"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
label = gtk_label_new
(_("You are attempting to convert an image with an alpha channel "
"to indexed colors.\n"
......@@ -337,7 +332,7 @@ convert_dialog_new (GimpImage *gimage,
"intend to create a transparent or animated GIF file."));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (vbox), label);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_widget_show (label);
}
......
......@@ -104,9 +104,7 @@ info_window_page_switch (GtkWidget *widget,
gint page_num,
InfoDialog *info_win)
{
InfoWinData *iwd;
iwd = (InfoWinData *) info_win->user_data;
InfoWinData *iwd = (InfoWinData *) info_win->user_data;
iwd->showing_extended = (page_num == 1);
}
......@@ -123,16 +121,14 @@ static void
info_window_create_extended (InfoDialog *info_win,
Gimp *gimp)
{
GtkWidget *hbox;
InfoWinData *iwd = (InfoWinData *) info_win->user_data;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *hbox;
GtkWidget *vbox;
InfoWinData *iwd;
iwd = (InfoWinData *) info_win->user_data;
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_notebook_append_page (GTK_NOTEBOOK (info_win->info_notebook),
vbox, gtk_label_new (_("Extended")));
gtk_widget_show (vbox);
......@@ -140,16 +136,15 @@ info_window_create_extended (InfoDialog *info_win,
/* cursor information */
hbox = gtk_hbox_new (TRUE, 4);
hbox = gtk_hbox_new (TRUE, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
frame = gtk_frame_new (_("Pixels"));
frame = gimp_frame_new (_("Pixels"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -167,12 +162,11 @@ info_window_create_extended (InfoDialog *info_win,
_("Y:"), 1.0, 0.5,
iwd->pixel_labels[1], 1, FALSE);
frame = gtk_frame_new (_("Units"));
frame = gimp_frame_new (_("Units"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -462,7 +456,7 @@ info_window_free (InfoDialog *info_win)
void
info_window_update (GimpDisplay *gdisp)
{
GimpDisplayShell *shell;
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (gdisp->shell);
GimpImage *gimage;
InfoWinData *iwd;
gint type;
......@@ -473,8 +467,6 @@ info_window_update (GimpDisplay *gdisp)
gchar format_buf[32];
InfoDialog *info_win;
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
info_win = shell->info_dialog;
if (! info_win && info_window_auto != NULL)
......
......@@ -197,24 +197,23 @@ palette_import_dialog_new (Gimp *gimp)
import_dialog_drop_callback,
import_dialog);
main_hbox = gtk_hbox_new (FALSE, 4);
main_hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (import_dialog->dialog)->vbox),
main_hbox);
gtk_widget_show (main_hbox);
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* The "Source" frame */
frame = gtk_frame_new (_("Select Source"));
frame = gimp_frame_new (_("Select Source"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -311,12 +310,11 @@ palette_import_dialog_new (Gimp *gimp)
/* The "Import" frame */
frame = gtk_frame_new (_("Import Options"));
frame = gimp_frame_new (_("Import Options"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (4, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -370,12 +368,11 @@ palette_import_dialog_new (Gimp *gimp)
/* The "Preview" frame */
frame = gtk_frame_new (_("Preview"));
frame = gimp_frame_new (_("Preview"));
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
gtk_container_add (GTK_CONTAINER (frame), abox);
gtk_widget_show (abox);
......
......@@ -204,7 +204,7 @@ resize_widget_new (GimpViewable *viewable,
window_title = _("Scale Layer");
window_desc = _("Scale Layer Options");
help_page = GIMP_HELP_LAYER_SCALE;
frame = gtk_frame_new (_("Size"));
frame = gimp_frame_new (_("Size"));
break;
case ResizeImage:
......@@ -212,7 +212,7 @@ resize_widget_new (GimpViewable *viewable,
window_title = _("Scale Image");
window_desc = _("Scale Image Options");
help_page = GIMP_HELP_IMAGE_SCALE;
frame = gtk_frame_new (_("Pixel Dimensions"));
frame = gimp_frame_new (_("Pixel Dimensions"));
break;
}
break;
......@@ -236,7 +236,7 @@ resize_widget_new (GimpViewable *viewable,
help_page = GIMP_HELP_IMAGE_RESIZE;
break;
}
frame = gtk_frame_new (_("Size"));
frame = gimp_frame_new (_("Size"));
break;
}
......@@ -265,7 +265,7 @@ resize_widget_new (GimpViewable *viewable,
}
/* the main vbox */
main_vbox = gtk_vbox_new (FALSE, 4);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (resize->resize_shell)->vbox),
main_vbox);
......@@ -275,11 +275,9 @@ resize_widget_new (GimpViewable *viewable,
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
table = gtk_table_new (6, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
......@@ -455,12 +453,11 @@ resize_widget_new (GimpViewable *viewable,
GtkWidget *button;
GtkWidget *abox;
frame = gtk_frame_new (_("Offset"));
frame = gimp_frame_new (_("Offset"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
......@@ -546,12 +543,11 @@ resize_widget_new (GimpViewable *viewable,
/* the resolution stuff */
if ((type == ScaleWidget) && (resize->target == ResizeImage))
{
frame = gtk_frame_new (_("Print Size & Display Unit"));
frame = gimp_frame_new (_("Print Size & Display Unit"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (frame), vbox);
table = gtk_table_new (4, 2, FALSE);
......
......@@ -132,13 +132,13 @@ convert_dialog_new (GimpImage *gimage,
G_CALLBACK (indexed_destroy_callback),
dialog);
main_vbox = gtk_vbox_new (FALSE, 4);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->shell)->vbox),
main_vbox);
gtk_widget_show (main_vbox);
frame = gtk_frame_new (_("General Palette Options"));
frame = gimp_frame_new (_("General Palette Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
......@@ -287,7 +287,7 @@ convert_dialog_new (GimpImage *gimage,
dialog->palette_type);
/* the dither type */
frame = gtk_frame_new (_("Dithering Options"));
frame = gimp_frame_new (_("Dithering Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
......@@ -321,15 +321,10 @@ convert_dialog_new (GimpImage *gimage,
for transparent/animated GIFs */
if (gimp_image_has_alpha (gimage))
{
frame = gtk_frame_new (_("[ Warning ]"));
frame = gimp_frame_new (_("[ Warning ]"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 1);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
label = gtk_label_new
(_("You are attempting to convert an image with an alpha channel "
"to indexed colors.\n"
......@@ -337,7 +332,7 @@ convert_dialog_new (GimpImage *gimage,
"intend to create a transparent or animated GIF file."));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (vbox), label);
gtk_container_add (GTK_CONTAINER (frame), label);
gtk_widget_show (label);
}
......
......@@ -104,9 +104,7 @@ info_window_page_switch (GtkWidget *widget,
gint page_num,
InfoDialog *info_win)
{
InfoWinData *iwd;
iwd = (InfoWinData *) info_win->user_data;
InfoWinData *iwd = (InfoWinData *) info_win->user_data;
iwd->showing_extended = (page_num == 1);
}
......@@ -123,16 +121,14 @@ static void
info_window_create_extended (InfoDialog *info_win,
Gimp *gimp)
{
GtkWidget *hbox;
InfoWinData *iwd = (InfoWinData *) info_win->user_data;
GtkWidget *frame;
GtkWidget *table;
GtkWidget *hbox;
GtkWidget *vbox;
InfoWinData *iwd;
iwd = (InfoWinData *) info_win->user_data;
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_notebook_append_page (GTK_NOTEBOOK (info_win->info_notebook),
vbox, gtk_label_new (_("Extended")));
gtk_widget_show (vbox);
......@@ -140,16 +136,15 @@ info_window_create_extended (InfoDialog *info_win,
/* cursor information */
hbox = gtk_hbox_new (TRUE, 4);
hbox = gtk_hbox_new (TRUE, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
frame = gtk_frame_new (_("Pixels"));
frame = gimp_frame_new (_("Pixels"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -167,12 +162,11 @@ info_window_create_extended (InfoDialog *info_win,
_("Y:"), 1.0, 0.5,
iwd->pixel_labels[1], 1, FALSE);
frame = gtk_frame_new (_("Units"));
frame = gimp_frame_new (_("Units"));
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -462,7 +456,7 @@ info_window_free (InfoDialog *info_win)
void
info_window_update (GimpDisplay *gdisp)
{
GimpDisplayShell *shell;
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (gdisp->shell);
GimpImage *gimage;
InfoWinData *iwd;
gint type;
......@@ -473,8 +467,6 @@ info_window_update (GimpDisplay *gdisp)
gchar format_buf[32];
InfoDialog *info_win;
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
info_win = shell->info_dialog;
if (! info_win && info_window_auto != NULL)
......
......@@ -197,24 +197,23 @@ palette_import_dialog_new (Gimp *gimp)
import_dialog_drop_callback,
import_dialog);
main_hbox = gtk_hbox_new (FALSE, 4);
main_hbox = gtk_hbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (import_dialog->dialog)->vbox),
main_hbox);
gtk_widget_show (main_hbox);
vbox = gtk_vbox_new (FALSE, 4);
vbox = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
/* The "Source" frame */
frame = gtk_frame_new (_("Select Source"));
frame = gimp_frame_new (_("Select Source"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (2, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -311,12 +310,11 @@ palette_import_dialog_new (Gimp *gimp)
/* The "Import" frame */
frame = gtk_frame_new (_("Import Options"));
frame = gimp_frame_new (_("Import Options"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
table = gtk_table_new (4, 3, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 4);
gtk_table_set_col_spacings (GTK_TABLE (table), 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
gtk_container_add (GTK_CONTAINER (frame), table);
......@@ -370,12 +368,11 @@ palette_import_dialog_new (Gimp *gimp)
/* The "Preview" frame */
frame = gtk_frame_new (_("Preview"));
frame = gimp_frame_new (_("Preview"));
gtk_box_pack_start (GTK_BOX (main_hbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_set_border_width (GTK_CONTAINER (abox), 4);
gtk_container_add (GTK_CONTAINER (frame), abox);
gtk_widget_show (abox);
......
......@@ -204,7 +204,7 @@ resize_widget_new (GimpViewable *viewable,
window_title = _("Scale Layer");
window_desc = _("Scale Layer Options");
help_page = GIMP_HELP_LAYER_SCALE;
frame = gtk_frame_new (_("Size"));
frame = gimp_frame_new (_("Size"));
break;
case ResizeImage:
......@@ -212,7 +212,7 @@ resize_widget_new (GimpViewable *viewable,
window_title = _("Scale Image");
window_desc = _("Scale Image Options");
help_page = GIMP_HELP_IMAGE_SCALE;
frame = gtk_frame_new (_("Pixel Dimensions"));
frame = gimp_frame_new (_("Pixel Dimensions"));
break;
}
break;
......@@ -236,7 +236,7 @@ resize_widget_new (GimpViewable *viewable,
help_page = GIMP_HELP_IMAGE_RESIZE;
break;
}
frame = gtk_frame_new (_("Size"));
frame = gimp_frame_new (_("Size"));
break;
}
......@@ -265,7 +265,7 @@ resize_widget_new (GimpViewable *viewable,
}
/* the main vbox */
main_vbox = gtk_vbox_new (FALSE, 4);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 6);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (resize->resize_shell)->vbox),
main_vbox);
......@@ -275,11 +275,9 @@ resize_widget_new (GimpViewable *viewable,
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
gtk_container_add (GTK_CONTAINER (frame), vbox);
table = gtk_table_new (6, 2, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 2);
gtk_table_set_col_spacings (GTK_TABLE (table), 2);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 2);
......@@ -455,12 +453,11 @@ resize_widget_new (GimpViewable *viewable,
GtkWidget *button;
GtkWidget *abox;
frame = gtk_frame_new (_("Offset"));
frame = gimp_frame_new (_("Offset"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
......@@ -546,12 +543,11 @@ resize_widget_new (GimpViewable *viewable,
/* the resolution stuff */
if ((type == ScaleWidget) && (resize->target == ResizeImage))
{
frame = gtk_frame_new (_("Print Size & Display Unit"));
frame = gimp_frame_new (_("Print Size & Display Unit"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
vbox = gtk_vbox_new (FALSE, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 2);
vbox = gtk_vbox_new (FALSE, 6);
gtk_container_add (GTK_CONTAINER (frame), vbox);
table = gtk_table_new (4, 2, FALSE);
......
......@@ -43,7 +43,7 @@ static void gimp_color_frame_menu_callback (GtkWidget *widget,
static void gimp_color_frame_update (GimpColorFrame *frame);
static GtkFrameClass *parent_class = NULL;
static GimpFrameClass *parent_class = NULL;
GType
......@@ -66,7 +66,7 @@ gimp_color_frame_get_type (void)
(GInstanceInitFunc) gimp_color_frame_init,
};
type = g_type_register_static (GTK_TYPE_FRAME,
type = g_type_register_static (GIMP_TYPE_FRAME,
"GimpColorFrame",
&frame_info, 0);
}
......
......@@ -39,7 +39,7 @@ typedef struct _GimpColorFrameClass GimpColorFrameClass;
struct _GimpColorFrame
{
GtkFrame parent_instance;
GimpFrame parent_instance;
gboolean sample_valid;
GimpImageType sample_type;
......@@ -55,7 +55,7 @@ struct _GimpColorFrame
struct _GimpColorFrameClass
{
GtkFrameClass parent_class;
GimpFrameClass parent_class;
};
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment