summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-02-02 16:51:04 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-02-02 16:51:04 +0000
commit88fcefb63d50d179cc29448df620b802d6b81cb2 (patch)
treecfe88bff1288e29a831183585fca0d67a1d7a6df /src
parent* [INTL: tr] Turkish update by Emir Onuk (closes part of: #187575) (diff)
downloadinkscape-88fcefb63d50d179cc29448df620b802d6b81cb2.tar.gz
inkscape-88fcefb63d50d179cc29448df620b802d6b81cb2.zip
Fix for LP #168959 as per John Cliff's 'patch' in the bug tracker
(bzr r4637)
Diffstat (limited to 'src')
-rw-r--r--src/widgets/toolbox.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 31720b3e8..fcf437288 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1717,6 +1717,9 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
GtkAdjustment *adj = 0;
+ gchar const *flatsidedstr = prefs_get_string_attribute( "tools.shapes.star", "isflatsided" );
+ bool isFlatSided = flatsidedstr ? (strcmp(flatsidedstr, "false") != 0) : true;
+
if (!strcmp(name, "inkscape:randomized")) {
adj = GTK_ADJUSTMENT( gtk_object_get_data(GTK_OBJECT(tbl), "randomized") );
gtk_adjustment_set_value(adj, sp_repr_get_double_attribute(repr, "inkscape:randomized", 0.0));
@@ -1734,7 +1737,7 @@ static void star_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const *n
ege_select_one_action_set_active( flat_action, 0 );
gtk_action_set_sensitive( prop_action, FALSE );
}
- } else if (!strcmp(name, "sodipodi:r1") || !strcmp(name, "sodipodi:r2")) {
+ } else if ((!strcmp(name, "sodipodi:r1") || !strcmp(name, "sodipodi:r2")) && (!isFlatSided) ) {
adj = (GtkAdjustment*)gtk_object_get_data(GTK_OBJECT(tbl), "proportion");
gdouble r1 = sp_repr_get_double_attribute(repr, "sodipodi:r1", 1.0);
gdouble r2 = sp_repr_get_double_attribute(repr, "sodipodi:r2", 1.0);