summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-07-30 17:04:34 +0000
committerjabiertxof <info@marker.es>2016-07-30 17:04:34 +0000
commit7f16afbb515eceed9c63afacec73cd528a662327 (patch)
tree08fefaef37d88f75a4f615dbe4861a9a957312a2 /src/ui/widget
parentFixes positions of labels (diff)
downloadinkscape-7f16afbb515eceed9c63afacec73cd528a662327.tar.gz
inkscape-7f16afbb515eceed9c63afacec73cd528a662327.zip
Full rewrite on working mode now no linked paths necesary
(bzr r15017.1.15)
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/registered-widget.cpp1
-rw-r--r--src/ui/widget/scalar.cpp6
-rw-r--r--src/ui/widget/scalar.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 38bb7f7cc..923949b72 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -298,7 +298,6 @@ RegisteredScalar::on_value_changed()
setProgrammatically = false;
return;
}
-
if (_wr->isUpdating()) {
return;
}
diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp
index fca8a7974..80a2454b0 100644
--- a/src/ui/widget/scalar.cpp
+++ b/src/ui/widget/scalar.cpp
@@ -126,10 +126,12 @@ void Scalar::setRange(double min, double max)
static_cast<SpinButton*>(_widget)->set_range(min, max);
}
-void Scalar::setValue(double value)
+void Scalar::setValue(double value, bool setProg)
{
g_assert(_widget != NULL);
- setProgrammatically = true; // callback is supposed to reset back, if it cares
+ if (setProg) {
+ setProgrammatically = true; // callback is supposed to reset back, if it cares
+ }
static_cast<SpinButton*>(_widget)->set_value(value);
}
diff --git a/src/ui/widget/scalar.h b/src/ui/widget/scalar.h
index 86d7aee28..9cceeaa1f 100644
--- a/src/ui/widget/scalar.h
+++ b/src/ui/widget/scalar.h
@@ -139,7 +139,7 @@ public:
/**
* Sets the value of the spin button.
*/
- void setValue(double value);
+ void setValue(double value, bool setProg = true);
/**
* Manually forces an update of the spin button.