summaryrefslogtreecommitdiffstats
path: root/src/desktop.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-12-09 02:42:25 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-12-09 02:42:25 +0000
commit68d3b22bc72730ab580b1bde8a513c736ae49d32 (patch)
tree93cd86556c6daa1c0f38f0bb6a62b3f962b82388 /src/desktop.cpp
parentMerge branch 'master' of gitlab.com:inkscape/inkscape (diff)
downloadinkscape-68d3b22bc72730ab580b1bde8a513c736ae49d32.tar.gz
inkscape-68d3b22bc72730ab580b1bde8a513c736ae49d32.zip
Fix toggle rullers in split view and improve speed and rendering to xray
Diffstat (limited to '')
-rw-r--r--src/desktop.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp
index d9fb83ab7..4982e3318 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1554,30 +1554,22 @@ void SPDesktop::toggleGrids()
void SPDesktop::toggleSplitMode()
{
- Gtk::Window *parent = getToplevel();
- if (parent) {
+ if (this->getToplevel()) {
_split_canvas = !_split_canvas;
- SPDesktopWidget *dtw = static_cast<SPDesktopWidget *>(parent->get_data("desktopwidget"));
- auto allocation = dtw->get_canvas_allocation();
SPCanvas *canvas = getCanvas();
- canvas->requestRedraw(canvas->_x0, canvas->_y0, canvas->_x0 + allocation.width,
- canvas->_y0 + allocation.height);
+ canvas->requestFullRedraw();
}
}
void SPDesktop::toggleXRay()
{
- Gtk::Window *parent = getToplevel();
- if (parent) {
+ if (this->getToplevel()) {
_xray = !_xray;
if (_split_canvas && _xray) {
- return toggleSplitMode();
+ _split_canvas = !_split_canvas;
}
- SPDesktopWidget *dtw = static_cast<SPDesktopWidget *>(parent->get_data("desktopwidget"));
- auto allocation = dtw->get_canvas_allocation();
SPCanvas *canvas = getCanvas();
- canvas->requestRedraw(canvas->_x0, canvas->_y0, canvas->_x0 + allocation.width,
- canvas->_y0 + allocation.height);
+ canvas->requestFullRedraw();
}
}