From 15904849bf56aa0262adbebfc384f0500a06fabe Mon Sep 17 00:00:00 2001 From: joncruz Date: Sun, 15 Apr 2007 21:12:23 +0000 Subject: [PATCH] Visual layout and spacing cleanup --- src/ege-adjustment-action.cpp | 5 ++++- src/ege-select-one-action.cpp | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/ege-adjustment-action.cpp b/src/ege-adjustment-action.cpp index 5e4fcefa3..1b4062b2f 100644 --- a/src/ege-adjustment-action.cpp +++ b/src/ege-adjustment-action.cpp @@ -714,6 +714,7 @@ static GtkWidget* create_tool_item( GtkAction* action ) g_object_get_property( G_OBJECT(action), "label", &value ); const gchar* sss = g_value_get_string( &value ); GtkWidget* lbl = gtk_label_new( sss ? sss : "wwww" ); + GtkWidget* filler1 = gtk_label_new(" "); { GValue tooltip; @@ -731,8 +732,10 @@ static GtkWidget* create_tool_item( GtkAction* action ) gtk_misc_set_alignment( GTK_MISC(lbl), 1.0, 0.5 ); + gtk_box_pack_start( GTK_BOX(hb), filler1, FALSE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX(hb), lbl, FALSE, FALSE, 0 ); - gtk_box_pack_end( GTK_BOX(hb), spinbutton, FALSE, FALSE, 0 ); + gtk_box_pack_start( GTK_BOX(hb), spinbutton, FALSE, FALSE, 0 ); + gtk_container_add( GTK_CONTAINER(item), hb ); if ( act->private_data->selfId ) { diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp index 636da6e4b..0f1d410ca 100644 --- a/src/ege-select-one-action.cpp +++ b/src/ege-select-one-action.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include "ege-select-one-action.h" @@ -562,6 +563,7 @@ GtkWidget* create_tool_item( GtkAction* action ) gtk_container_add( GTK_CONTAINER(item), holder ); } else { + GtkWidget* holder = gtk_table_new( 1, 3, FALSE ); GtkWidget* normal = gtk_combo_box_new_with_model( act->private_data->model ); GtkCellRenderer * renderer = gtk_cell_renderer_text_new(); @@ -572,7 +574,14 @@ GtkWidget* create_tool_item( GtkAction* action ) g_signal_connect( G_OBJECT(normal), "changed", G_CALLBACK(combo_changed_cb), action ); - gtk_container_add( GTK_CONTAINER(item), normal ); + g_object_set_data( G_OBJECT(holder), "ege-combo-box", normal ); + + GtkWidget* lbl = gtk_label_new(" "); + gtk_table_attach( GTK_TABLE(holder), lbl, 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0 ); + gtk_table_attach( GTK_TABLE(holder), normal, 1, 2, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0 ); + lbl = gtk_label_new(" "); + gtk_table_attach( GTK_TABLE(holder), lbl, 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0 ); + gtk_container_add( GTK_CONTAINER(item), holder ); } gtk_widget_show_all( item ); @@ -605,8 +614,9 @@ void resync_active( EgeSelectOneAction* act, gint active ) /* Search for the things we built up in create_tool_item() */ GList* children = gtk_container_get_children( GTK_CONTAINER(proxies->data) ); if ( children && children->data ) { - if ( GTK_IS_COMBO_BOX(children->data) ) { - GtkComboBox* combo = GTK_COMBO_BOX(children->data); + gpointer combodata = g_object_get_data( G_OBJECT(children->data), "ege-combo-box" ); + if ( GTK_IS_COMBO_BOX(combodata) ) { + GtkComboBox* combo = GTK_COMBO_BOX(combodata); if ( gtk_combo_box_get_active(combo) != active ) { gtk_combo_box_set_active( combo, active ); } -- 2.30.2