From d5a44b4b6761b88b43329d65a6d7a8521147c09b Mon Sep 17 00:00:00 2001 From: Bas Ruigrok Date: Sat, 23 Aug 2025 14:01:19 +0200 Subject: [PATCH] Gui: Allow switch to panning after canceling sketcher rubber band selection --- src/Gui/Navigation/BlenderNavigationStyle.cpp | 4 +++- src/Gui/Navigation/RevitNavigationStyle.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Gui/Navigation/BlenderNavigationStyle.cpp b/src/Gui/Navigation/BlenderNavigationStyle.cpp index e44b79f738..e6086dbc6f 100644 --- a/src/Gui/Navigation/BlenderNavigationStyle.cpp +++ b/src/Gui/Navigation/BlenderNavigationStyle.cpp @@ -295,7 +295,9 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev) // Prevent interrupting rubber-band selection in sketcher if (viewer->isEditing() && curmode == NavigationStyle::SELECTION && newmode != NavigationStyle::IDLE) { - newmode = NavigationStyle::SELECTION; + if (!button1down || !button2down) { // Allow canceling rubber-band in sketcher if both button 1 and button 2 are pressed + newmode = NavigationStyle::SELECTION; + } processed = false; } diff --git a/src/Gui/Navigation/RevitNavigationStyle.cpp b/src/Gui/Navigation/RevitNavigationStyle.cpp index b5c4c570e6..1544650abb 100644 --- a/src/Gui/Navigation/RevitNavigationStyle.cpp +++ b/src/Gui/Navigation/RevitNavigationStyle.cpp @@ -292,7 +292,9 @@ SbBool RevitNavigationStyle::processSoEvent(const SoEvent * const ev) // Prevent interrupting rubber-band selection in sketcher if (viewer->isEditing() && curmode == NavigationStyle::SELECTION && newmode != NavigationStyle::IDLE) { - newmode = NavigationStyle::SELECTION; + if (!button1down || !button2down) { // Allow canceling rubber-band in sketcher if both button 1 and button 2 are pressed + newmode = NavigationStyle::SELECTION; + } processed = false; }