CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 11:10:23 +12:00
Code Issues Packages Projects Releases Wiki Activity

Added border to toolstrip control instead of using label as workaround

Browse source
This commit is contained in:
Jaex 2017-06-03 17:02:36 +03:00
parent 70eebeb6af
commit 265cdff262
9 changed files with 352 additions and 333 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.HelpersLib/Controls/BlackStyle/UpdatePanel.cs
View file

@ -39,7 +39,7 @@ public UpdatePanel()
protected override void OnPaint(PaintEventArgs e)
{
Graphics g = e.Graphics;
Rectangle rect = e.ClipRectangle;
Rectangle rect = ClientRectangle;
using (Brush backgroundBrush = new LinearGradientBrush(rect, Color.FromArgb(100, 100, 100), Color.FromArgb(70, 70, 70), LinearGradientMode.Vertical))
{

49
ShareX.HelpersLib/Controls/ToolStripBorderRight.cs Normal file
View file

@ -0,0 +1,49 @@
#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
Copyright (c) 2007-2017 ShareX Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Optionally you can also view the license at <http://www.gnu.org/licenses/>.
*/
#endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace ShareX.HelpersLib
{
public class ToolStripBorderRight : ToolStrip
{
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
e.Graphics.DrawLine(Pens.DarkGray, new Point(ClientSize.Width - 1, 0), new Point(ClientSize.Width - 1, ClientSize.Height - 1));
}
protected override void OnPaintBackground(PaintEventArgs e)
{
base.OnPaintBackground(e);
}
}
}

2
ShareX.HelpersLib/Controls/ToolStripButtonExtraImage.cs
View file

@ -49,7 +49,7 @@ protected override void OnPaint(PaintEventArgs e)
if (ShowExtraImage && ExtraImage != null)
{
e.Graphics.DrawImage(ExtraImage, new Point(e.ClipRectangle.Right - ExtraImage.Width - extraImagePadding, extraImagePadding));
e.Graphics.DrawImage(ExtraImage, new Point(Width - ExtraImage.Width - extraImagePadding, extraImagePadding));
}
}
}

3
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -104,6 +104,9 @@
<Compile Include="Controls\HotkeySelectionButton.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\ToolStripBorderRight.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Controls\ToolStripButtonExtraImage.cs">
<SubType>Component</SubType>
</Compile>

2
ShareX/Controls/NewsListControl.cs
View file

@ -90,7 +90,7 @@ private void TlpMain_CellPaint(object sender, TableLayoutCellPaintEventArgs e)
}
else
{
color = Color.FromArgb(246, 246, 246);
color = Color.FromArgb(247, 247, 247);
}
using (Brush brush = new SolidBrush(color))

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

@ -32,7 +32,6 @@ private void InitializeComponent()
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
this.lblMainFormTip = new System.Windows.Forms.Label();
this.lblSplitter = new System.Windows.Forms.Label();
this.lvUploads = new ShareX.HelpersLib.MyListView();
this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.chStatus = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@ -45,7 +44,7 @@ private void InitializeComponent()
this.flpPatreon = new System.Windows.Forms.FlowLayoutPanel();
this.pbPatreonOpen = new System.Windows.Forms.PictureBox();
this.pbPatreonHide = new System.Windows.Forms.PictureBox();
this.tsMain = new System.Windows.Forms.ToolStrip();
this.tsMain = new ShareX.HelpersLib.ToolStripBorderRight();
this.tsddbCapture = new System.Windows.Forms.ToolStripDropDownButton();
this.tsmiFullscreen = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiWindow = new System.Windows.Forms.ToolStripMenuItem();
@ -262,7 +261,6 @@ private void InitializeComponent()
// scMain.Panel1
//
this.scMain.Panel1.Controls.Add(this.lblMainFormTip);
this.scMain.Panel1.Controls.Add(this.lblSplitter);
this.scMain.Panel1.Controls.Add(this.lvUploads);
//
// scMain.Panel2
@ -280,12 +278,6 @@ private void InitializeComponent()
this.lblMainFormTip.UseMnemonic = false;
this.lblMainFormTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lblDragAndDropTip_MouseUp);
//
// lblSplitter
//
this.lblSplitter.BackColor = System.Drawing.Color.DarkGray;
resources.ApplyResources(this.lblSplitter, "lblSplitter");
this.lblSplitter.Name = "lblSplitter";
//
// lvUploads
//
this.lvUploads.AutoFillColumn = true;
@ -1917,7 +1909,7 @@ private void InitializeComponent()
private System.Windows.Forms.ColumnHeader chURL;
private System.Windows.Forms.ColumnHeader chFilename;
private System.Windows.Forms.ColumnHeader chProgress;
private System.Windows.Forms.ToolStrip tsMain;
private ShareX.HelpersLib.ToolStripBorderRight tsMain;
private System.Windows.Forms.ToolStripSeparator tssMain1;
private System.Windows.Forms.ColumnHeader chSpeed;
private System.Windows.Forms.ColumnHeader chRemaining;
@ -1992,7 +1984,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayURLSharingServices;
private System.Windows.Forms.ToolStripDropDownButton tsddbAfterUploadTasks;
private System.Windows.Forms.ToolStripButton tsbScreenshotsFolder;
private System.Windows.Forms.Label lblSplitter;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayAfterUploadTasks;
private System.Windows.Forms.ToolStripSeparator tssUploadInfo1;
private System.Windows.Forms.ToolStripMenuItem tsmiImagePreview;

