From 4a47181553ce451e9be163b13e964ff42e654bf0 Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Thu, 25 Jun 2020 12:24:06 +0200 Subject: [PATCH] Code Analyze and Refactor 0.12 (#109), version 0.11.1.4 --- Business/Menus.cs | 12 ++++++------ Business/WaitToLoadMenu.cs | 1 + Config/MenuDefines.cs | 2 -- Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Business/Menus.cs b/Business/Menus.cs index 2e93da3..e12d579 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -563,20 +563,20 @@ namespace SystemTrayMenu.Business } else if (rowData.IsMenuOpen && rowData.IsSelected) { - row.DefaultCellStyle.SelectionBackColor = - MenuDefines.ColorSelectedAndOpen; + row.Cells[0].Style.SelectionBackColor = MenuDefines.ColorOpenFolder; + row.Cells[1].Style.SelectionBackColor = MenuDefines.ColorSelectedItem; row.Selected = true; } else if (rowData.IsMenuOpen) { - row.DefaultCellStyle.SelectionBackColor = - MenuDefines.ColorOpenFolder; + row.Cells[0].Style.SelectionBackColor = MenuDefines.ColorOpenFolder; + row.Cells[1].Style.SelectionBackColor = MenuDefines.ColorOpenFolder; row.Selected = true; } else if (rowData.IsSelected) { - row.DefaultCellStyle.SelectionBackColor = - MenuDefines.ColorSelectedItem; + row.Cells[0].Style.SelectionBackColor = MenuDefines.ColorSelectedItem; + row.Cells[1].Style.SelectionBackColor = MenuDefines.ColorSelectedItem; row.Selected = true; } else diff --git a/Business/WaitToLoadMenu.cs b/Business/WaitToLoadMenu.cs index f508a55..692daae 100644 --- a/Business/WaitToLoadMenu.cs +++ b/Business/WaitToLoadMenu.cs @@ -159,6 +159,7 @@ namespace SystemTrayMenu.Handler this.rowIndex = rowIndex; RowData rowData = (RowData)dgv.Rows[rowIndex].Cells[2].Value; rowData.IsSelected = true; + dgv.Rows[rowIndex].Selected = false; dgv.Rows[rowIndex].Selected = true; } diff --git a/Config/MenuDefines.cs b/Config/MenuDefines.cs index 45f20a5..4734c03 100644 --- a/Config/MenuDefines.cs +++ b/Config/MenuDefines.cs @@ -10,7 +10,6 @@ namespace SystemTrayMenu internal static readonly Color Folder = Color.White; internal static readonly Color ColorSelectedItem = AppColors.Blue; internal static readonly Color ColorOpenFolder = AppColors.Green; - internal static readonly Color ColorSelectedAndOpen = AppColors.Turquoise; internal static readonly Color ColorTitleWarning = AppColors.Red; internal static readonly Color ColorTitleSelected = AppColors.Yellow; internal static readonly Color ColorTitleBackground = AppColors.Azure; @@ -26,7 +25,6 @@ namespace SystemTrayMenu { internal static readonly Color Blue = Color.FromArgb(204, 232, 255); internal static readonly Color Green = Color.FromArgb(194, 245, 222); - internal static readonly Color Turquoise = Color.FromArgb(199, 239, 239); internal static readonly Color Red = Color.FromArgb(255, 204, 232); internal static readonly Color Yellow = Color.LightYellow; internal static readonly Color Azure = Color.Azure; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 4e8807b..1a76971 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.11.1.3")] -[assembly: AssemblyFileVersion("0.11.1.3")] +[assembly: AssemblyVersion("0.11.1.4")] +[assembly: AssemblyFileVersion("0.11.1.4")]