From 4aacfec76a9eaf6613e6993f54eb9f9b508264ae Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 25 May 2019 16:11:52 +0300 Subject: [PATCH] Use Invalidate as possible instead of Refresh --- ShareX.HelpersLib/Colors/ColorUserControl.cs | 4 ++-- .../Controls/BlackStyle/BlackStyleButton.cs | 9 ++++++--- .../Controls/BlackStyle/BlackStyleCheckBox.cs | 10 ++++++---- .../Controls/BlackStyle/BlackStyleLabel.cs | 3 ++- ShareX.HelpersLib/Controls/ColorButton.cs | 4 +++- ShareX.HelpersLib/Controls/LabelNoCopy.cs | 4 +++- ShareX/Controls/TaskPanel.cs | 2 +- ShareX/Forms/MainForm.cs | 5 ++--- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ShareX.HelpersLib/Colors/ColorUserControl.cs b/ShareX.HelpersLib/Colors/ColorUserControl.cs index 7a72d53d7..266c0ac31 100644 --- a/ShareX.HelpersLib/Colors/ColorUserControl.cs +++ b/ShareX.HelpersLib/Colors/ColorUserControl.cs @@ -57,7 +57,7 @@ public MyColor SelectedColor SetSliderMarker(); } - Refresh(); + Invalidate(); } } @@ -80,7 +80,7 @@ public DrawStyle DrawStyle SetSliderMarker(); } - Refresh(); + Invalidate(); } } diff --git a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs index caf4dffd3..93bdeb616 100644 --- a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs +++ b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleButton.cs @@ -53,7 +53,7 @@ public override string Text { text = value; - Refresh(); + Invalidate(); } } } @@ -97,20 +97,23 @@ protected override void OnPaint(PaintEventArgs pe) protected override void OnMouseEnter(EventArgs e) { base.OnMouseEnter(e); + isHover = true; - Refresh(); + Invalidate(); } protected override void OnMouseLeave(EventArgs e) { base.OnMouseLeave(e); + isHover = false; - Refresh(); + Invalidate(); } protected override void OnResize(EventArgs e) { base.OnResize(e); + Prepare(); } diff --git a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs index 7e53f66ec..2b75dd9a3 100644 --- a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs +++ b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleCheckBox.cs @@ -49,7 +49,7 @@ public bool Checked OnCheckedChanged(EventArgs.Empty); - Refresh(); + Invalidate(); } } } @@ -71,7 +71,7 @@ public override string Text { text = value; - Refresh(); + Invalidate(); } } } @@ -134,15 +134,17 @@ protected override void OnPaint(PaintEventArgs pe) protected override void OnMouseEnter(EventArgs e) { base.OnMouseEnter(e); + isHover = true; - Refresh(); + Invalidate(); } protected override void OnMouseLeave(EventArgs e) { base.OnMouseLeave(e); + isHover = false; - Refresh(); + Invalidate(); } protected override void OnClick(EventArgs e) diff --git a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs index d4b12c86b..a066ac736 100644 --- a/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs +++ b/ShareX.HelpersLib/Controls/BlackStyle/BlackStyleLabel.cs @@ -54,8 +54,9 @@ public override string Text { text = value; - Invalidate(); OnTextChanged(EventArgs.Empty); + + Invalidate(); } } } diff --git a/ShareX.HelpersLib/Controls/ColorButton.cs b/ShareX.HelpersLib/Controls/ColorButton.cs index 1a25231b6..41e2d6867 100644 --- a/ShareX.HelpersLib/Controls/ColorButton.cs +++ b/ShareX.HelpersLib/Controls/ColorButton.cs @@ -47,8 +47,10 @@ public Color Color set { color = value; - Refresh(); + OnColorChanged(color); + + Invalidate(); } } diff --git a/ShareX.HelpersLib/Controls/LabelNoCopy.cs b/ShareX.HelpersLib/Controls/LabelNoCopy.cs index 6cec690e2..9bf080aa8 100644 --- a/ShareX.HelpersLib/Controls/LabelNoCopy.cs +++ b/ShareX.HelpersLib/Controls/LabelNoCopy.cs @@ -48,8 +48,10 @@ public override string Text if (text != value) { text = value; - Refresh(); + OnTextChanged(EventArgs.Empty); + + Invalidate(); } } } diff --git a/ShareX/Controls/TaskPanel.cs b/ShareX/Controls/TaskPanel.cs index e06e9495e..9513c7f9c 100644 --- a/ShareX/Controls/TaskPanel.cs +++ b/ShareX/Controls/TaskPanel.cs @@ -274,7 +274,7 @@ private void PbThumbnail_MouseClick(object sender, MouseEventArgs e) pbThumbnail.Enabled = true; } } - else if (Helpers.IsTextFile(filePath) || Helpers.IsVideoFile(filePath) || MessageBox.Show("Would you like to run this file?" + "\r\n\r\n" + filePath, + else if (Helpers.IsTextFile(filePath) || Helpers.IsVideoFile(filePath) || MessageBox.Show("Would you like to open this file?" + "\r\n\r\n" + filePath, Resources.ShareXConfirmation, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { Helpers.OpenFile(filePath); diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 8ae5c851a..9f9173f65 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -56,6 +56,7 @@ private void MainForm_HandleCreated(object sender, EventArgs e) { RunPuushTasks(); + NativeMethods.UseImmersiveDarkMode(Handle, ShareXResources.UseDarkTheme); UpdateControls(); DebugHelper.WriteLine("Startup time: {0} ms", Program.StartTimer.ElapsedMilliseconds); @@ -66,8 +67,6 @@ private void MainForm_HandleCreated(object sender, EventArgs e) { TaskHelpers.OpenActionsToolbar(); } - - NativeMethods.UseImmersiveDarkMode(Handle, ShareXResources.UseDarkTheme); } private void InitializeControls() @@ -734,10 +733,10 @@ private void UpdateContextMenu(WorkerTask task = null) } tsmiClearList.Visible = tssUploadInfo1.Visible = lvUploads.Items.Count > 0; - tsmiHideColumns.Visible = tsmiImagePreview.Visible = Program.Settings.TaskViewMode == TaskViewMode.ListView; cmsTaskInfo.ResumeLayout(); + Refresh(); }