diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-28 00:24:25 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-07-28 08:55:03 +0000 |
| commit | c9251db45f46f8c036b3b425c1ce6931b1e9cd72 (patch) | |
| tree | 5f5c3678e5ad13f9bbf2a34f3745632f28ba9311 /src | |
| parent | Fix coding style (diff) | |
| download | inkscape-c9251db45f46f8c036b3b425c1ce6931b1e9cd72.tar.gz inkscape-c9251db45f46f8c036b3b425c1ce6931b1e9cd72.zip | |
Fix some issues with inverse coordinates pointed by Maren
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop.cpp | 3 | ||||
| -rw-r--r-- | src/display/sp-canvas.cpp | 7 | ||||
| -rw-r--r-- | src/object/sp-namedview.cpp | 4 | ||||
| -rw-r--r-- | src/verbs.cpp | 4 |
4 files changed, 12 insertions, 6 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 4e9b84839..6cace5989 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1635,7 +1635,8 @@ void SPDesktop::toggleSplitMode() _menu_update.emit(verb->get_code()); } } - canvas->requestUpdate(); + SPCanvas *canvas = getCanvas(); + canvas->requestFullRedraw(); Inkscape::Verb *verb = Inkscape::Verb::get(SP_VERB_VIEW_TOGGLE_SPLIT); if (verb) { _menu_update.emit(verb->get_code()); diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 311f52567..baef974cb 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1749,8 +1749,13 @@ int SPCanvas::handle_motion(GtkWidget *widget, GdkEventMotion *event) Geom::Point prev_orig = canvas->_xray_orig; canvas->_xray_orig = desktop->point(true); canvas->_xray_orig *= desktop->current_zoom(); + if (!SP_ACTIVE_DOCUMENT->is_yaxisdown()) { + canvas->_xray_orig[Geom::Y] *= -1.0; + } canvas->_xray = true; - canvas->addIdle(); + if (canvas->_xray_orig[Geom::X] != Geom::infinity()) { + canvas->addIdle(); + } status = 1; } else { canvas->_xray = false; diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp index c22184d52..7fed2b9b5 100644 --- a/src/object/sp-namedview.cpp +++ b/src/object/sp-namedview.cpp @@ -1124,8 +1124,8 @@ bool SPNamedView::getGuides() g_assert(this->getRepr() != nullptr); unsigned int v; unsigned int set = sp_repr_get_boolean(this->getRepr(), "showguides", &v); - if (!set) { // hide guides if not specified, for backwards compatibility - v = FALSE; + if (!set) { // show guides if not specified, for backwards compatibility + v = TRUE; } return v; diff --git a/src/verbs.cpp b/src/verbs.cpp index 66446cf41..e88a9ab9f 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -3057,10 +3057,10 @@ Verb *Verb::_base_verbs[] = { new ZoomVerb(SP_VERB_VIEW_COLOR_MODE_TOGGLE, "ViewColorModeToggle", N_("_Toggle"), N_("Toggle between normal and grayscale color display modes"), nullptr), - new ZoomVerb(SP_VERB_VIEW_TOGGLE_SPLIT, "ViewSplitModeToggle", N_("Toggle _Split View Mode"), + new ZoomVerb(SP_VERB_VIEW_TOGGLE_SPLIT, "ViewSplitModeToggle", N_("_Split View Mode"), N_("Split canvas in 2 to show outline"), nullptr), - new ZoomVerb(SP_VERB_VIEW_TOGGLE_XRAY, "ViewXRayToggle", N_("Toggle _XRay Mode"), N_("XRay around cursor"), + new ZoomVerb(SP_VERB_VIEW_TOGGLE_XRAY, "ViewXRayToggle", N_("_XRay Mode"), N_("XRay around cursor"), nullptr), new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-Managed View"), |