tweak(scrolling): Enable edge scrolling in windowed mode (#1362)

xezon · web-flow · commit 7dd14c7c545a · 2025-07-28T19:06:04.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -307,21 +307,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				break;
 			}
 
-			if (!TheGlobalData->m_windowed)
+			// TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.
+			if (m_isScrolling)
 			{
-				if (m_isScrolling)
+				if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
 				{
-					if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
-					{
-						stopScrolling();
-					}
+					stopScrolling();
 				}
-				else
+			}
+			else
+			{
+				if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
 				{
-					if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
-					{
-						setScrolling(SCROLL_SCREENEDGE);
-					}
+					setScrolling(SCROLL_SCREENEDGE);
 				}
 			}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -306,21 +306,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 				break;
 			}
 
-			if (!TheGlobalData->m_windowed)
+			// TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.
+			if (m_isScrolling)
 			{
-				if (m_isScrolling)
+				if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
 				{
-					if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )
-					{
-						stopScrolling();
-					}
+					stopScrolling();
 				}
-				else
+			}
+			else
+			{
+				if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
 				{
-					if ( m_currentPos.x < edgeScrollSize || m_currentPos.y < edgeScrollSize || m_currentPos.y >= height-edgeScrollSize || m_currentPos.x >= width-edgeScrollSize )
-					{
-						setScrolling(SCROLL_SCREENEDGE);
-					}
+					setScrolling(SCROLL_SCREENEDGE);
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -307,21 +307,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage`
`307`	`307`	`break;`
`308`	`308`	`}`
`309`	`309`
`310`		`- if (!TheGlobalData->m_windowed)`
	`310`	`+ // TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.`
	`311`	`+ if (m_isScrolling)`
`311`	`312`	`{`
`312`		`- if (m_isScrolling)`
	`313`	`+ if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )`
`313`	`314`	`{`
`314`		`- if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )`
`315`		`- {`
`316`		`- stopScrolling();`
`317`		`- }`
	`315`	`+ stopScrolling();`
`318`	`316`	`}`
`319`		`- else`
	`317`	`+ }`
	`318`	`+ else`
	`319`	`+ {`
	`320`	`+ if ( m_currentPos.x < edgeScrollSize \|\| m_currentPos.y < edgeScrollSize \|\| m_currentPos.y >= height-edgeScrollSize \|\| m_currentPos.x >= width-edgeScrollSize )`
`320`	`321`	`{`
`321`		`- if ( m_currentPos.x < edgeScrollSize \|\| m_currentPos.y < edgeScrollSize \|\| m_currentPos.y >= height-edgeScrollSize \|\| m_currentPos.x >= width-edgeScrollSize )`
`322`		`- {`
`323`		`- setScrolling(SCROLL_SCREENEDGE);`
`324`		`- }`
	`322`	`+ setScrolling(SCROLL_SCREENEDGE);`
`325`	`323`	`}`
`326`	`324`	`}`
`327`	`325`
Original file line number	Diff line number	Diff line change
`@@ -306,21 +306,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage`
`306`	`306`	`break;`
`307`	`307`	`}`
`308`	`308`
`309`		`- if (!TheGlobalData->m_windowed)`
	`309`	`+ // TheSuperHackers @tweak Ayumi/xezon 26/07/2025 Enables edge scrolling in windowed mode.`
	`310`	`+ if (m_isScrolling)`
`310`	`311`	`{`
`311`		`- if (m_isScrolling)`
	`312`	`+ if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )`
`312`	`313`	`{`
`313`		`- if ( m_scrollType == SCROLL_SCREENEDGE && (m_currentPos.x >= edgeScrollSize && m_currentPos.y >= edgeScrollSize && m_currentPos.y < height-edgeScrollSize && m_currentPos.x < width-edgeScrollSize) )`
`314`		`- {`
`315`		`- stopScrolling();`
`316`		`- }`
	`314`	`+ stopScrolling();`
`317`	`315`	`}`
`318`		`- else`
	`316`	`+ }`
	`317`	`+ else`
	`318`	`+ {`
	`319`	`+ if ( m_currentPos.x < edgeScrollSize \|\| m_currentPos.y < edgeScrollSize \|\| m_currentPos.y >= height-edgeScrollSize \|\| m_currentPos.x >= width-edgeScrollSize )`
`319`	`320`	`{`
`320`		`- if ( m_currentPos.x < edgeScrollSize \|\| m_currentPos.y < edgeScrollSize \|\| m_currentPos.y >= height-edgeScrollSize \|\| m_currentPos.x >= width-edgeScrollSize )`
`321`		`- {`
`322`		`- setScrolling(SCROLL_SCREENEDGE);`
`323`		`- }`
	`321`	`+ setScrolling(SCROLL_SCREENEDGE);`
`324`	`322`	`}`
`325`	`323`	`}`
`326`	`324`