summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2010-04-25 08:56:03 +0000
committerJon A. Cruz <jon@joncruz.org>2010-04-25 08:56:03 +0000
commit1f79261ddf905dfdc4c2dd90c63a747f7f01d2d5 (patch)
tree94ddb1f93d4a6fe4b7ec67280ad20f57cc3a3aff /src
parentAdd alt-x shortcut to new text toolbar. (diff)
downloadinkscape-1f79261ddf905dfdc4c2dd90c63a747f7f01d2d5.tar.gz
inkscape-1f79261ddf905dfdc4c2dd90c63a747f7f01d2d5.zip
Pack combo boxes into GtkAlignment for natural size when used in toolbars.
(bzr r9370)
Diffstat (limited to 'src')
-rw-r--r--src/ink-comboboxentry-action.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp
index 85e9378c8..60332e02e 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/ink-comboboxentry-action.cpp
@@ -312,7 +312,11 @@ GtkWidget* create_tool_item( GtkAction* action )
GtkWidget* comboBoxEntry = gtk_combo_box_entry_new_with_model( ink_comboboxentry_action->model, 0 );
- gtk_container_add( GTK_CONTAINER(item), comboBoxEntry );
+ {
+ GtkWidget *align = gtk_alignment_new(0, 0.5, 0, 0);
+ gtk_container_add( GTK_CONTAINER(align), comboBoxEntry );
+ gtk_container_add( GTK_CONTAINER(item), align );
+ }
ink_comboboxentry_action->combobox = GTK_COMBO_BOX_ENTRY(comboBoxEntry);
@@ -347,7 +351,7 @@ GtkWidget* create_tool_item( GtkAction* action )
// Add altx_name if required
if( ink_comboboxentry_action->altx_name ) {
- g_object_set_data( G_OBJECT( child ), ink_comboboxentry_action->altx_name, ink_comboboxentry_action->entry );
+ g_object_set_data( G_OBJECT( child ), ink_comboboxentry_action->altx_name, ink_comboboxentry_action->entry );
}
// Add signal for GtkEntry to check if finished typing.