procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'wip/martymichal/center-edit-button-image' into 'master'

Browse source 
app: Align edit tool button with text entry

See merge request GNOME/gimp!2352
This commit is contained in:
Ondřej Míchal 2025-07-01 13:32:21 +03:00
commit 306d2fbd6c
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/widgets/gimpviewablebox.c
View file

@ -625,13 +625,14 @@ gimp_viewable_box_new (GimpContainer *container,
const gchar *editor_id, const gchar *editor_id,
const gchar *editor_tooltip) const gchar *editor_tooltip)
{ {
GtkWidget *viewable_box;
GtkWidget *hbox; GtkWidget *hbox;
GtkWidget *button; GtkWidget *button;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *l; GtkWidget *l;
GtkWidget *entry; GtkWidget *entry;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing); viewable_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing);
button = gimp_viewable_button_new (container, context, button = gimp_viewable_button_new (container, context,
view_type, button_view_size, view_size, 1, view_type, button_view_size, view_size, 1,
@ -643,13 +644,13 @@ gimp_viewable_box_new (GimpContainer *container,
gimp_view_renderer_set_size_full (GIMP_VIEW (GIMP_VIEWABLE_BUTTON (button)->view)->renderer, gimp_view_renderer_set_size_full (GIMP_VIEW (GIMP_VIEWABLE_BUTTON (button)->view)->renderer,
button_view_size, button_view_size, 1); button_view_size, button_view_size, 1);
g_object_set_data (G_OBJECT (hbox), "viewable-button", button); g_object_set_data (G_OBJECT (viewable_box), "viewable-button", button);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (viewable_box), button, FALSE, FALSE, 0);
gtk_widget_show (button); gtk_widget_show (button);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (viewable_box), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox); gtk_widget_show (vbox);
if (label) if (label)
@ -660,13 +661,17 @@ gimp_viewable_box_new (GimpContainer *container,
gtk_widget_show (l); gtk_widget_show (l);
} }
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_widget_show (hbox);
entry = gimp_container_entry_new (container, context, view_size, 1); entry = gimp_container_entry_new (container, context, view_size, 1);
/* set a silly smally size request on the entry to disable /* set a silly smally size request on the entry to disable
* GtkEntry's minimal width of 150 pixels. * GtkEntry's minimal width of 150 pixels.
*/ */
gtk_entry_set_width_chars (GTK_ENTRY (entry), 4); gtk_entry_set_width_chars (GTK_ENTRY (entry), 4);
gtk_box_pack_end (GTK_BOX (vbox), entry, label ? FALSE : TRUE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
gtk_widget_show (entry); gtk_widget_show (entry);
if (editor_id) if (editor_id)
@ -676,7 +681,7 @@ gimp_viewable_box_new (GimpContainer *container,
edit_button = gtk_button_new (); edit_button = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (edit_button), GTK_RELIEF_NONE); gtk_button_set_relief (GTK_BUTTON (edit_button), GTK_RELIEF_NONE);
gtk_box_pack_end (GTK_BOX (hbox), edit_button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), edit_button, FALSE, FALSE, 0);
gtk_widget_show (edit_button); gtk_widget_show (edit_button);
if (editor_tooltip) if (editor_tooltip)
@ -684,7 +689,8 @@ gimp_viewable_box_new (GimpContainer *container,
image = gtk_image_new_from_icon_name (GIMP_ICON_EDIT, image = gtk_image_new_from_icon_name (GIMP_ICON_EDIT,
GTK_ICON_SIZE_BUTTON); GTK_ICON_SIZE_BUTTON);
gtk_widget_set_valign (image, GTK_ALIGN_END); gtk_widget_set_valign (image, GTK_ALIGN_CENTER);
gtk_widget_set_halign (image, GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (edit_button), image); gtk_container_add (GTK_CONTAINER (edit_button), image);
gtk_widget_show (image); gtk_widget_show (image);
@ -698,7 +704,7 @@ gimp_viewable_box_new (GimpContainer *container,
button); button);
} }
return hbox; return viewable_box;
} }
static GtkWidget * static GtkWidget *