- Fixed #63 Group header in options page of syntax highlight was hard…

… to read
wmjordan · Dec 15, 2018 · 1fd9224 · 1fd9224
1 parent 6d06d79
commit 1fd9224
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 44 deletions.
diff --git a/Codist/Options/SyntaxListView.cs b/Codist/Options/SyntaxListView.cs
@@ -18,8 +18,8 @@ protected override void WndProc(ref Message m) {
 			if (m.Msg == 0x0F) {
 				BackColor = ThemeHelper.DocumentPageColor;
 				ForeColor = ThemeHelper.DocumentTextColor;
-				foreach (SyntaxListViewItem item in Items) {
-					item.ApplyTheme();
+				foreach (var item in Items) {
+					(item as SyntaxListViewItem)?.ApplyTheme();
 				}
 			}
 			base.WndProc(ref m);

diff --git a/Codist/Options/SyntaxStyleOptionPage.Designer.cs b/Codist/Options/SyntaxStyleOptionPage.Designer.cs
diff --git a/Codist/Options/SyntaxStyleOptionPage.cs b/Codist/Options/SyntaxStyleOptionPage.cs
@@ -34,6 +34,7 @@ internal SyntaxStyleOptionPage(ConfigPage service, Func<IEnumerable<StyleBase>>
 
 		protected override void OnLoad(EventArgs e) {
 			base.OnLoad(e);
+			_StyleSettingsBox.Enabled = _SyntaxListBox.SelectedIndices.Count > 0 && _SyntaxListBox.SelectedItems[0] is SyntaxListViewItem;
 			if (_loaded) {
 				return;
 			}
@@ -146,8 +147,11 @@ void _SyntaxListBox_ItemSelectionChanged(object sender, ListViewItemSelectionCha
 			}
 			var i = (e.Item as SyntaxListViewItem)?.Style;
 			if (i == null) {
+				e.Item.Selected = false;
+				_StyleSettingsBox.Enabled = false;
 				return;
 			}
+			_StyleSettingsBox.Enabled = true;
 			_uiLock = true;
 			_activeStyle = i;
 			UpdateUIControls(i);
@@ -189,24 +193,30 @@ static ListViewItem GetListItemForStyle(string category, ListViewItem vi) {
 		void LoadStyleList() {
 			_uiLock = true;
 			_SyntaxListBox.Items.Clear();
-			_SyntaxListBox.Groups.Clear();
-			var groups = new List<ListViewGroup>(5);
+			//_SyntaxListBox.Groups.Clear();
+			//var groups = new List<ListViewGroup>(5);
 			var defaultStyles = _defaultStyleLoader();
 			var styles = _styleLoader();
-			foreach (var item in defaultStyles) {
-				if (groups.FirstOrDefault(i => i.Header == item.Category) != null) {
-					continue;
-				}
-				groups.Add(new ListViewGroup(item.Category, HorizontalAlignment.Center));
-			}
-			_SyntaxListBox.Groups.AddRange(groups.ToArray());
+			//foreach (var item in defaultStyles) {
+			//	if (groups.FirstOrDefault(i => i.Header == item.Category) != null) {
+			//		continue;
+			//	}
+			//	groups.Add(new ListViewGroup(item.Category, HorizontalAlignment.Center));
+			//}
+			//_SyntaxListBox.Groups.AddRange(groups.ToArray());
+			string category = null;
 			foreach (var item in defaultStyles) {
 				if (item.Category.Length == 0) {
 					continue;
 				}
 				var style = styles.FirstOrDefault(i => i.Id == item.Id) ?? item;
+				if (item.Category != category) {
+					_SyntaxListBox.Items.Add(new ListViewItem("   - " + (category = item.Category) + " -") {
+						Font = new Font(_SyntaxListBox.Font, FontStyle.Bold)
+					});
+				}
 				_SyntaxListBox.Items.Add(new SyntaxListViewItem(item.ToString(), style) {
-					Group = groups.FirstOrDefault(i => i.Header == item.Category),
+					//Group = groups.FirstOrDefault(i => i.Header == item.Category),
 					Font = new Font(_SyntaxListBox.Font, style.GetFontStyle())
 				});
 			}