diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index af771770b..ccfeee11c 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -2231,8 +2231,8 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.Controls.Add(this.flpSocialButtons); this.Controls.Add(this.pNews); + this.Controls.Add(this.flpSocialButtons); this.Controls.Add(this.pThumbnailView); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 5f68277cd..82bdcfff2 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -783,6 +783,9 @@ private void UpdateTheme() pThumbnailView.BackColor = ShareXResources.DarkBackgroundColor; lblThumbnailViewTip.ForeColor = ShareXResources.DarkTextColor; flpSocialButtons.BackColor = ShareXResources.DarkBackgroundColor; + btnCloseNews.FlatAppearance.BorderColor = ShareXResources.DarkBorderColor; + btnCloseNews.ForeColor = ShareXResources.DarkTextColor; + btnCloseNews.BackColor = ShareXResources.DarkBackgroundVariantColor; } else { @@ -800,6 +803,9 @@ private void UpdateTheme() pThumbnailView.BackColor = SystemColors.Window; lblThumbnailViewTip.ForeColor = Color.Silver; flpSocialButtons.BackColor = SystemColors.Window; + btnCloseNews.FlatAppearance.BorderColor = SystemColors.ControlText; + btnCloseNews.ForeColor = SystemColors.ControlText; + btnCloseNews.BackColor = SystemColors.Window; } pbPreview.UpdateTheme(); diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 424b5276a..5e4d6dac0 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -1776,68 +1776,23 @@ 405, 17 - - btnCloseNews - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNews - - - 0 - - - ucNews - - - ShareX.NewsListControl, ShareX, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null - - - pNews - - - 1 - - - Fill - - - 160, 0 - - - 674, 429 - - - 5 - - - False - - - pNews - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - Bottom, Right + + Flat + + + Arial, 11.25pt + NoControl - 560, 400 + 552, 392 - 91, 23 + 99, 31 5 @@ -1881,6 +1836,33 @@ 1 + + Fill + + + 160, 0 + + + 674, 429 + + + 5 + + + False + + + pNews + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + lblThumbnailViewTip @@ -1998,6 +1980,90 @@ GrowAndShrink + + pbPatreonButton + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpSocialButtons + + + 0 + + + pbBitcoinButton + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpSocialButtons + + + 1 + + + pbTwitterButton + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpSocialButtons + + + 2 + + + pbDiscordButton + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpSocialButtons + + + 3 + + + pbSocialHideButton + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpSocialButtons + + + 4 + + + 614, 379 + + + 215, 45 + + + 6 + + + flpSocialButtons + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + 567, 17 + 0, 0 @@ -2013,9 +2079,6 @@ 0 - - 567, 17 - Support us on Patreon @@ -2163,27 +2226,9 @@ 4 - - 614, 379 - - - 215, 45 - - - 6 - - - flpSocialButtons - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - + + 567, 17 + True