Make Fullscreen only happen on Double Left Click
This commit is contained in:
parent
e4168d609e
commit
23613ffa27
|
@ -97,6 +97,7 @@
|
|||
this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
@ -212,7 +213,6 @@
|
|||
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.screenshotToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.closeROMToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuStrip1.SuspendLayout();
|
||||
this.statusStrip1.SuspendLayout();
|
||||
this.contextMenuStrip1.SuspendLayout();
|
||||
|
@ -232,7 +232,7 @@
|
|||
this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow;
|
||||
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
|
||||
this.menuStrip1.Name = "menuStrip1";
|
||||
this.menuStrip1.Size = new System.Drawing.Size(470, 23);
|
||||
this.menuStrip1.Size = new System.Drawing.Size(470, 21);
|
||||
this.menuStrip1.TabIndex = 0;
|
||||
this.menuStrip1.Text = "menuStrip1";
|
||||
this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate);
|
||||
|
@ -261,7 +261,7 @@
|
|||
// openROMToolStripMenuItem
|
||||
//
|
||||
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
|
||||
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.openROMToolStripMenuItem.Text = "Open ROM";
|
||||
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -273,7 +273,7 @@
|
|||
this.clearToolStripMenuItem,
|
||||
this.autoloadMostRecentToolStripMenuItem});
|
||||
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
|
||||
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.recentROMToolStripMenuItem.Text = "Recent ROM";
|
||||
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -305,14 +305,14 @@
|
|||
// closeROMToolStripMenuItem
|
||||
//
|
||||
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
|
||||
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.closeROMToolStripMenuItem.Text = "&Close ROM";
|
||||
this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripMenuItem1
|
||||
//
|
||||
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
|
||||
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
|
||||
this.toolStripMenuItem1.Size = new System.Drawing.Size(142, 6);
|
||||
//
|
||||
// saveStateToolStripMenuItem
|
||||
//
|
||||
|
@ -330,7 +330,7 @@
|
|||
this.toolStripSeparator6,
|
||||
this.saveNamedStateToolStripMenuItem});
|
||||
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
|
||||
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.saveStateToolStripMenuItem.Text = "Save State";
|
||||
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -432,7 +432,7 @@
|
|||
this.toolStripSeparator7,
|
||||
this.loadNamedStateToolStripMenuItem});
|
||||
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
|
||||
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.loadStateToolStripMenuItem.Text = "Load State";
|
||||
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -537,7 +537,7 @@
|
|||
this.saveToCurrentSlotToolStripMenuItem,
|
||||
this.loadCurrentSlotToolStripMenuItem});
|
||||
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
|
||||
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.saveSlotToolStripMenuItem.Text = "SaveSlot";
|
||||
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -647,7 +647,7 @@
|
|||
// toolStripMenuItem2
|
||||
//
|
||||
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
|
||||
this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
|
||||
this.toolStripMenuItem2.Size = new System.Drawing.Size(142, 6);
|
||||
//
|
||||
// movieToolStripMenuItem
|
||||
//
|
||||
|
@ -663,7 +663,7 @@
|
|||
this.bindSavestatesToMoviesToolStripMenuItem,
|
||||
this.automaticallyBackupMoviesToolStripMenuItem});
|
||||
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
|
||||
this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.movieToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.movieToolStripMenuItem.Text = "Movie";
|
||||
this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -754,13 +754,20 @@
|
|||
this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies";
|
||||
this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click);
|
||||
//
|
||||
// automaticallyBackupMoviesToolStripMenuItem
|
||||
//
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem";
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies";
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click);
|
||||
//
|
||||
// screenshotToolStripMenuItem
|
||||
//
|
||||
this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.screenshotF12ToolStripMenuItem,
|
||||
this.screenshotAsToolStripMenuItem});
|
||||
this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
|
||||
this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.screenshotToolStripMenuItem.Text = "Screenshot";
|
||||
//
|
||||
// screenshotF12ToolStripMenuItem
|
||||
|
@ -780,13 +787,13 @@
|
|||
// toolStripSeparator4
|
||||
//
|
||||
this.toolStripSeparator4.Name = "toolStripSeparator4";
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(142, 6);
|
||||
//
|
||||
// exitToolStripMenuItem
|
||||
//
|
||||
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
|
||||
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
|
||||
this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.exitToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
|
||||
this.exitToolStripMenuItem.Text = "Exit";
|
||||
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -1019,40 +1026,40 @@
|
|||
// controllersToolStripMenuItem
|
||||
//
|
||||
this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem";
|
||||
this.controllersToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.controllersToolStripMenuItem.Text = "&Controllers...";
|
||||
this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click);
|
||||
//
|
||||
// hotkeysToolStripMenuItem
|
||||
//
|
||||
this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem";
|
||||
this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.hotkeysToolStripMenuItem.Text = "&Hotkeys...";
|
||||
this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click);
|
||||
//
|
||||
// messagesToolStripMenuItem
|
||||
//
|
||||
this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem";
|
||||
this.messagesToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.messagesToolStripMenuItem.Text = "&Messages...";
|
||||
this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click);
|
||||
//
|
||||
// pathsToolStripMenuItem
|
||||
//
|
||||
this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem";
|
||||
this.pathsToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.pathsToolStripMenuItem.Text = "Paths...";
|
||||
this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripSeparator9
|
||||
//
|
||||
this.toolStripSeparator9.Name = "toolStripSeparator9";
|
||||
this.toolStripSeparator9.Size = new System.Drawing.Size(146, 6);
|
||||
this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// soundToolStripMenuItem
|
||||
//
|
||||
this.soundToolStripMenuItem.Name = "soundToolStripMenuItem";
|
||||
this.soundToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.soundToolStripMenuItem.Text = "&Sound";
|
||||
this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -1069,7 +1076,7 @@
|
|||
this.singleInstanceModeToolStripMenuItem,
|
||||
this.enableContextMenuToolStripMenuItem});
|
||||
this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem";
|
||||
this.gUIToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.gUIToolStripMenuItem.Text = "GUI";
|
||||
this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -1160,7 +1167,7 @@
|
|||
this.miSpeed150,
|
||||
this.miSpeed200});
|
||||
this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem";
|
||||
this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.frameSkipToolStripMenuItem.Text = "Speed/Skip";
|
||||
this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -1303,19 +1310,19 @@
|
|||
// toolStripSeparator10
|
||||
//
|
||||
this.toolStripSeparator10.Name = "toolStripSeparator10";
|
||||
this.toolStripSeparator10.Size = new System.Drawing.Size(146, 6);
|
||||
this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// saveConfigToolStripMenuItem
|
||||
//
|
||||
this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem";
|
||||
this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.saveConfigToolStripMenuItem.Text = "Save Config";
|
||||
this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click);
|
||||
//
|
||||
// loadConfigToolStripMenuItem
|
||||
//
|
||||
this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem";
|
||||
this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
|
||||
this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.loadConfigToolStripMenuItem.Text = "Load Config";
|
||||
//
|
||||
// toolsToolStripMenuItem
|
||||
|
@ -1642,13 +1649,6 @@
|
|||
this.closeROMToolStripMenuItem1.Text = "Close ROM";
|
||||
this.closeROMToolStripMenuItem1.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click);
|
||||
//
|
||||
// automaticallyBackupMoviesToolStripMenuItem
|
||||
//
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem";
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies";
|
||||
this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F);
|
||||
|
|
|
@ -161,10 +161,16 @@ namespace BizHawk.MultiClient
|
|||
{
|
||||
d3d = direct3D;
|
||||
backingControl = control;
|
||||
control.DoubleClick += (o, e) => Global.MainForm.ToggleFullscreen();
|
||||
control.MouseDoubleClick += (o, e) => HandleFullscreenToggle(o, e);
|
||||
control.MouseClick += (o, e) => Global.MainForm.MainForm_MouseClick(o, e);
|
||||
}
|
||||
|
||||
private void HandleFullscreenToggle(object sender, MouseEventArgs e)
|
||||
{
|
||||
if (e.Button == MouseButtons.Left)
|
||||
Global.MainForm.ToggleFullscreen();
|
||||
}
|
||||
|
||||
private void DestroyDevice()
|
||||
{
|
||||
if (Texture != null)
|
||||
|
|
Loading…
Reference in New Issue