mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-30 20:20:34 +12:00
Handle color button border color
This commit is contained in:
Jaex
parent
459775e988
commit
e9158d6574
|
|
@ -164,6 +164,13 @@ public static void ApplyCustomThemeToControl(Control control)
|
|||
|
||||
switch (control)
|
||||
{
|
||||
case ColorButton colorButton:
|
||||
colorButton.FlatStyle = FlatStyle.Flat;
|
||||
colorButton.FlatAppearance.BorderColor = Theme.BorderColor;
|
||||
colorButton.ForeColor = Theme.TextColor;
|
||||
colorButton.BackColor = Theme.LightBackgroundColor;
|
||||
colorButton.BorderColor = Theme.BorderColor;
|
||||
return;
|
||||
case Button btn:
|
||||
btn.FlatStyle = FlatStyle.Flat;
|
||||
btn.FlatAppearance.BorderColor = Theme.BorderColor;
|
||||
|
|
|
|||
32
ShareX/Controls/HotkeySelectionControl.Designer.cs
generated
32
ShareX/Controls/HotkeySelectionControl.Designer.cs
generated
|
|
@ -31,9 +31,9 @@ private void InitializeComponent()
|
|||
this.components = new System.ComponentModel.Container();
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HotkeySelectionControl));
|
||||
this.btnEdit = new System.Windows.Forms.Button();
|
||||
this.btnHotkey = new ShareX.HelpersLib.ColorButton();
|
||||
this.btnTask = new ShareX.HelpersLib.MenuButton();
|
||||
this.cmsTask = new System.Windows.Forms.ContextMenuStrip(this.components);
|
||||
this.btnTask = new ShareX.HelpersLib.MenuButton();
|
||||
this.btnHotkey = new ShareX.HelpersLib.ColorButton();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// btnEdit
|
||||
|
|
@ -44,6 +44,20 @@ private void InitializeComponent()
|
|||
this.btnEdit.UseVisualStyleBackColor = true;
|
||||
this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
|
||||
//
|
||||
// cmsTask
|
||||
//
|
||||
this.cmsTask.Name = "cmsTask";
|
||||
resources.ApplyResources(this.cmsTask, "cmsTask");
|
||||
//
|
||||
// btnTask
|
||||
//
|
||||
resources.ApplyResources(this.btnTask, "btnTask");
|
||||
this.btnTask.Image = global::ShareX.Properties.Resources.gear;
|
||||
this.btnTask.Menu = this.cmsTask;
|
||||
this.btnTask.Name = "btnTask";
|
||||
this.btnTask.UseMnemonic = false;
|
||||
this.btnTask.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// btnHotkey
|
||||
//
|
||||
resources.ApplyResources(this.btnHotkey, "btnHotkey");
|
||||
|
|
@ -59,20 +73,6 @@ private void InitializeComponent()
|
|||
this.btnHotkey.MouseClick += new System.Windows.Forms.MouseEventHandler(this.btnHotkey_MouseClick);
|
||||
this.btnHotkey.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.btnHotkey_PreviewKeyDown);
|
||||
//
|
||||
// btnTask
|
||||
//
|
||||
resources.ApplyResources(this.btnTask, "btnTask");
|
||||
this.btnTask.Image = global::ShareX.Properties.Resources.gear;
|
||||
this.btnTask.Menu = this.cmsTask;
|
||||
this.btnTask.Name = "btnTask";
|
||||
this.btnTask.UseMnemonic = false;
|
||||
this.btnTask.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// cmsTask
|
||||
//
|
||||
this.cmsTask.Name = "cmsTask";
|
||||
resources.ApplyResources(this.cmsTask, "cmsTask");
|
||||
//
|
||||
// HotkeySelectionControl
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
|
|
|
|||
|
|
@ -147,6 +147,60 @@
|
|||
<data name=">>btnEdit.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<metadata name="cmsTask.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="cmsTask.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>61, 4</value>
|
||||
</data>
|
||||
<data name=">>cmsTask.Name" xml:space="preserve">
|
||||
<value>cmsTask</value>
|
||||
</data>
|
||||
<data name=">>cmsTask.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="btnTask.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
</data>
|
||||
<data name="btnTask.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name="btnTask.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="btnTask.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="btnTask.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 0, 3, 0</value>
|
||||
</data>
|
||||
<data name="btnTask.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>226, 27</value>
|
||||
</data>
|
||||
<data name="btnTask.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="btnTask.Text" xml:space="preserve">
|
||||
<value>Task...</value>
|
||||
</data>
|
||||
<data name="btnTask.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name="btnTask.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
|
||||
<value>ImageBeforeText</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Name" xml:space="preserve">
|
||||
<value>btnTask</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnTask.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="btnHotkey.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Right</value>
|
||||
</data>
|
||||
|
|
@ -180,57 +234,6 @@
|
|||
<data name=">>btnHotkey.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="btnTask.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Left, Right</value>
|
||||
</data>
|
||||
<data name="btnTask.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name="btnTask.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<metadata name="cmsTask.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="cmsTask.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>61, 4</value>
|
||||
</data>
|
||||
<data name=">>cmsTask.Name" xml:space="preserve">
|
||||
<value>cmsTask</value>
|
||||
</data>
|
||||
<data name=">>cmsTask.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="btnTask.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
|
||||
<value>3, 0, 0, 0</value>
|
||||
</data>
|
||||
<data name="btnTask.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>226, 27</value>
|
||||
</data>
|
||||
<data name="btnTask.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="btnTask.Text" xml:space="preserve">
|
||||
<value>Task...</value>
|
||||
</data>
|
||||
<data name="btnTask.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleLeft</value>
|
||||
</data>
|
||||
<data name="btnTask.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
|
||||
<value>ImageBeforeText</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Name" xml:space="preserve">
|
||||
<value>btnTask</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MenuButton, ShareX.HelpersLib, Version=14.1.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>btnTask.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnTask.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ private void control_HotkeyChanged(object sender, EventArgs e)
|
|||
private HotkeySelectionControl AddHotkeySelectionControl(HotkeySettings hotkeySetting)
|
||||
{
|
||||
HotkeySelectionControl control = new HotkeySelectionControl(hotkeySetting);
|
||||
control.Margin = new Padding(0, 0, 0, 2);
|
||||
control.Margin = new Padding(0, 0, 0, 4);
|
||||
control.SelectedChanged += control_SelectedChanged;
|
||||
control.HotkeyChanged += control_HotkeyChanged;
|
||||
control.EditRequested += control_EditRequested;
|
||||
|
|
|
|||
Loading…
Reference in a new issue