diff --git a/src/Gui/BlenderNavigationStyle.cpp b/src/Gui/BlenderNavigationStyle.cpp index c933d30dfb..81fc6f5202 100644 --- a/src/Gui/BlenderNavigationStyle.cpp +++ b/src/Gui/BlenderNavigationStyle.cpp @@ -88,11 +88,11 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/CADNavigationStyle.cpp b/src/Gui/CADNavigationStyle.cpp index a390e0ff3d..53d893f0ff 100644 --- a/src/Gui/CADNavigationStyle.cpp +++ b/src/Gui/CADNavigationStyle.cpp @@ -92,11 +92,11 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/InventorNavigationStyle.cpp b/src/Gui/InventorNavigationStyle.cpp index 1a46fe8439..4c57393cb4 100644 --- a/src/Gui/InventorNavigationStyle.cpp +++ b/src/Gui/InventorNavigationStyle.cpp @@ -96,11 +96,11 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/NavigationStyle.cpp b/src/Gui/NavigationStyle.cpp index 0a38a210f9..dc66d74beb 100644 --- a/src/Gui/NavigationStyle.cpp +++ b/src/Gui/NavigationStyle.cpp @@ -1372,16 +1372,6 @@ void NavigationStyle::clearLog(void) this->log.historysize = 0; } -SbVec2f NavigationStyle::getNormalizedPosition(const SoEvent * const ev, - const SbViewportRegion & vpRgn) const -{ - const SbVec2s size(vpRgn.getViewportSizePixels()); - const SbVec2s pos(ev->getPosition()); - const SbVec2f posn((float) pos[0] / (float) std::max((int)(size[0] - 1), 1), - (float) pos[1] / (float) std::max((int)(size[1] - 1), 1)); - return posn; -} - void NavigationStyle::syncModifierKeys(const SoEvent * const ev) { // Mismatches in state of the modifier keys happens if the user diff --git a/src/Gui/NavigationStyle.h b/src/Gui/NavigationStyle.h index af68928008..5f394c550b 100644 --- a/src/Gui/NavigationStyle.h +++ b/src/Gui/NavigationStyle.h @@ -213,7 +213,6 @@ protected: void clearLog(void); void addToLog(const SbVec2s pos, const SbTime time); - SbVec2f getNormalizedPosition(const SoEvent * const ev, const SbViewportRegion & vpRgn) const; void syncModifierKeys(const SoEvent * const ev); SbBool handleKeyboardEvent(const SoKeyboardEvent * const event, const SbVec2f & posn); diff --git a/src/Gui/OpenCascadeNavigationStyle.cpp b/src/Gui/OpenCascadeNavigationStyle.cpp index 6b42b53003..58501d9d7b 100644 --- a/src/Gui/OpenCascadeNavigationStyle.cpp +++ b/src/Gui/OpenCascadeNavigationStyle.cpp @@ -88,11 +88,11 @@ SbBool OpenCascadeNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/OpenSCADNavigationStyle.cpp b/src/Gui/OpenSCADNavigationStyle.cpp index 7b0c31682a..1681ce5281 100644 --- a/src/Gui/OpenSCADNavigationStyle.cpp +++ b/src/Gui/OpenSCADNavigationStyle.cpp @@ -88,11 +88,11 @@ SbBool OpenSCADNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/RevitNavigationStyle.cpp b/src/Gui/RevitNavigationStyle.cpp index 0c22aeeffd..3408929108 100644 --- a/src/Gui/RevitNavigationStyle.cpp +++ b/src/Gui/RevitNavigationStyle.cpp @@ -88,11 +88,11 @@ SbBool RevitNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an diff --git a/src/Gui/TouchpadNavigationStyle.cpp b/src/Gui/TouchpadNavigationStyle.cpp index b6fd4b3df4..606412fdd8 100644 --- a/src/Gui/TouchpadNavigationStyle.cpp +++ b/src/Gui/TouchpadNavigationStyle.cpp @@ -88,11 +88,11 @@ SbBool TouchpadNavigationStyle::processSoEvent(const SoEvent * const ev) const SoType type(ev->getTypeId()); const SbViewportRegion & vp = viewer->getSoRenderManager()->getViewportRegion(); - const SbVec2f posn = getNormalizedPosition(ev, vp); + const SbVec2s pos(ev->getPosition()); + const SbVec2f posn = normalizePixelPos(pos); const SbVec2f prevnormalized = this->lastmouseposition; this->lastmouseposition = posn; - const SbVec2s pos(ev->getPosition()); // Set to true if any event processing happened. Note that it is not // necessary to restrict ourselves to only do one "action" for an