allow user to suppress doubleclick-to-toggle-fullscreen behaviour

TASEmulators · Sep 8, 2015 · 21da5ad · 21da5ad
1 parent 43f86b5
commit 21da5ad
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/BizHawk.Client.Common/config/Config.cs b/BizHawk.Client.Common/config/Config.cs
@@ -269,6 +269,7 @@ public const int
 		public bool DispChrome_StatusBarFullscreen = false;
 		public bool DispChrome_MenuFullscreen = false;
 		public bool DispChrome_Fullscreen_AutohideMouse = true;
+		public bool DispChrome_AllowDoubleClickFullscreen = true;
 
 		public EDispManagerAR DispManagerAR = EDispManagerAR.System; 
 		public int DispCustomUserARWidth = 1;

diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -531,7 +531,9 @@
     <Compile Include="CustomControls\ViewportPanel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\VirtualListView.cs" />
+    <Compile Include="CustomControls\VirtualListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="CustomControls\Win32.cs" />
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\DisplaySurface.cs" />

diff --git a/BizHawk.Client.EmuHawk/PresentationPanel.cs b/BizHawk.Client.EmuHawk/PresentationPanel.cs
@@ -58,7 +58,10 @@ private void HandleFullscreenToggle(object sender, MouseEventArgs e)
 			{
 				//allow suppression of the toggle.. but if shift is pressed, always do the toggle
 				bool allowSuppress = Control.ModifierKeys != Keys.Shift;
-				GlobalWin.MainForm.ToggleFullscreen(allowSuppress);
+				if (Global.Config.DispChrome_AllowDoubleClickFullscreen || !allowSuppress)
+				{
+					GlobalWin.MainForm.ToggleFullscreen(allowSuppress);
+				}
 			}
 		}
 

diff --git a/BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs b/BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs
diff --git a/BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs b/BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
@@ -56,6 +56,8 @@ public DisplayConfigLite()
 			cbFSAutohideMouse.Checked = Global.Config.DispChrome_Fullscreen_AutohideMouse;
 			SyncTrackbar();
 
+			cbAllowDoubleclickFullscreen.Checked = Global.Config.DispChrome_AllowDoubleClickFullscreen;
+
 			nudPrescale.Value = Global.Config.DispPrescale;
 
 			// null emulator config hack
@@ -113,6 +115,7 @@ private void btnOk_Click(object sender, EventArgs e)
 			Global.Config.DispChrome_MenuFullscreen = cbMenuFullscreen.Checked;
 			Global.Config.DispChrome_FrameWindowed = trackbarFrameSizeWindowed.Value;
 			Global.Config.DispChrome_Fullscreen_AutohideMouse = cbFSAutohideMouse.Checked;
+			Global.Config.DispChrome_AllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked;
 
 			if (rbDisplayFull.Checked) Global.Config.DispSpeedupFeatures = 2;
 			if (rbDisplayMinimal.Checked) Global.Config.DispSpeedupFeatures = 1;