2
ShareX/Forms/MainForm.cs
View file

@ -872,7 +872,7 @@ private void UpdateMainWindowLayout()
tsmiHideMenu.Text = Resources.MainForm_UpdateMenu_Show_menu;
}
tsMain.Visible = lblSplitter.Visible = Program.Settings.ShowMenu;
tsMain.Visible = Program.Settings.ShowMenu;
if (Program.Settings.ShowColumns)
{

610
ShareX/Forms/MainForm.resx
View file

@ -159,30 +159,6 @@
<data name="&gt;&gt;lblMainFormTip.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="lblSplitter.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="lblSplitter.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="lblSplitter.Size" type="System.Drawing.Size, System.Drawing">
<value>1, 429</value>
</data>
<data name="lblSplitter.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;lblSplitter.Name" xml:space="preserve">
<value>lblSplitter</value>
</data>
<data name="&gt;&gt;lblSplitter.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;lblSplitter.Parent" xml:space="preserve">
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;lblSplitter.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="lvUploads.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
@ -205,7 +181,7 @@
<value>scMain.Panel1</value>
</data>
<data name="&gt;&gt;lvUploads.ZOrder" xml:space="preserve">
<value>2</value>
<value>1</value>
</data>
<data name="&gt;&gt;scMain.Panel1.Name" xml:space="preserve">
<value>scMain.Panel1</value>
@ -447,30 +423,6 @@
<data name="tsMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Left</value>
</data>
<data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tsMain.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 429</value>
</data>
<data name="tsMain.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;tsMain.Name" xml:space="preserve">
<value>tsMain</value>
</data>
<data name="&gt;&gt;tsMain.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="tsddbCapture.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -483,84 +435,6 @@
<data name="tsddbCapture.Text" xml:space="preserve">
<value>Capture</value>
</data>
<data name="tsmiFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiFullscreen.Text" xml:space="preserve">
<value>Fullscreen</value>
</data>
<data name="tsmiWindow.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiWindow.Text" xml:space="preserve">
<value>Window</value>
</data>
<data name="tsmiMonitor.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiMonitor.Text" xml:space="preserve">
<value>Monitor</value>
</data>
<data name="tsmiRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangleLight.Text" xml:space="preserve">
<value>Region (Light)</value>
</data>
<data name="tsmiRectangleTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangleTransparent.Text" xml:space="preserve">
<value>Region (Transparent)</value>
</data>
<data name="tsmiLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiLastRegion.Text" xml:space="preserve">
<value>Last region</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Text" xml:space="preserve">
<value>Screen recording</value>
</data>
<data name="tsmiScreenRecordingGIF.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScreenRecordingGIF.Text" xml:space="preserve">
<value>Screen recording (GIF)</value>
</data>
<data name="tsmiScrollingCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScrollingCapture.Text" xml:space="preserve">
<value>Scrolling capture...</value>
</data>
<data name="tsmiWebpageCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiWebpageCapture.Text" xml:space="preserve">
<value>Webpage capture...</value>
</data>
<data name="tsmiTextCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiTextCapture.Text" xml:space="preserve">
<value>Text capture (OCR)...</value>
</data>
<data name="tsmiAutoCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
</data>
<data name="tsddbUpload.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -573,36 +447,6 @@
<data name="tsddbUpload.Text" xml:space="preserve">
<value>Upload</value>
</data>
<data name="tsmiUploadFile.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadFile.Text" xml:space="preserve">
<value>Upload file...</value>
</data>
<data name="tsmiUploadFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadFolder.Text" xml:space="preserve">
<value>Upload folder...</value>
</data>
<data name="tsmiUploadClipboard.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadClipboard.Text" xml:space="preserve">
<value>Upload from clipboard...</value>
</data>
<data name="tsmiUploadURL.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadURL.Text" xml:space="preserve">
<value>Upload from URL...</value>
</data>
<data name="tsmiUploadDragDrop.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadDragDrop.Text" xml:space="preserve">
<value>Drag and drop upload...</value>
</data>
<data name="tsddbWorkflows.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>BottomLeft</value>
</data>
@ -627,90 +471,6 @@
<data name="tsddbTools.Text" xml:space="preserve">
<value>Tools</value>
</data>
<data name="tsmiColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiColorPicker.Text" xml:space="preserve">
<value>Color picker...</value>
</data>
<data name="tsmiScreenColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiScreenColorPicker.Text" xml:space="preserve">
<value>Screen color picker...</value>
</data>
<data name="tsmiAnnotateImage.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiAnnotateImage.Text" xml:space="preserve">
<value>Annotate image...</value>
</data>
<data name="tsmiImageEffects.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiImageEffects.Text" xml:space="preserve">
<value>Image effects...</value>
</data>
<data name="tsmiHashCheck.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiHashCheck.Text" xml:space="preserve">
<value>Hash check...</value>
</data>
<data name="tsmiDNSChanger.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiDNSChanger.Text" xml:space="preserve">
<value>DNS changer...</value>
</data>
<data name="tsmiQRCode.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiQRCode.Text" xml:space="preserve">
<value>QR code...</value>
</data>
<data name="tsmiRuler.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiRuler.Text" xml:space="preserve">
<value>Ruler...</value>
</data>
<data name="tsmiIndexFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiIndexFolder.Text" xml:space="preserve">
<value>Directory indexer...</value>
</data>
<data name="tsmiImageCombiner.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiImageCombiner.Text" xml:space="preserve">
<value>Image combiner...</value>
</data>
<data name="tsmiVideoThumbnailer.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiVideoThumbnailer.Text" xml:space="preserve">
<value>Video thumbnailer...</value>
</data>
<data name="tsmiFTPClient.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiFTPClient.Text" xml:space="preserve">
<value>FTP client...</value>
</data>
<data name="tsmiTweetMessage.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiTweetMessage.Text" xml:space="preserve">
<value>Tweet message...</value>
</data>
<data name="tsmiMonitorTest.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiMonitorTest.Text" xml:space="preserve">
<value>Monitor test...</value>
</data>
<data name="tssMain1.Size" type="System.Drawing.Size, System.Drawing">
<value>147, 6</value>
</data>
@ -750,45 +510,6 @@
<data name="tsddbDestinations.Text" xml:space="preserve">
<value>Destinations</value>
</data>
<data name="tsmiImageUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiImageUploaders.Text" xml:space="preserve">
<value>Image uploaders</value>
</data>
<data name="tsmiTextUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiTextUploaders.Text" xml:space="preserve">
<value>Text uploaders</value>
</data>
<data name="tsmiFileUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiFileUploaders.Text" xml:space="preserve">
<value>File uploaders</value>
</data>
<data name="tsmiURLShorteners.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiURLShorteners.Text" xml:space="preserve">
<value>URL shorteners</value>
</data>
<data name="tsmiURLSharingServices.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiURLSharingServices.Text" xml:space="preserve">
<value>URL sharing services</value>
</data>
<data name="tssDestinations1.Size" type="System.Drawing.Size, System.Drawing">
<value>184, 6</value>
</data>
<data name="tsmiDestinationSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiDestinationSettings.Text" xml:space="preserve">
<value>Destination settings...</value>
</data>
<data name="tsbTaskSettings.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -876,42 +597,6 @@
<data name="tsddbDebug.Text" xml:space="preserve">
<value>Debug</value>
</data>
<data name="tsmiShowDebugLog.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiShowDebugLog.Text" xml:space="preserve">
<value>Debug log...</value>
</data>
<data name="tsmiTestImageUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestImageUpload.Text" xml:space="preserve">
<value>Test image upload</value>
</data>
<data name="tsmiTestTextUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestTextUpload.Text" xml:space="preserve">
<value>Test text upload</value>
</data>
<data name="tsmiTestFileUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestFileUpload.Text" xml:space="preserve">
<value>Test file upload</value>
</data>
<data name="tsmiTestURLShortener.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestURLShortener.Text" xml:space="preserve">
<value>Test URL shortener</value>
</data>
<data name="tsmiTestURLSharing.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestURLSharing.Text" xml:space="preserve">
<value>Test URL sharing</value>
</data>
<data name="tsbNews.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
@ -948,6 +633,297 @@
<data name="tsmiAbout.Text" xml:space="preserve">
<value>About...</value>
</data>
<data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="tsMain.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>6, 6, 6, 6</value>
</data>
<data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 429</value>
</data>
<data name="tsMain.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;tsMain.Name" xml:space="preserve">
<value>tsMain</value>
</data>
<data name="&gt;&gt;tsMain.Type" xml:space="preserve">
<value>ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="tsmiFullscreen.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiFullscreen.Text" xml:space="preserve">
<value>Fullscreen</value>
</data>
<data name="tsmiWindow.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiWindow.Text" xml:space="preserve">
<value>Window</value>
</data>
<data name="tsmiMonitor.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiMonitor.Text" xml:space="preserve">
<value>Monitor</value>
</data>
<data name="tsmiRectangle.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangle.Text" xml:space="preserve">
<value>Region</value>
</data>
<data name="tsmiRectangleLight.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangleLight.Text" xml:space="preserve">
<value>Region (Light)</value>
</data>
<data name="tsmiRectangleTransparent.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiRectangleTransparent.Text" xml:space="preserve">
<value>Region (Transparent)</value>
</data>
<data name="tsmiLastRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiLastRegion.Text" xml:space="preserve">
<value>Last region</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScreenRecordingFFmpeg.Text" xml:space="preserve">
<value>Screen recording</value>
</data>
<data name="tsmiScreenRecordingGIF.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScreenRecordingGIF.Text" xml:space="preserve">
<value>Screen recording (GIF)</value>
</data>
<data name="tsmiScrollingCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiScrollingCapture.Text" xml:space="preserve">
<value>Scrolling capture...</value>
</data>
<data name="tsmiWebpageCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiWebpageCapture.Text" xml:space="preserve">
<value>Webpage capture...</value>
</data>
<data name="tsmiTextCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiTextCapture.Text" xml:space="preserve">
<value>Text capture (OCR)...</value>
</data>
<data name="tsmiAutoCapture.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 22</value>
</data>
<data name="tsmiAutoCapture.Text" xml:space="preserve">
<value>Auto capture...</value>
</data>
<data name="tsmiUploadFile.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadFile.Text" xml:space="preserve">
<value>Upload file...</value>
</data>
<data name="tsmiUploadFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadFolder.Text" xml:space="preserve">
<value>Upload folder...</value>
</data>
<data name="tsmiUploadClipboard.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadClipboard.Text" xml:space="preserve">
<value>Upload from clipboard...</value>
</data>
<data name="tsmiUploadURL.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadURL.Text" xml:space="preserve">
<value>Upload from URL...</value>
</data>
<data name="tsmiUploadDragDrop.Size" type="System.Drawing.Size, System.Drawing">
<value>203, 22</value>
</data>
<data name="tsmiUploadDragDrop.Text" xml:space="preserve">
<value>Drag and drop upload...</value>
</data>
<data name="tsmiColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiColorPicker.Text" xml:space="preserve">
<value>Color picker...</value>
</data>
<data name="tsmiScreenColorPicker.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiScreenColorPicker.Text" xml:space="preserve">
<value>Screen color picker...</value>
</data>
<data name="tsmiAnnotateImage.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiAnnotateImage.Text" xml:space="preserve">
<value>Annotate image...</value>
</data>
<data name="tsmiImageEffects.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiImageEffects.Text" xml:space="preserve">
<value>Image effects...</value>
</data>
<data name="tsmiHashCheck.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiHashCheck.Text" xml:space="preserve">
<value>Hash check...</value>
</data>
<data name="tsmiDNSChanger.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiDNSChanger.Text" xml:space="preserve">
<value>DNS changer...</value>
</data>
<data name="tsmiQRCode.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiQRCode.Text" xml:space="preserve">
<value>QR code...</value>
</data>
<data name="tsmiRuler.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiRuler.Text" xml:space="preserve">
<value>Ruler...</value>
</data>
<data name="tsmiIndexFolder.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiIndexFolder.Text" xml:space="preserve">
<value>Directory indexer...</value>
</data>
<data name="tsmiImageCombiner.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiImageCombiner.Text" xml:space="preserve">
<value>Image combiner...</value>
</data>
<data name="tsmiVideoThumbnailer.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiVideoThumbnailer.Text" xml:space="preserve">
<value>Video thumbnailer...</value>
</data>
<data name="tsmiFTPClient.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiFTPClient.Text" xml:space="preserve">
<value>FTP client...</value>
</data>
<data name="tsmiTweetMessage.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiTweetMessage.Text" xml:space="preserve">
<value>Tweet message...</value>
</data>
<data name="tsmiMonitorTest.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 22</value>
</data>
<data name="tsmiMonitorTest.Text" xml:space="preserve">
<value>Monitor test...</value>
</data>
<data name="tsmiImageUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiImageUploaders.Text" xml:space="preserve">
<value>Image uploaders</value>
</data>
<data name="tsmiTextUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiTextUploaders.Text" xml:space="preserve">
<value>Text uploaders</value>
</data>
<data name="tsmiFileUploaders.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiFileUploaders.Text" xml:space="preserve">
<value>File uploaders</value>
</data>
<data name="tsmiURLShorteners.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiURLShorteners.Text" xml:space="preserve">
<value>URL shorteners</value>
</data>
<data name="tsmiURLSharingServices.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiURLSharingServices.Text" xml:space="preserve">
<value>URL sharing services</value>
</data>
<data name="tssDestinations1.Size" type="System.Drawing.Size, System.Drawing">
<value>184, 6</value>
</data>
<data name="tsmiDestinationSettings.Size" type="System.Drawing.Size, System.Drawing">
<value>187, 22</value>
</data>
<data name="tsmiDestinationSettings.Text" xml:space="preserve">
<value>Destination settings...</value>
</data>
<data name="tsmiShowDebugLog.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiShowDebugLog.Text" xml:space="preserve">
<value>Debug log...</value>
</data>
<data name="tsmiTestImageUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestImageUpload.Text" xml:space="preserve">
<value>Test image upload</value>
</data>
<data name="tsmiTestTextUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestTextUpload.Text" xml:space="preserve">
<value>Test text upload</value>
</data>
<data name="tsmiTestFileUpload.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestFileUpload.Text" xml:space="preserve">
<value>Test file upload</value>
</data>
<data name="tsmiTestURLShortener.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestURLShortener.Text" xml:space="preserve">
<value>Test URL shortener</value>
</data>
<data name="tsmiTestURLSharing.Size" type="System.Drawing.Size, System.Drawing">
<value>172, 22</value>
</data>
<data name="tsmiTestURLSharing.Text" xml:space="preserve">
<value>Test URL sharing</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>
</metadata>
@ -1774,7 +1750,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;newsListControl1.ZOrder" xml:space="preserve">
<value>0</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>

2
ShareX/Forms/NotificationForm.cs
View file

@ -136,7 +136,7 @@ protected override void OnPaint(PaintEventArgs e)
{
Graphics g = e.Graphics;
Rectangle rect = e.ClipRectangle;
Rectangle rect = ClientRectangle;
if (ToastConfig.Image != null)
{