mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-28 23:42:13 +12:00
Fix focus issue
This commit is contained in:
parent
6d8e466723
commit
f1635a44ac
5 changed files with 896 additions and 906 deletions
File diff suppressed because it is too large
Load diff
|
@ -303,13 +303,13 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblTitle.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Segoe UI, 14.25pt, style=Bold</value>
|
||||
<value>Segoe UI, 15.75pt</value>
|
||||
</data>
|
||||
<data name="lblTitle.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 16</value>
|
||||
</data>
|
||||
<data name="lblTitle.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>220, 25</value>
|
||||
<value>229, 30</value>
|
||||
</data>
|
||||
<data name="lblTitle.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
@ -344,7 +344,6 @@
|
|||
</data>
|
||||
<data name="$this.Text" xml:space="preserve">
|
||||
<value>ShareX</value>
|
||||
<comment>@Invariant</comment>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>FirstTimeConfigForm</value>
|
||||
|
|
47
ShareX/Forms/MainForm.Designer.cs
generated
47
ShareX/Forms/MainForm.Designer.cs
generated
|
@ -30,9 +30,9 @@ private void InitializeComponent()
|
|||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
|
||||
this.lvUploads = new ShareX.HelpersLib.MyListView();
|
||||
this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
|
||||
|
@ -2245,34 +2245,35 @@ private void InitializeComponent()
|
|||
this.dgvHotkeys.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
|
||||
this.dgvHotkeys.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.dgvHotkeys.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
|
||||
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle4.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(8, 4, 8, 4);
|
||||
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.dgvHotkeys.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle1.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(8, 4, 8, 4);
|
||||
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.dgvHotkeys.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvHotkeys.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvHotkeys.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.cHotkeyStatus,
|
||||
this.cHotkey,
|
||||
this.cDescription});
|
||||
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
|
||||
dataGridViewCellStyle6.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(8, 4, 8, 4);
|
||||
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvHotkeys.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
|
||||
dataGridViewCellStyle3.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
|
||||
dataGridViewCellStyle3.Padding = new System.Windows.Forms.Padding(8, 4, 8, 4);
|
||||
dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvHotkeys.DefaultCellStyle = dataGridViewCellStyle3;
|
||||
resources.ApplyResources(this.dgvHotkeys, "dgvHotkeys");
|
||||
this.dgvHotkeys.MultiSelect = false;
|
||||
this.dgvHotkeys.Name = "dgvHotkeys";
|
||||
this.dgvHotkeys.ReadOnly = true;
|
||||
this.dgvHotkeys.RowHeadersVisible = false;
|
||||
this.dgvHotkeys.TabStop = false;
|
||||
this.dgvHotkeys.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dgvHotkeys_MouseDoubleClick);
|
||||
this.dgvHotkeys.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvHotkeys_MouseUp);
|
||||
//
|
||||
|
@ -2285,8 +2286,8 @@ private void InitializeComponent()
|
|||
// cHotkey
|
||||
//
|
||||
this.cHotkey.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
|
||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.cHotkey.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
||||
this.cHotkey.DefaultCellStyle = dataGridViewCellStyle2;
|
||||
resources.ApplyResources(this.cHotkey, "cHotkey");
|
||||
this.cHotkey.Name = "cHotkey";
|
||||
this.cHotkey.ReadOnly = true;
|
||||
|
|
|
@ -343,6 +343,11 @@ private void InitHotkeys()
|
|||
DebugHelper.WriteLine("WatchFolderManager started.");
|
||||
|
||||
UpdateWorkflowsMenu();
|
||||
|
||||
if (pHotkeys.Visible)
|
||||
{
|
||||
pHotkeys.Focus();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue