diff options
| author | Martin Owens <doctormo@gmail.com> | 2016-10-06 21:12:33 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2016-10-06 21:12:33 +0000 |
| commit | 032cb7a6b8f3b83b75f71048a896f03907436f9e (patch) | |
| tree | 672d01cd146779e67916c4553a27134b20c2ba42 /src/ui/widget/scalar.cpp | |
| parent | xverbs branch merge by dmitry-zhulanov (diff) | |
| parent | Fix on delete line (diff) | |
| download | inkscape-032cb7a6b8f3b83b75f71048a896f03907436f9e.tar.gz inkscape-032cb7a6b8f3b83b75f71048a896f03907436f9e.zip | |
Merge jabier's Measure line LPE
(bzr r15148)
Diffstat (limited to 'src/ui/widget/scalar.cpp')
| -rw-r--r-- | src/ui/widget/scalar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp index 434c2c0bb..f8543a371 100644 --- a/src/ui/widget/scalar.cpp +++ b/src/ui/widget/scalar.cpp @@ -122,10 +122,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); } |