From 6d17f4a465ec99cd6071a423a4aed39b78559d64 Mon Sep 17 00:00:00 2001 From: joncruz Date: Thu, 8 Jun 2006 04:39:37 +0000 Subject: [PATCH] Applied patch #1502407. Fixes bug #1500029. --- ChangeLog | 7 +++++++ src/widgets/toolbox.cpp | 24 +++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b43ae4c8..89bba40db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-06-07 Jon A. Cruz + + * src/widgets/toolbox.cpp: + + Applied patch #1502407. + Fixes bug #1500049. + 2006-06-07 Jon A. Cruz * packaging/macosx/ScriptExec/main.c, packaging/osx-app.sh: 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); -- 2.30.2