Limit screen edge pushing to fullscreen mode

Stellarium · Dec 23, 2024 · a0c0c4b · a0c0c4b
1 parent 4089c5f
commit a0c0c4b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/core/StelMovementMgr.cpp b/src/core/StelMovementMgr.cpp
@@ -24,6 +24,7 @@
 */
 
 #include "StelMovementMgr.hpp"
+#include "StelMainView.hpp"
 #include "StelObjectMgr.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelApp.hpp"
@@ -316,8 +317,8 @@ Vec3d StelMovementMgr::getViewUpVectorJ2000() const
 
 bool StelMovementMgr::handleMouseMoves(int x, int y, Qt::MouseButtons)
 {
-	// Turn if the mouse is at the edge of the screen unless config asks otherwise
-	if (flagEnableMoveAtScreenEdge)
+	// Turn if the mouse is at the edge of the screen unless config asks otherwise (this is too awkward in windowed mode)
+	if (flagEnableMoveAtScreenEdge && StelMainView::getInstance().isFullScreen())
 	{
 		if (x <= 1)
 		{

diff --git a/src/core/StelMovementMgr.hpp b/src/core/StelMovementMgr.hpp
@@ -216,7 +216,7 @@ public slots:
 	//! PROPERTY GETTER/SETTER
 	//! Get whether being at the edge of the screen activates movement
 	bool getFlagEnableMoveAtScreenEdge() const {return flagEnableMoveAtScreenEdge;}
-	//! Set whether being at the edge of the screen activates movement
+	//! Set whether being at the edge of the screen activates movement. The actual motion is only performed in fullscreen mode.
 	void setFlagEnableMoveAtScreenEdge(bool b) {flagEnableMoveAtScreenEdge=b; StelApp::immediateSave("navigation/flag_enable_move_at_screen_edge", b); emit flagEnableMoveAtScreenEdgeChanged(b);}
 
 	//! PROPERTY GETTER/SETTER

diff --git a/src/gui/configurationDialog.ui b/src/gui/configurationDialog.ui
@@ -2210,7 +2210,7 @@
              <item row="6" column="1">
               <widget class="QCheckBox" name="pushScreenEdgeCheckBox">
                <property name="toolTip">
-                <string>Allow mouse to move view when at screen edge</string>
+                <string>Allow mouse to move view when at screen edge (Fullscreen only)</string>
                </property>
                <property name="text">
                 <string>Mouse push screen edge</string>