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

app: fix GimpRectangleOptions' packing after the GimpFrame change

This commit is contained in:
Michael Natterer 2018-05-30 00:39:15 +02:00
parent 0f484ed3d5
commit b4e5b4ae91
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/tools/gimprectangleoptions.c
View File

@ -755,6 +755,7 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject *config,
const gchar *y_property_name, const gchar *y_property_name,
const gchar *unit_property_name, const gchar *unit_property_name,
const gchar *table_label, const gchar *table_label,
GtkSizeGroup *label_group,
GtkWidget **entry) GtkWidget **entry)
{ {
GimpUnit unit_value; GimpUnit unit_value;
@ -777,6 +778,8 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject *config,
gtk_widget_show (hbox); gtk_widget_show (hbox);
label = gtk_label_new (table_label); label = gtk_label_new (table_label);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_size_group_add_widget (label_group, label);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label); gtk_widget_show (label);
@ -793,18 +796,17 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject *config,
spinbutton = gtk_spin_button_new (adjustment, 1.0, 0); spinbutton = gtk_spin_button_new (adjustment, 1.0, 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbutton), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
*entry = gimp_size_entry_new (1, unit_value, "%a", TRUE, TRUE, FALSE, *entry = gimp_size_entry_new (1, unit_value, "%a", TRUE, TRUE, FALSE,
SB_WIDTH, GIMP_SIZE_ENTRY_UPDATE_SIZE); SB_WIDTH, GIMP_SIZE_ENTRY_UPDATE_SIZE);
gtk_grid_set_column_spacing (GTK_GRID (*entry), 0); gtk_grid_set_column_spacing (GTK_GRID (*entry), 0);
gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (*entry), FALSE); gimp_size_entry_show_unit_menu (GIMP_SIZE_ENTRY (*entry), FALSE);
gtk_box_pack_end (GTK_BOX (hbox), *entry, TRUE, TRUE, 0);
gtk_widget_show (*entry);
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (*entry), gimp_size_entry_add_field (GIMP_SIZE_ENTRY (*entry),
GTK_SPIN_BUTTON (spinbutton), NULL); GTK_SPIN_BUTTON (spinbutton), NULL);
gtk_box_pack_start (GTK_BOX (hbox), spinbutton, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), *entry, FALSE, FALSE, 0);
gtk_widget_show (spinbutton); gtk_widget_show (*entry);
gimp_prop_coordinates_connect (config, gimp_prop_coordinates_connect (config,
x_property_name, y_property_name, x_property_name, y_property_name,
@ -823,6 +825,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
GtkWidget *button; GtkWidget *button;
GtkWidget *combo; GtkWidget *combo;
GtkWidget *frame; GtkWidget *frame;
GtkSizeGroup *label_group;
private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (tool_options); private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (tool_options);
@ -996,11 +999,14 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
g_list_free (children); g_list_free (children);
} }
label_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* X, Y */ /* X, Y */
frame = gimp_rectangle_options_prop_dimension_frame_new (config, frame = gimp_rectangle_options_prop_dimension_frame_new (config,
"x", "y", "x", "y",
"position-unit", "position-unit",
_("Position:"), _("Position:"),
label_group,
&private->position_entry); &private->position_entry);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);
@ -1010,10 +1016,13 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
"width", "height", "width", "height",
"size-unit", "size-unit",
_("Size:"), _("Size:"),
label_group,
&private->size_entry); &private->size_entry);
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame); gtk_widget_show (frame);
g_object_unref (label_group);
/* the Highlight frame */ /* the Highlight frame */
{ {
GtkWidget *scale; GtkWidget *scale;