nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-01 01:10:29 -05:00
Code Issues Projects Releases Wiki Activity

New Columns method, columns_force_same_height().

Browse Source 
This forces two child widgets of a Columns to occupy the same amount
of vertical space, and if one is really shorter than the other,
vertically centres it in the extra space.
This commit is contained in:
Simon Tatham 2015-08-24 19:23:32 +01:00
parent 47ff8d0bf0
commit d507e99d20
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
unix/gtkcols.c
View File

@ -290,6 +290,14 @@ static void columns_remove(GtkContainer *container, GtkWidget *widget)
gtk_widget_unparent(widget); gtk_widget_unparent(widget);
cols->children = g_list_remove_link(cols->children, children); cols->children = g_list_remove_link(cols->children, children);
g_list_free(children); g_list_free(children);
if (child->same_height_as) {
g_return_if_fail(child->same_height_as->same_height_as == child);
child->same_height_as->same_height_as = NULL;
if (gtk_widget_get_visible(child->same_height_as->widget))
gtk_widget_queue_resize(GTK_WIDGET(container));
}
g_free(child); g_free(child);
if (was_visible) if (was_visible)
gtk_widget_queue_resize(GTK_WIDGET(container)); gtk_widget_queue_resize(GTK_WIDGET(container));
@ -397,6 +405,7 @@ void columns_add(Columns *cols, GtkWidget *child,
childdata->colstart = colstart; childdata->colstart = colstart;
childdata->colspan = colspan; childdata->colspan = colspan;
childdata->force_left = FALSE; childdata->force_left = FALSE;
childdata->same_height_as = NULL;
cols->children = g_list_append(cols->children, childdata); cols->children = g_list_append(cols->children, childdata);
cols->taborder = g_list_append(cols->taborder, child); cols->taborder = g_list_append(cols->taborder, child);
@ -450,6 +459,26 @@ void columns_force_left_align(Columns *cols, GtkWidget *widget)
gtk_widget_queue_resize(GTK_WIDGET(cols)); gtk_widget_queue_resize(GTK_WIDGET(cols));
} }
void columns_force_same_height(Columns *cols, GtkWidget *cw1, GtkWidget *cw2)
{
ColumnsChild *child1, *child2;
g_return_if_fail(cols != NULL);
g_return_if_fail(IS_COLUMNS(cols));
g_return_if_fail(cw1 != NULL);
g_return_if_fail(cw2 != NULL);
child1 = columns_find_child(cols, cw1);
g_return_if_fail(child1 != NULL);
child2 = columns_find_child(cols, cw2);
g_return_if_fail(child2 != NULL);
child1->same_height_as = child2;
child2->same_height_as = child1;
if (gtk_widget_get_visible(cw1) || gtk_widget_get_visible(cw2))
gtk_widget_queue_resize(GTK_WIDGET(cols));
}
void columns_taborder_last(Columns *cols, GtkWidget *widget) void columns_taborder_last(Columns *cols, GtkWidget *widget)
{ {
GtkWidget *childw; GtkWidget *childw;
@ -724,6 +753,11 @@ static gint columns_compute_height(Columns *cols, widget_dim_fn_t get_height)
continue; continue;
childheight = get_height(child); childheight = get_height(child);
if (child->same_height_as) {
gint childheight2 = get_height(child->same_height_as);
if (childheight < childheight2)
childheight = childheight2;
}
colspan = child->colspan ? child->colspan : ncols-child->colstart; colspan = child->colspan ? child->colspan : ncols-child->colstart;
/* /*
@ -764,7 +798,7 @@ static void columns_alloc_vert(Columns *cols, gint ourheight,
{ {
ColumnsChild *child; ColumnsChild *child;
GList *children; GList *children;
gint i, ncols, colspan, *colypos, childheight; gint i, ncols, colspan, *colypos, realheight, fakeheight;
ncols = 1; ncols = 1;
/* As in size_request, colypos is the lowest y reached in each column. */ /* As in size_request, colypos is the lowest y reached in each column. */
@ -791,7 +825,12 @@ static void columns_alloc_vert(Columns *cols, gint ourheight,
if (!gtk_widget_get_visible(child->widget)) if (!gtk_widget_get_visible(child->widget))
continue; continue;
childheight = get_height(child); realheight = fakeheight = get_height(child);
if (child->same_height_as) {
gint childheight2 = get_height(child->same_height_as);
if (fakeheight < childheight2)
fakeheight = childheight2;
}
colspan = child->colspan ? child->colspan : ncols-child->colstart; colspan = child->colspan ? child->colspan : ncols-child->colstart;
/* /*
@ -809,9 +848,9 @@ static void columns_alloc_vert(Columns *cols, gint ourheight,
if (topy < colypos[child->colstart+i]) if (topy < colypos[child->colstart+i])
topy = colypos[child->colstart+i]; topy = colypos[child->colstart+i];
} }
child->y = topy; child->y = topy + fakeheight/2 - realheight/2;
child->h = childheight; child->h = realheight;
boty = topy + childheight + cols->spacing; boty = topy + fakeheight + cols->spacing;
for (i = 0; i < colspan; i++) { for (i = 0; i < colspan; i++) {
colypos[child->colstart+i] = boty; colypos[child->colstart+i] = boty;
} }

2
unix/gtkcols.h
View File

@ -42,6 +42,7 @@ struct ColumnsChild_tag {
GtkWidget *widget; GtkWidget *widget;
gint colstart, colspan; gint colstart, colspan;
gboolean force_left; /* for recalcitrant GtkLabels */ gboolean force_left; /* for recalcitrant GtkLabels */
ColumnsChild *same_height_as;
/* Otherwise, this entry represents a change in the column setup. */ /* Otherwise, this entry represents a change in the column setup. */
gint ncols; gint ncols;
gint *percentages; gint *percentages;
@ -55,6 +56,7 @@ void columns_add(Columns *cols, GtkWidget *child,
gint colstart, gint colspan); gint colstart, gint colspan);
void columns_taborder_last(Columns *cols, GtkWidget *child); void columns_taborder_last(Columns *cols, GtkWidget *child);
void columns_force_left_align(Columns *cols, GtkWidget *child); void columns_force_left_align(Columns *cols, GtkWidget *child);
void columns_force_same_height(Columns *cols, GtkWidget *ch1, GtkWidget *ch2);
#ifdef __cplusplus #ifdef __cplusplus
} }