summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-grid.h
diff options
context:
space:
mode:
authorGeoff Lankow <geoff@darktrojan.net>2018-03-22 01:51:44 +0000
committerGeoff Lankow <geoff@darktrojan.net>2018-03-22 04:33:43 +0000
commit71590dc2ff14a3b077e836cb7d6fafa087f859e4 (patch)
treeb3edb95c9f58a6f74b99c01f3c7333b226f9e946 /src/display/canvas-grid.h
parentmake yaml optional even if present (diff)
downloadinkscape-71590dc2ff14a3b077e836cb7d6fafa087f859e4.tar.gz
inkscape-71590dc2ff14a3b077e836cb7d6fafa087f859e4.zip
Re-enable CanvasXYGrid::updateWidgets and CanvasAxonomGrid::updateWidgets
Diffstat (limited to 'src/display/canvas-grid.h')
-rw-r--r--src/display/canvas-grid.h19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 6b36390c8..1b21c6984 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -9,6 +9,7 @@
#define INKSCAPE_CANVAS_GRID_H
#include "sp-canvas-item.h"
+#include "ui/widget/registered-widget.h"
#include "ui/widget/registry.h"
#include "line-snapper.h"
@@ -124,8 +125,12 @@ protected:
// For dealing with old Inkscape SVG files (pre 0.92)
bool legacy;
bool pixel;
-
- private:
+
+ Inkscape::UI::Widget::RegisteredCheckButton *_rcb_enabled;
+ Inkscape::UI::Widget::RegisteredCheckButton *_rcb_snap_visible_only;
+ Inkscape::UI::Widget::RegisteredCheckButton *_rcb_visible;
+
+private:
CanvasGrid(const CanvasGrid&);
CanvasGrid& operator=(const CanvasGrid&);
};
@@ -160,6 +165,16 @@ private:
void updateWidgets();
bool render_dotted;
+
+ Inkscape::UI::Widget::RegisteredUnitMenu *_rumg;
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_ox;
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_oy;
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sx;
+ Inkscape::UI::Widget::RegisteredScalarUnit *_rsu_sy;
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gcol;
+ Inkscape::UI::Widget::RegisteredColorPicker *_rcp_gmcol;
+ Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi;
+ Inkscape::UI::Widget::RegisteredCheckButton *_rcb_dotted;
};