Merge pull request TrenchBroom#4218 from TrenchBroom/4214

4214: Only cancel mouse drags if window deactivates
HarrievG · Feb 28, 2023 · a44eefb · a44eefb
2 parents 80d3498 + fa28809
commit a44eefb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/common/src/View/MapViewBase.cpp b/common/src/View/MapViewBase.cpp
@@ -902,6 +902,16 @@ void MapViewBase::hideAllEntityLinks()
   setPref(Preferences::FaceRenderMode, Preferences::entityLinkModeNone());
 }
 
+bool MapViewBase::event(QEvent* event)
+{
+  if (event->type() == QEvent::WindowDeactivate)
+  {
+    cancelMouseDrag();
+  }
+
+  return RenderView::event(event);
+}
+
 void MapViewBase::focusInEvent(QFocusEvent* event)
 {
   updateActionStates(); // enable/disable QShortcut's to reflect whether we have focus
@@ -914,7 +924,6 @@ void MapViewBase::focusInEvent(QFocusEvent* event)
 
 void MapViewBase::focusOutEvent(QFocusEvent* event)
 {
-  cancelMouseDrag();
   clearModifierKeys();
   update();
   RenderView::focusOutEvent(event);

diff --git a/common/src/View/MapViewBase.h b/common/src/View/MapViewBase.h
@@ -302,7 +302,7 @@ class MapViewBase : public RenderView,
   void showDirectlySelectedEntityLinks();
   void hideAllEntityLinks();
 
-protected:
+  bool event(QEvent* event) override;
   void focusInEvent(QFocusEvent* event) override;
   void focusOutEvent(QFocusEvent* event) override;
 

diff --git a/common/src/View/UVView.cpp b/common/src/View/UVView.cpp
@@ -78,10 +78,14 @@ void UVView::setSubDivisions(const vm::vec2i& subDivisions)
   update();
 }
 
-void UVView::focusOutEvent(QFocusEvent* event)
+bool UVView::event(QEvent* event)
 {
-  ToolBoxConnector::cancelDrag();
-  RenderView::focusOutEvent(event);
+  if (event->type() == QEvent::WindowDeactivate)
+  {
+    cancelDrag();
+  }
+
+  return RenderView::event(event);
 }
 
 void UVView::createTools()

diff --git a/common/src/View/UVView.h b/common/src/View/UVView.h
@@ -91,8 +91,7 @@ class UVView : public RenderView, public ToolBoxConnector
 
   void setSubDivisions(const vm::vec2i& subDivisions);
 
-protected:
-  void focusOutEvent(QFocusEvent* event) override;
+  bool event(QEvent* event) override;
 
 private:
   void createTools();