epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11135 from obrakmann/fix11127_zoom-pxldbl-interaction

Browse Source 
Fix PixelDoubling not working properly after zooming with mousewheel
This commit is contained in:
abcdefg30
2016-04-23 11:55:53 +02:00
parent 3b2a5e2dbc 77ba2b4f13
commit a717ab6763
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -345,8 +345,16 @@ namespace OpenRA.Widgets
bool TogglePixelDouble() bool TogglePixelDouble()
{ {
Game.Settings.Graphics.PixelDouble ^= true; if (worldRenderer.Viewport.Zoom == 1f)
worldRenderer.Viewport.Zoom = Game.Settings.Graphics.PixelDouble ? 2 : 1; worldRenderer.Viewport.Zoom = 2f;
else
{
// Reset zoom to regular view if it was anything else before
// (like a zoom level only reachable by using the scroll wheel).
worldRenderer.Viewport.Zoom = 1f;
}
Game.Settings.Graphics.PixelDouble = worldRenderer.Viewport.Zoom == 2f;
return true; return true;
} }