diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-12-11 13:31:24 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-12-11 13:31:24 +0000 |
| commit | 22b51fa87ea56f6ca9422c84bea18546412d7e9d (patch) | |
| tree | 3ad238131718e7babac3d77aa75b5de91673ef5c /src/ui/widget/registered-widget.h | |
| parent | Fix build with poppler 0.29.0 (Bug #1399811) (diff) | |
| download | inkscape-22b51fa87ea56f6ca9422c84bea18546412d7e9d.tar.gz inkscape-22b51fa87ea56f6ca9422c84bea18546412d7e9d.zip | |
Change grids to use 'user units'. Grids using absolute units are read in but
may be scaled incorrectly due to change of 90 to 96 dpi.
(bzr r13795)
Diffstat (limited to 'src/ui/widget/registered-widget.h')
| -rw-r--r-- | src/ui/widget/registered-widget.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 1f505a3cd..15302a165 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -206,6 +206,14 @@ protected: void on_changed(); }; +// Allow RegisteredScalarUnit to output lengths in 'user units' (which may have direction dependent +// scale factors). +enum RSU_UserUnits { + RSU_none, + RSU_x, + RSU_y +}; + class RegisteredScalarUnit : public RegisteredWidget<ScalarUnit> { public: ~RegisteredScalarUnit(); @@ -215,12 +223,14 @@ public: const RegisteredUnitMenu &rum, Registry& wr, Inkscape::XML::Node* repr_in = NULL, - SPDocument *doc_in = NULL ); + SPDocument *doc_in = NULL, + RSU_UserUnits _user_units = RSU_none ); protected: sigc::connection _value_changed_connection; UnitMenu *_um; void on_value_changed(); + RSU_UserUnits _user_units; }; class RegisteredScalar : public RegisteredWidget<Scalar> { |