nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-19 12:08:05 -05:00
Code Issues Projects Releases Wiki Activity

Use columns_force_same_height() for vertical centring.

Browse Source 
In cases where two controls sit alongside one another such as a label
alongside an edit box, I've previously been arranging for them to be
vertically centred by fiddling with the size request and alignment of
what I assume will be the shorter control. But now I've written
columns_force_same_height(), that's a much easier approach, and it's
also compatible with GTK3 without using a deprecated method; so this
change switches over all vertical centring to doing it that way.

Also, while I'm here, I noticed that the edit box and button of
CTRL_FILESELECT / CTRL_FONTSELECT were not vertically centred, and
since it's now really easy to make sure they are, I've added another
use of columns_force_same_height() there.
This commit is contained in:
Simon Tatham 2015-08-24 19:23:38 +01:00
parent d507e99d20
commit 22ed04d00e
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
unix/gtkdlg.c
View File

@ -2040,7 +2040,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
break; break;
case CTRL_EDITBOX: case CTRL_EDITBOX:
{ {
GtkRequisition req;
GtkWidget *signalobject; GtkWidget *signalobject;
if (ctrl->editbox.has_list) { if (ctrl->editbox.has_list) {
@ -2085,13 +2084,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
g_signal_connect(G_OBJECT(signalobject), "focus_out_event", g_signal_connect(G_OBJECT(signalobject), "focus_out_event",
G_CALLBACK(editbox_lostfocus), dp); G_CALLBACK(editbox_lostfocus), dp);
/*
* Find out the edit box's height, which we'll need
* for vertical centring below (and, in GTK2, size
* tweaking as well).
*/
gtk_widget_size_request(w, &req);
#if !GTK_CHECK_VERSION(3,0,0) #if !GTK_CHECK_VERSION(3,0,0)
/* /*
* Edit boxes, for some strange reason, have a minimum * Edit boxes, for some strange reason, have a minimum
@ -2099,7 +2091,11 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
* rather the edit boxes acquired their natural width * rather the edit boxes acquired their natural width
* from the column layout of the rest of the box. * from the column layout of the rest of the box.
*/ */
{
GtkRequisition req;
gtk_widget_size_request(w, &req);
gtk_widget_set_size_request(w, 10, req.height); gtk_widget_set_size_request(w, 10, req.height);
}
#else #else
/* /*
* In GTK 3, this is still true, but there's a special * In GTK 3, this is still true, but there's a special
@ -2130,9 +2126,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
columns_add(COLUMNS(container), label, 0, 1); columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label); columns_force_left_align(COLUMNS(container), label);
columns_add(COLUMNS(container), w, 1, 1); columns_add(COLUMNS(container), w, 1, 1);
/* Centre the label vertically. */ columns_force_same_height(COLUMNS(container),
gtk_widget_set_size_request(label, -1, req.height); label, w);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
} }
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(w); gtk_widget_show(w);
@ -2184,6 +2179,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
columns_add(COLUMNS(w), ww, 1, 1); columns_add(COLUMNS(w), ww, 1, 1);
gtk_widget_show(ww); gtk_widget_show(ww);
columns_force_same_height(COLUMNS(w), uc->entry, uc->button);
g_signal_connect(G_OBJECT(uc->entry), "key_press_event", g_signal_connect(G_OBJECT(uc->entry), "key_press_event",
G_CALLBACK(editbox_key), dp); G_CALLBACK(editbox_key), dp);
uc->entrysig = uc->entrysig =
@ -2441,7 +2438,6 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
if (ctrl->generic.label) { if (ctrl->generic.label) {
GtkWidget *label, *container; GtkWidget *label, *container;
GtkRequisition req;
label = gtk_label_new(ctrl->generic.label); label = gtk_label_new(ctrl->generic.label);
gtk_label_set_width_chars(GTK_LABEL(label), 3); gtk_label_set_width_chars(GTK_LABEL(label), 3);
@ -2462,10 +2458,8 @@ GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
columns_add(COLUMNS(container), label, 0, 1); columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label); columns_force_left_align(COLUMNS(container), label);
columns_add(COLUMNS(container), w, 1, 1); columns_add(COLUMNS(container), w, 1, 1);
/* Centre the label vertically. */ columns_force_same_height(COLUMNS(container),
gtk_widget_size_request(w, &req); label, w);
gtk_widget_set_size_request(label, -1, req.height);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
} }
gtk_widget_show(label); gtk_widget_show(label);
gtk_widget_show(w); gtk_widget_show(w);