CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Support dark splitter

Browse source
This commit is contained in:
Jaex 2019-05-16 09:04:47 +03:00
parent eab5e2706d
commit 53d62226ec
5 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ShareX.HelpersLib/Controls/SplitContainerCustomSplitter.cs
View file

@ -30,13 +30,19 @@ namespace ShareX.HelpersLib
{
public class SplitContainerCustomSplitter : SplitContainer
{
public Color SplitterColor { get; set; } = Color.White;
public Color SplitterLineColor { get; set; } = ProfessionalColors.SeparatorDark;
protected override void OnPaint(PaintEventArgs pevent)
{
Graphics g = pevent.Graphics;
Rectangle rect = SplitterRectangle;
using (Pen pen = new Pen(ProfessionalColors.SeparatorDark))
using (Brush brush = new SolidBrush(SplitterColor))
using (Pen pen = new Pen(SplitterLineColor))
{
g.FillRectangle(brush, rect);
if (Orientation == Orientation.Horizontal)
{
g.DrawLine(pen, rect.Left, rect.Top, rect.Right - 1, rect.Top);

1
ShareX.HelpersLib/Controls/ToolStripDarkRenderer.cs
View file

@ -32,6 +32,7 @@ public class ToolStripDarkRenderer : ToolStripCustomRenderer
{
public static Color BackgroundColor { get; } = Color.FromArgb(42, 47, 56);
public static Color TextColor { get; } = Color.FromArgb(235, 235, 235);
public static Color BorderColor { get; } = Color.FromArgb(28, 32, 38);
public ToolStripDarkRenderer() : base(new DarkColorTable())
{

11
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -313,12 +313,12 @@ private void InitializeComponent()
this.scMain.Panel2.Controls.Add(this.pbPreview);
this.scMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.scMain_SplitterMoved);
//
// lblMainFormTip
// lblListViewTip
//
resources.ApplyResources(this.lblListViewTip, "lblMainFormTip");
resources.ApplyResources(this.lblListViewTip, "lblListViewTip");
this.lblListViewTip.BackColor = System.Drawing.Color.Transparent;
this.lblListViewTip.ForeColor = System.Drawing.Color.Silver;
this.lblListViewTip.Name = "lblMainFormTip";
this.lblListViewTip.Name = "lblListViewTip";
this.lblListViewTip.UseMnemonic = false;
this.lblListViewTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lblDragAndDropTip_MouseUp);
//
@ -419,6 +419,7 @@ private void InitializeComponent()
//
resources.ApplyResources(this.tsMain, "tsMain");
this.tsMain.CanOverflow = false;
this.tsMain.DrawCustomBorder = true;
this.tsMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsddbCapture,
@ -2209,11 +2210,11 @@ private void InitializeComponent()
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.Controls.Add(this.pNews);
this.Controls.Add(this.pThumbnailView);
this.Controls.Add(this.flpCommunity);
this.Controls.Add(this.scMain);
this.Controls.Add(this.tsMain);
this.Controls.Add(this.pNews);
this.Controls.Add(this.pThumbnailView);
this.DoubleBuffered = true;
this.Name = "MainForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);

4
ShareX/Forms/MainForm.cs
View file

@ -770,6 +770,8 @@ private void UpdateTheme()
lvUploads.BackColor = ToolStripDarkRenderer.BackgroundColor;
lvUploads.ForeColor = ToolStripDarkRenderer.TextColor;
lblListViewTip.ForeColor = ToolStripDarkRenderer.TextColor;
scMain.SplitterColor = ToolStripDarkRenderer.BackgroundColor;
scMain.SplitterLineColor = ToolStripDarkRenderer.BorderColor;
}
else
{
@ -780,6 +782,8 @@ private void UpdateTheme()
lvUploads.BackColor = SystemColors.Window;
lvUploads.ForeColor = SystemColors.WindowText;
lblListViewTip.ForeColor = Color.Silver;
scMain.SplitterColor = Color.White;
scMain.SplitterLineColor = ProfessionalColors.SeparatorDark;
}
}

50
ShareX/Forms/MainForm.resx
View file

@ -125,38 +125,38 @@
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
<value>160, 0</value>
</data>
<data name="lblMainFormTip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<data name="lblListViewTip.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
</data>
<data name="lblMainFormTip.Font" type="System.Drawing.Font, System.Drawing">
<data name="lblListViewTip.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft Sans Serif, 12pt</value>
</data>
<data name="lblMainFormTip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<data name="lblListViewTip.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="lblMainFormTip.Location" type="System.Drawing.Point, System.Drawing">
<data name="lblListViewTip.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 40</value>
</data>
<data name="lblMainFormTip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<data name="lblListViewTip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>10, 0, 10, 0</value>
</data>
<data name="lblMainFormTip.Size" type="System.Drawing.Size, System.Drawing">
<data name="lblListViewTip.Size" type="System.Drawing.Size, System.Drawing">
<value>320, 366</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="lblMainFormTip.TabIndex" type="System.Int32, mscorlib">
<data name="lblListViewTip.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;lblMainFormTip.Name" xml:space="preserve">
<value>lblMainFormTip</value>
<data name="&gt;&gt;lblListViewTip.Name" xml:space="preserve">
<value>lblListViewTip</value>
</data>
<data name="&gt;&gt;lblMainFormTip.Type" xml:space="preserve">
<data name="&gt;&gt;lblListViewTip.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;lblMainFormTip.Parent" xml:space="preserve">
<data name="&gt;&gt;lblListViewTip.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;lblMainFormTip.ZOrder" xml:space="preserve">
<data name="&gt;&gt;lblListViewTip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
@ -292,7 +292,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
<value>5</value>
<value>3</value>
</data>
<data name="flpSupportUs.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -971,7 +971,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>6</value>
<value>4</value>
</data>
<metadata name="cmsTaskInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>286, 17</value>
@ -1959,7 +1959,7 @@
<value>NoControl</value>
</data>
<data name="btnCloseNews.Location" type="System.Drawing.Point, System.Drawing">
<value>560, 400</value>
<value>720, 400</value>
</data>
<data name="btnCloseNews.Size" type="System.Drawing.Size, System.Drawing">
<value>91, 23</value>
@ -1989,7 +1989,7 @@
<value>0, 0</value>
</data>
<data name="ucNews.Size" type="System.Drawing.Size, System.Drawing">
<value>674, 429</value>
<value>834, 429</value>
</data>
<data name="ucNews.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
@ -2010,10 +2010,10 @@
<value>Fill</value>
</data>
<data name="pNews.Location" type="System.Drawing.Point, System.Drawing">
<value>160, 0</value>
<value>0, 0</value>
</data>
<data name="pNews.Size" type="System.Drawing.Size, System.Drawing">
<value>674, 429</value>
<value>834, 429</value>
</data>
<data name="pNews.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
@ -2031,7 +2031,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pNews.ZOrder" xml:space="preserve">
<value>0</value>
<value>5</value>
</data>
<data name="lblThumbnailViewTip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
@ -2049,7 +2049,7 @@
<value>20, 20, 20, 20</value>
</data>
<data name="lblThumbnailViewTip.Size" type="System.Drawing.Size, System.Drawing">
<value>674, 429</value>
<value>834, 429</value>
</data>
<data name="lblThumbnailViewTip.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
@ -2076,7 +2076,7 @@
<value>0, 0</value>
</data>
<data name="ucTaskView.Size" type="System.Drawing.Size, System.Drawing">
<value>674, 429</value>
<value>834, 429</value>
</data>
<data name="ucTaskView.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -2097,10 +2097,10 @@
<value>Fill</value>
</data>
<data name="pThumbnailView.Location" type="System.Drawing.Point, System.Drawing">
<value>160, 0</value>
<value>0, 0</value>
</data>
<data name="pThumbnailView.Size" type="System.Drawing.Size, System.Drawing">
<value>674, 429</value>
<value>834, 429</value>
</data>
<data name="pThumbnailView.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
@ -2115,7 +2115,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pThumbnailView.ZOrder" xml:space="preserve">
<value>3</value>
<value>6</value>
</data>
<data name="flpCommunity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Bottom, Right</value>
@ -2178,7 +2178,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;flpCommunity.ZOrder" xml:space="preserve">
<value>4</value>
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>