github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 13:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG-2102: Fixing an issue when a second ColorDialog is opened.

Browse source
This commit is contained in:
Robin 2017-01-25 17:33:21 +01:00
commit 98415aaa81
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Greenshot/Controls/ColorButton.cs
View file

@ -68,8 +68,10 @@ namespace Greenshot.Controls {
} }
private void ColorButtonClick(object sender, EventArgs e) { private void ColorButtonClick(object sender, EventArgs e) {
ColorDialog colorDialog = ColorDialog.GetInstance(); var colorDialog = new ColorDialog
colorDialog.Color = SelectedColor; {
Color = SelectedColor
};
// Using the parent to make sure the dialog doesn't show on another window // Using the parent to make sure the dialog doesn't show on another window
colorDialog.ShowDialog(Parent.Parent); colorDialog.ShowDialog(Parent.Parent);
if (colorDialog.DialogResult == DialogResult.Cancel) if (colorDialog.DialogResult == DialogResult.Cancel)

6
Greenshot/Controls/ToolStripColorButton.cs
View file

@ -66,8 +66,10 @@ namespace Greenshot.Controls {
} }
private void ColorButtonClick(object sender, EventArgs e) { private void ColorButtonClick(object sender, EventArgs e) {
ColorDialog colorDialog = ColorDialog.GetInstance(); var colorDialog = new ColorDialog
colorDialog.Color = SelectedColor; {
Color = SelectedColor
};
// Using the parent to make sure the dialog doesn't show on another window // Using the parent to make sure the dialog doesn't show on another window
colorDialog.ShowDialog(Parent.Parent); colorDialog.ShowDialog(Parent.Parent);
if (colorDialog.DialogResult == DialogResult.Cancel) if (colorDialog.DialogResult == DialogResult.Cancel)

8
Greenshot/Forms/ColorDialog.cs
View file

@ -34,10 +34,9 @@ namespace Greenshot {
/// Description of ColorDialog. /// Description of ColorDialog.
/// </summary> /// </summary>
public partial class ColorDialog : BaseForm { public partial class ColorDialog : BaseForm {
private static ColorDialog _uniqueInstance;
private static readonly EditorConfiguration EditorConfig = IniConfig.GetIniSection<EditorConfiguration>(); private static readonly EditorConfiguration EditorConfig = IniConfig.GetIniSection<EditorConfiguration>();
private ColorDialog() { public ColorDialog() {
SuspendLayout(); SuspendLayout();
InitializeComponent(); InitializeComponent();
SuspendLayout(); SuspendLayout();
@ -47,11 +46,6 @@ namespace Greenshot {
UpdateRecentColorsButtonRow(); UpdateRecentColorsButtonRow();
} }
public static ColorDialog GetInstance()
{
return _uniqueInstance ?? (_uniqueInstance = new ColorDialog());
}
private readonly List<Button> _colorButtons = new List<Button>(); private readonly List<Button> _colorButtons = new List<Button>();
private readonly List<Button> _recentColorButtons = new List<Button>(); private readonly List<Button> _recentColorButtons = new List<Button>();
private readonly ToolTip _toolTip = new ToolTip(); private readonly ToolTip _toolTip = new ToolTip();