Skip to content

Commit 23e4467

Browse files
committed
Bugfix
ColoredPassword and KeeTheme both draw the entry list by itself (OwnerDraw = true) If this part ColoredPassword is deactivated, OwnerDraw will now be set properly based on whether KeeTheme is / was active
1 parent fbedde1 commit 23e4467

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/ColoredPassword.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,21 @@ private void MainWindow_FormLoadPost(object sender, EventArgs e)
133133
ColorPasswords(ColorConfig.Active);
134134
}
135135

136+
private bool m_bKeeThemeWasActiveAtLeastOnce = false;
136137
private void OnKeeThemeClick(object sender, EventArgs e)
137138
{
138139
var m = sender as ToolStripMenuItem;
139140
m.Click -= OnKeeThemeClick;
140141
if (m.Checked && m_lvEntries != null) m_lvEntries.OwnerDraw = false;
141142
m.AddEventHandlers("Click", m.Tag as List<Delegate>);
142-
m.PerformClick();
143+
//PerformClick will toggle the Checked attribute, don't do that...
144+
//m.PerformClick();
145+
foreach (Delegate d in m.Tag as List<Delegate>)
146+
{
147+
d.DynamicInvoke(sender, e);
148+
}
143149
ColorPasswords(ColorConfig.Active);
150+
m_bKeeThemeWasActiveAtLeastOnce = true;
144151
}
145152

146153

@@ -564,7 +571,7 @@ private void ColorPasswords(bool active, bool bInit = false)
564571
else
565572
{
566573
//We removed our eventhandlers, restore other ones
567-
m_lvEntries.OwnerDraw = RestoreOtherEventHandlers() > 0 || KeeThemeStub.Installed;
574+
m_lvEntries.OwnerDraw = RestoreOtherEventHandlers() > 0 || m_bKeeThemeWasActiveAtLeastOnce || KeeThemeStub.Enabled;
568575
}
569576
}
570577

src/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
3333
// indem Sie "*" wie unten gezeigt eingeben:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1")]
36-
[assembly: AssemblyFileVersion("1.1")]
35+
[assembly: AssemblyVersion("1.1.1")]
36+
[assembly: AssemblyFileVersion("1.1.1")]

version.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:
2-
ColoredPassword:1.1
2+
ColoredPassword:1.1.1
33
ColoredPassword!de:11
44
ColoredPassword!pl:2
55
ColoredPassword!pt:5

0 commit comments

Comments
 (0)