Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-215575: Corrected regression as requested per code review: the full screen

Browse Source 
console should appear on the same monitor as the main form.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2016-09-06 10:32:49 +01:00
parent 9b7f90ccb4
commit 4cdb24dd29
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/ConsoleView/VNCTabView.cs
View File

@ -1029,8 +1029,8 @@ namespace XenAdmin.ConsoleView
vncScreen.DisplayFocusRectangle = false;
fullscreenHint = new FullScreenHint();
fullscreenHint.Show(fullscreenForm);
fullscreenForm.Show();
fullscreenHint.Show(fullscreenForm);
FocusVNC();
vncScreen.CaptureKeyboardAndMouse();

2
XenAdmin/Controls/ConsoleTab/FullScreenForm.Designer.cs generated
View File

@ -37,7 +37,6 @@
//
resources.ApplyResources(this.connectionBar1, "connectionBar1");
this.connectionBar1.BackColor = System.Drawing.Color.Transparent;
this.connectionBar1.MinimumSize = new System.Drawing.Size(298, 24);
this.connectionBar1.Name = "connectionBar1";
this.connectionBar1.TabStop = false;
//
@ -61,7 +60,6 @@
this.Name = "FullScreenForm";
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.ResumeLayout(false);
}

1
XenAdmin/Controls/ConsoleTab/FullScreenForm.cs
View File

@ -60,6 +60,7 @@ namespace XenAdmin.Controls.ConsoleTab
StartPosition = FormStartPosition.Manual;
Location = screen.WorkingArea.Location;
Size = screen.Bounds.Size;
WindowState = FormWindowState.Maximized;
}
protected override void OnShown(EventArgs e)

19
XenAdmin/Controls/ConsoleTab/FullScreenForm.resx
View File

@ -112,19 +112,19 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="connectionBar1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top</value>
</data>
<data name="connectionBar1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
<value>GrowAndShrink</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="connectionBar1.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 8.25pt</value>
</data>
@ -134,10 +134,13 @@
<data name="connectionBar1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 0, 0</value>
</data>
<data name="connectionBar1.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>298, 24</value>
</data>
<data name="connectionBar1.Size" type="System.Drawing.Size, System.Drawing">
<value>434, 24</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="connectionBar1.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@ -172,7 +175,7 @@
<value>contentPanel</value>
</data>
<data name="&gt;&gt;contentPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;contentPanel.Parent" xml:space="preserve">
<value>$this</value>
@ -180,7 +183,7 @@
<data name="&gt;&gt;contentPanel.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
@ -196,6 +199,6 @@
<value>FullScreenForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>