diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-06-08 04:39:37 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-06-08 04:39:37 +0000 |
| commit | b1dd729d05a3fdb0bd18ff05fd67ddce0d7e3c1f (patch) | |
| tree | 95d89d56539b2db14f9c15a140edb700b1092c6c /src/widgets/toolbox.cpp | |
| parent | Applied patch #1502063 (diff) | |
| download | inkscape-b1dd729d05a3fdb0bd18ff05fd67ddce0d7e3c1f.tar.gz inkscape-b1dd729d05a3fdb0bd18ff05fd67ddce0d7e3c1f.zip | |
Applied patch #1502407. Fixes bug #1500029.
(bzr r1181)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index d0f070886..cb9557677 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -2928,20 +2928,23 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl) } //Orientation + //locking both buttons, changing one affect all group (both) + GtkWidget *button = GTK_WIDGET (g_object_get_data (G_OBJECT (tbl), "orientation-horizontal")); + g_object_set_data (G_OBJECT (button), "block", gpointer(1)); + + GtkWidget *button1 = GTK_WIDGET (g_object_get_data (G_OBJECT (tbl), "orientation-vertical")); + g_object_set_data (G_OBJECT (button1), "block", gpointer(1)); + if (query->writing_mode.computed == SP_CSS_WRITING_MODE_LR_TB) { - GtkWidget *button = GTK_WIDGET (g_object_get_data (G_OBJECT (tbl), "orientation-horizontal")); - g_object_set_data (G_OBJECT (button), "block", gpointer(1)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (button), "block", gpointer(0)); } else { - GtkWidget *button = GTK_WIDGET (g_object_get_data (G_OBJECT (tbl), "orientation-vertical")); - g_object_set_data (G_OBJECT (button), "block", gpointer(1)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - g_object_set_data (G_OBJECT (button), "block", gpointer(0)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button1), TRUE); } + g_object_set_data (G_OBJECT (button), "block", gpointer(0)); + g_object_set_data (G_OBJECT (button1), "block", gpointer(0)); } } @@ -3142,8 +3145,11 @@ void sp_text_toolbox_orientation_toggled (GtkRadioButton *button, gpointer data) { - if (g_object_get_data (G_OBJECT (button), "block")) return; - + if (g_object_get_data (G_OBJECT (button), "block")) { + g_object_set_data (G_OBJECT (button), "block", gpointer(0)); + return; + } + SPDesktop *desktop = SP_ACTIVE_DESKTOP; SPCSSAttr *css = sp_repr_css_attr_new (); int prop = GPOINTER_TO_INT(data); |