提交: ef6c93571e30d33920b2127b6b1972f73f3eabce - dtxmania_mac (git)

Commit MetaInfo

• 修订版: ef6c93571e30d33920b2127b6b1972f73f3eabce (tree)
• 时间: 2019-08-26 21:18:11
• 作者: yyagi <yyagi.dtxmania@gmai...>
• Commiter: yyagi

Log Message

#39511 ウインドウの中をドラッグしてもウインドウを移動できるようにした。

更改概述

• delete: "DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"

差异

--- "a/DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"
+++ "b/DTXMania/\343\202\263\343\203\274\343\203\211/\345\205\250\344\275\223/CDTXMania.cs"
@@ -638,6 +638,7 @@ namespace DTXMania
 			base.Window.Icon = Properties.Resources.dtx;
 			base.Window.KeyDown += new KeyEventHandler(this.Window_KeyDown);
 			base.Window.MouseUp += new MouseEventHandler(this.Window_MouseUp);
+			base.Window.MouseDown += new MouseEventHandler(this.Window_MouseDown);
 			// #23510 2010.11.13 yyagi: to go fullscreen mode
 			base.Window.MouseDoubleClick += new MouseEventHandler(this.Window_MouseDoubleClick);
 			// #23510 2010.11.20 yyagi: to set resized window size in Config.ini
@@ -3058,6 +3059,11 @@ namespace DTXMania
 		{
 			mb = e.Button;
 		}
+		private void Window_MouseDown(object sender, MouseEventArgs e)
+		{
+			currentMousePosition.X = Control.MousePosition.X;
+			currentMousePosition.Y = Control.MousePosition.Y;
+		}
 
 		private void Window_MouseDoubleClick(object sender, MouseEventArgs e)   // #23510 2010.11.13 yyagi: to go full screen mode
 		{
@@ -3067,11 +3073,23 @@ namespace DTXMania
 				this.t全画面_ウィンドウモード切り替え();
 			}
 		}
+		private Point currentMousePosition = new Point(-1,-1);
 		private void Window_MouseMove(object sender, MouseEventArgs e)
 		{
 			if (cMouseHideControl != null) cMouseHideControl.tResetCursorState(ConfigIni.bウィンドウモード, this.bApplicationActive);
-		}
+			if (Control.MouseButtons.HasFlag(MouseButtons.Left))
+			{
+				int X = base.Window.Location.X;
+				X += (Control.MousePosition.X - currentMousePosition.X);
+				int Y = base.Window.Location.Y;
+				Y += (Control.MousePosition.Y - currentMousePosition.Y);
 
+				base.Window.Location = new Point(X, Y);
+
+				currentMousePosition.X = Control.MousePosition.X;
+				currentMousePosition.Y = Control.MousePosition.Y;
+			}
+		}
 		private void Window_ResizeEnd(object sender, EventArgs e)               // #23510 2010.11.20 yyagi: to get resized window size
 		{
 			if (ConfigIni.bウィンドウモード)