From 3c80c3f3e355d4a736b36dd44ea772e6d32a44d8 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 29 Jul 2021 07:05:20 +0300 Subject: [PATCH] Remove image border --- .../Forms/HistoryForm.Designer.cs | 22 +++++++++---------- ShareX.HistoryLib/Forms/HistoryForm.cs | 1 + ShareX.HistoryLib/Forms/HistoryForm.resx | 22 +++++++++---------- ShareX.HistoryLib/Forms/ImageHistoryForm.cs | 3 +++ 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs index cae78c80f..13703b25e 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.Designer.cs @@ -52,7 +52,7 @@ private void InitializeComponent() this.chDateTime = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chFilename = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.chURL = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.tssHistory = new System.Windows.Forms.ToolStrip(); + this.tsHistory = new System.Windows.Forms.ToolStrip(); this.tslSearch = new System.Windows.Forms.ToolStripLabel(); this.tstbSearch = new System.Windows.Forms.ToolStripTextBox(); this.tsbSearch = new System.Windows.Forms.ToolStripButton(); @@ -67,7 +67,7 @@ private void InitializeComponent() this.tscHistory.TopToolStripPanel.SuspendLayout(); this.tscHistory.SuspendLayout(); this.gbAdvancedSearch.SuspendLayout(); - this.tssHistory.SuspendLayout(); + this.tsHistory.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -87,7 +87,7 @@ private void InitializeComponent() // // tscHistory.TopToolStripPanel // - this.tscHistory.TopToolStripPanel.Controls.Add(this.tssHistory); + this.tscHistory.TopToolStripPanel.Controls.Add(this.tsHistory); // // gbAdvancedSearch // @@ -234,11 +234,11 @@ private void InitializeComponent() // resources.ApplyResources(this.chURL, "chURL"); // - // tssHistory + // tsHistory // - resources.ApplyResources(this.tssHistory, "tssHistory"); - this.tssHistory.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.tssHistory.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + resources.ApplyResources(this.tsHistory, "tsHistory"); + this.tsHistory.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.tsHistory.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tslSearch, this.tstbSearch, this.tsbSearch, @@ -247,7 +247,7 @@ private void InitializeComponent() this.tsbCopyStats, this.tss2, this.tsbSettings}); - this.tssHistory.Name = "tssHistory"; + this.tsHistory.Name = "tsHistory"; // // tslSearch // @@ -348,8 +348,8 @@ private void InitializeComponent() this.tscHistory.PerformLayout(); this.gbAdvancedSearch.ResumeLayout(false); this.gbAdvancedSearch.PerformLayout(); - this.tssHistory.ResumeLayout(false); - this.tssHistory.PerformLayout(); + this.tsHistory.ResumeLayout(false); + this.tsHistory.PerformLayout(); this.scMain.Panel1.ResumeLayout(false); this.scMain.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit(); @@ -382,7 +382,7 @@ private void InitializeComponent() private System.Windows.Forms.Label lblURLFilter; private System.Windows.Forms.TextBox txtURLFilter; private System.Windows.Forms.ToolStripContainer tscHistory; - private System.Windows.Forms.ToolStrip tssHistory; + private System.Windows.Forms.ToolStrip tsHistory; private System.Windows.Forms.ToolStripLabel tslSearch; private System.Windows.Forms.ToolStripTextBox tstbSearch; private System.Windows.Forms.ToolStripButton tsbSearch; diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs index 6f696819f..b3caa3860 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.cs +++ b/ShareX.HistoryLib/Forms/HistoryForm.cs @@ -50,6 +50,7 @@ public HistoryForm(string historyPath, HistorySettings settings, Action Settings = settings; InitializeComponent(); + tsHistory.Renderer = new ToolStripRoundedEdgeRenderer(); defaultTitle = Text; UpdateTitle(); diff --git a/ShareX.HistoryLib/Forms/HistoryForm.resx b/ShareX.HistoryLib/Forms/HistoryForm.resx index 0a15656cd..e695194b2 100644 --- a/ShareX.HistoryLib/Forms/HistoryForm.resx +++ b/ShareX.HistoryLib/Forms/HistoryForm.resx @@ -648,10 +648,10 @@ toolStripContainer1 - + 17, 17 - + None @@ -708,25 +708,25 @@ Settings... - + 3, 0 - - 454, 25 + + 485, 25 - + 0 - - tssHistory + + tsHistory - + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + tscHistory.TopToolStripPanel - + 0 diff --git a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs index 9f0227e53..f05f1761f 100644 --- a/ShareX.HistoryLib/Forms/ImageHistoryForm.cs +++ b/ShareX.HistoryLib/Forms/ImageHistoryForm.cs @@ -27,6 +27,7 @@ using ShareX.HelpersLib; using System; using System.Collections.Generic; +using System.Drawing; using System.IO; using System.Linq; using System.Text.RegularExpressions; @@ -63,6 +64,8 @@ public ImageHistoryForm(string historyPath, ImageHistorySettings settings, Actio ilvImages.Colors.BackColor = ShareXResources.Theme.DarkBackgroundColor; ilvImages.Colors.BorderColor = ShareXResources.Theme.DarkBackgroundColor; ilvImages.Colors.ForeColor = ShareXResources.Theme.TextColor; + ilvImages.Colors.ImageInnerBorderColor = Color.Transparent; + ilvImages.Colors.ImageOuterBorderColor = Color.Transparent; ilvImages.Colors.SelectedForeColor = ShareXResources.Theme.TextColor; ilvImages.Colors.UnFocusedForeColor = ShareXResources.Theme.TextColor; }