diff options
| author | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-04-19 14:16:51 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2019-04-24 13:03:14 +0000 |
| commit | 124f550235d24b6313929cc9bbb5cbcca356104c (patch) | |
| tree | 2dce52ea9f0566a49b8a2bf97396baa0af15c89b /src | |
| parent | Update sv.po (diff) | |
| download | inkscape-124f550235d24b6313929cc9bbb5cbcca356104c.tar.gz inkscape-124f550235d24b6313929cc9bbb5cbcca356104c.zip | |
Keep Document Grid spacing on change and save
Reverts behaviour back to Feb 2019. setDigits calls
on_value_changed(), leading to 0 value being set
when wr.isUpdating() is false. The grid widget
is re-created on save, if closed.
Fix https://gitlab.com/inkscape/inbox/issues/387
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 18 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 24 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 2e4a20d6a..6bfa317b3 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -288,15 +288,6 @@ CanvasAxonomGrid::newSpecificWidget() _rsi = Gtk::manage( new Inkscape::UI::Widget::RegisteredSuffixedInteger( _("_Major grid line every:"), "", _("lines"), "empspacing", _wr, repr, doc ) ); - _rsu_ox->setDigits(5); - _rsu_ox->setIncrements(0.1, 1.0); - - _rsu_oy->setDigits(5); - _rsu_oy->setIncrements(0.1, 1.0); - - _rsu_sy->setDigits(5); - _rsu_sy->setIncrements(0.1, 1.0); - _rumg->set_hexpand(); _rsu_ox->set_hexpand(); _rsu_oy->set_hexpand(); @@ -310,6 +301,15 @@ CanvasAxonomGrid::newSpecificWidget() // set widget values _wr.setUpdating (true); + _rsu_ox->setDigits(5); + _rsu_ox->setIncrements(0.1, 1.0); + + _rsu_oy->setDigits(5); + _rsu_oy->setIncrements(0.1, 1.0); + + _rsu_sy->setDigits(5); + _rsu_sy->setIncrements(0.1, 1.0); + _rumg->setUnit (gridunit->abbr); gdouble val; diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index f4a210fe6..b8569d539 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -680,18 +680,6 @@ CanvasXYGrid::newSpecificWidget() _rsi = Gtk::manage( new Inkscape::UI::Widget::RegisteredSuffixedInteger( _("_Major grid line every:"), "", _("lines"), "empspacing", _wr, repr, doc) ); - _rsu_ox->setDigits(5); - _rsu_ox->setIncrements(0.1, 1.0); - - _rsu_oy->setDigits(5); - _rsu_oy->setIncrements(0.1, 1.0); - - _rsu_sx->setDigits(5); - _rsu_sx->setIncrements(0.1, 1.0); - - _rsu_sy->setDigits(5); - _rsu_sy->setIncrements(0.1, 1.0); - _rumg->set_hexpand(); _rsu_ox->set_hexpand(); _rsu_oy->set_hexpand(); @@ -704,6 +692,18 @@ CanvasXYGrid::newSpecificWidget() // set widget values _wr.setUpdating (true); + _rsu_ox->setDigits(5); + _rsu_ox->setIncrements(0.1, 1.0); + + _rsu_oy->setDigits(5); + _rsu_oy->setIncrements(0.1, 1.0); + + _rsu_sx->setDigits(5); + _rsu_sx->setIncrements(0.1, 1.0); + + _rsu_sy->setDigits(5); + _rsu_sy->setIncrements(0.1, 1.0); + _rumg->setUnit (gridunit->abbr); gdouble val; |