Manage dialog/Context menu: Rearrange various skin settings on the Ma…

…nage dialog and context menu
whitequill · Mar 15, 2022 · fbde826 · fbde826
1 parent 1353eae
commit fbde826
Show file tree

Hide file tree

Showing 43 changed files with 41 additions and 38 deletions.
diff --git a/Language/Arabic.h b/Language/Arabic.h
diff --git a/Language/Bulgarian.h b/Language/Bulgarian.h
diff --git a/Language/ChineseSimplified.h b/Language/ChineseSimplified.h
diff --git a/Language/ChineseTraditional.h b/Language/ChineseTraditional.h
diff --git a/Language/Croatian.h b/Language/Croatian.h
diff --git a/Language/Czech.h b/Language/Czech.h
diff --git a/Language/Danish.h b/Language/Danish.h
diff --git a/Language/Dutch.h b/Language/Dutch.h
diff --git a/Language/English.h b/Language/English.h
diff --git a/Language/Finnish.h b/Language/Finnish.h
diff --git a/Language/French.h b/Language/French.h
diff --git a/Language/German.h b/Language/German.h
diff --git a/Language/Greek.h b/Language/Greek.h
diff --git a/Language/Hebrew.h b/Language/Hebrew.h
diff --git a/Language/Hungarian.h b/Language/Hungarian.h
diff --git a/Language/Indonesian.h b/Language/Indonesian.h
@@ -48,6 +48,7 @@
 #define STR_XASPERCENTAGE               "X sebagai persentase"
 #define STR_YASPERCENTAGE               "Y sebagai persentase"
 #define STR_TRANSPARENCY                "Transparansi"
+#define STR_ONHOVER                     "Saat kursor berada diatas"
 #define STR_FADEIN                      "Efek muncul"
 #define STR_FADEOUT                     "Efek menghilang"
 #define STR_HIDEONMOUSEOVER             "Sembunyikan saat kursor berada diatas"

diff --git a/Language/Italian.h b/Language/Italian.h
diff --git a/Language/Japanese.h b/Language/Japanese.h
diff --git a/Language/Korean.h b/Language/Korean.h
diff --git a/Language/Latvian.h b/Language/Latvian.h
diff --git a/Language/Lithuanian.h b/Language/Lithuanian.h
diff --git a/Language/Malay.h b/Language/Malay.h
diff --git a/Language/NorwegianBokmal.h b/Language/NorwegianBokmal.h
diff --git a/Language/Polish.h b/Language/Polish.h
diff --git a/Language/PortugueseBrazil.h b/Language/PortugueseBrazil.h
diff --git a/Language/PortuguesePortugal.h b/Language/PortuguesePortugal.h
diff --git a/Language/Resource.rc b/Language/Resource.rc
@@ -111,6 +111,7 @@ STRINGTABLE
     ID_STR_80PERCENT, "80%"
     ID_STR_90PERCENT, "90%"
     ID_STR_100PERCENT, "~100%"
+    ID_STR_ONHOVER, STR_ONHOVER
     ID_STR_FADEIN, STR_FADEIN
     ID_STR_FADEOUT, STR_FADEOUT
     ID_STR_HIDEONMOUSEOVER, STR_HIDEONMOUSEOVER

diff --git a/Language/Romanian.h b/Language/Romanian.h
diff --git a/Language/Russian.h b/Language/Russian.h
diff --git a/Language/SerbianCyrillic.h b/Language/SerbianCyrillic.h
@@ -48,6 +48,7 @@
 #define STR_XASPERCENTAGE               "X као проценат"
 #define STR_YASPERCENTAGE               "Y као проценат"
 #define STR_TRANSPARENCY                "Прозирност"
+#define STR_ONHOVER                     "При прелазу миша"
 #define STR_FADEIN                      "Постепено појављивање"
 #define STR_FADEOUT                     "Постепено нестајање"
 #define STR_HIDEONMOUSEOVER             "Сакриј при преласку миша"

diff --git a/Language/SerbianLatin.h b/Language/SerbianLatin.h
@@ -48,6 +48,7 @@
 #define STR_XASPERCENTAGE               "X kao procenat"
 #define STR_YASPERCENTAGE               "Y kao procenat"
 #define STR_TRANSPARENCY                "Prozirnost"
+#define STR_ONHOVER                     "Pri prelazu miša"
 #define STR_FADEIN                      "Postepeno pojavljivanje"
 #define STR_FADEOUT                     "Postepeno nestajanje"
 #define STR_HIDEONMOUSEOVER             "Sakrij pri prelasku miša"

diff --git a/Language/Slovak.h b/Language/Slovak.h
diff --git a/Language/Slovenian.h b/Language/Slovenian.h
diff --git a/Language/SpanishModern.h b/Language/SpanishModern.h
diff --git a/Language/Swedish.h b/Language/Swedish.h
diff --git a/Language/Thai.h b/Language/Thai.h
diff --git a/Language/Turkish.h b/Language/Turkish.h
diff --git a/Language/Ukrainian.h b/Language/Ukrainian.h
diff --git a/Language/Vietnamese.h b/Language/Vietnamese.h
diff --git a/Library/ContextMenu.cpp b/Library/ContextMenu.cpp
@@ -314,17 +314,18 @@ HMENU ContextMenu::CreateSkinMenu(Skin* skin, int index, HMENU menu)
 				MENU_ITEM(IDM_SKIN_TRANSPARENCY_70, ID_STR_70PERCENT),
 				MENU_ITEM(IDM_SKIN_TRANSPARENCY_80, ID_STR_80PERCENT),
 				MENU_ITEM(IDM_SKIN_TRANSPARENCY_90, ID_STR_90PERCENT),
-				MENU_ITEM(IDM_SKIN_TRANSPARENCY_100, ID_STR_100PERCENT),
-				MENU_SEPARATOR(),
+				MENU_ITEM(IDM_SKIN_TRANSPARENCY_100, ID_STR_100PERCENT)),
+			MENU_SUBMENU(ID_STR_ONHOVER,
+				MENU_ITEM(IDM_SKIN_HIDEONMOUSE_NONE, ID_STR_DONOTHING),
+				MENU_ITEM(IDM_SKIN_HIDEONMOUSE, ID_STR_HIDE),
 				MENU_ITEM(IDM_SKIN_TRANSPARENCY_FADEIN, ID_STR_FADEIN),
 				MENU_ITEM(IDM_SKIN_TRANSPARENCY_FADEOUT, ID_STR_FADEOUT)),
 			MENU_SEPARATOR(),
-			MENU_ITEM(IDM_SKIN_HIDEONMOUSE, ID_STR_HIDEONMOUSEOVER),
+			MENU_ITEM(IDM_SKIN_CLICKTHROUGH, ID_STR_CLICKTHROUGH),
 			MENU_ITEM(IDM_SKIN_DRAGGABLE, ID_STR_DRAGGABLE),
+			MENU_ITEM(IDM_SKIN_KEEPONSCREEN, ID_STR_KEEPONSCREEN),
 			MENU_ITEM(IDM_SKIN_REMEMBERPOSITION, ID_STR_SAVEPOSITION),
 			MENU_ITEM(IDM_SKIN_SNAPTOEDGES, ID_STR_SNAPTOEDGES),
-			MENU_ITEM(IDM_SKIN_CLICKTHROUGH, ID_STR_CLICKTHROUGH),
-			MENU_ITEM(IDM_SKIN_KEEPONSCREEN, ID_STR_KEEPONSCREEN),
 			MENU_ITEM(IDM_SKIN_FAVORITE, ID_STR_FAVORITE)),
 		MENU_SEPARATOR(),
 		MENU_ITEM(IDM_SKIN_MANAGESKIN, ID_STR_MANAGESKIN),
@@ -375,39 +376,19 @@ HMENU ContextMenu::CreateSkinMenu(Skin* skin, int index, HMENU menu)
 				checkPos = max(0, checkPos);
 				CheckMenuRadioItem(alphaMenu, checkPos, checkPos, checkPos, MF_BYPOSITION);
 			}
-
-			switch (skin->GetWindowHide())
-			{
-			case HIDEMODE_FADEIN:
-				CheckMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEIN, MF_BYCOMMAND | MF_CHECKED);
-				EnableMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEOUT, MF_BYCOMMAND | MF_GRAYED);
-				break;
-
-			case HIDEMODE_FADEOUT:
-				CheckMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEOUT, MF_BYCOMMAND | MF_CHECKED);
-				EnableMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEIN, MF_BYCOMMAND | MF_GRAYED);
-				break;
-
-			case HIDEMODE_HIDE:
-				EnableMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEIN, MF_BYCOMMAND | MF_GRAYED);
-				EnableMenuItem(alphaMenu, IDM_SKIN_TRANSPARENCY_FADEOUT, MF_BYCOMMAND | MF_GRAYED);
-				break;
-			}
 		}
 
-		// Tick the settings
-		switch (skin->GetWindowHide())
+		// Tick the mouse over options (On hover)
+		HMENU hoverMenu = GetSubMenu(settingsMenu, 2);
+		if (hoverMenu)
 		{
-		case HIDEMODE_HIDE:
-			CheckMenuItem(settingsMenu, IDM_SKIN_HIDEONMOUSE, MF_BYCOMMAND | MF_CHECKED);
-			break;
-
-		case HIDEMODE_FADEIN:
-		case HIDEMODE_FADEOUT:
-			EnableMenuItem(settingsMenu, IDM_SKIN_HIDEONMOUSE, MF_BYCOMMAND | MF_GRAYED);
-			break;
+			int mode = skin->GetWindowHide();
+			mode = min(3, mode);
+			mode = max(0, mode);
+			CheckMenuRadioItem(hoverMenu, mode, mode, mode, MF_BYPOSITION);
 		}
 
+		// Tick the settings
 		if (skin->GetSnapEdges())
 		{
 			CheckMenuItem(settingsMenu, IDM_SKIN_SNAPTOEDGES, MF_BYCOMMAND | MF_CHECKED);

diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp
@@ -539,10 +539,10 @@ void DialogManage::TabSkins::Create(HWND owner)
 		CT_BUTTON(Id_DisplayMonitorButton, ID_STR_DISPLAYMONITOR,
 			359, 165, 119, 14,
 			WS_VISIBLE | WS_TABSTOP | WS_DISABLED, 0),
-		CT_CHECKBOX(Id_DraggableCheckBox, ID_STR_DRAGGABLE,
+		CT_CHECKBOX(Id_ClickThroughCheckBox, ID_STR_CLICKTHROUGH,
 			360, 185, 118, 9,
 			WS_VISIBLE | WS_TABSTOP | WS_DISABLED, 0),
-		CT_CHECKBOX(Id_ClickThroughCheckBox, ID_STR_CLICKTHROUGH,
+		CT_CHECKBOX(Id_DraggableCheckBox, ID_STR_DRAGGABLE,
 			360, 198, 118, 9,
 			WS_VISIBLE | WS_TABSTOP | WS_DISABLED, 0),
 		CT_CHECKBOX(Id_KeepOnScreenCheckBox, ID_STR_KEEPONSCREEN,

diff --git a/Library/Skin.cpp b/Library/Skin.cpp
@@ -3869,16 +3869,32 @@ LRESULT Skin::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 
+	case IDM_SKIN_HIDEONMOUSE_NONE:
+		if (m_WindowHide != HIDEMODE_NONE)
+		{
+			SetWindowHide(HIDEMODE_NONE);
+		}
+		break;
+
 	case IDM_SKIN_HIDEONMOUSE:
-		SetWindowHide((m_WindowHide == HIDEMODE_NONE) ? HIDEMODE_HIDE : HIDEMODE_NONE);
+		if (m_WindowHide != HIDEMODE_HIDE)
+		{
+			SetWindowHide(HIDEMODE_HIDE);
+		}
 		break;
 
 	case IDM_SKIN_TRANSPARENCY_FADEIN:
-		SetWindowHide((m_WindowHide == HIDEMODE_NONE) ? HIDEMODE_FADEIN : HIDEMODE_NONE);
+		if (m_WindowHide != HIDEMODE_FADEIN)
+		{
+			SetWindowHide(HIDEMODE_FADEIN);
+		}
 		break;
 
 	case IDM_SKIN_TRANSPARENCY_FADEOUT:
-		SetWindowHide((m_WindowHide == HIDEMODE_NONE) ? HIDEMODE_FADEOUT : HIDEMODE_NONE);
+		if (m_WindowHide != HIDEMODE_FADEOUT)
+		{
+			SetWindowHide(HIDEMODE_FADEOUT);
+		}
 		break;
 
 	case IDM_SKIN_REMEMBERPOSITION:

diff --git a/Library/resource.h b/Library/resource.h
@@ -244,6 +244,7 @@
 #define ID_STR_AUTOMATICUPDATE                       2160
 #define ID_STR_INSTALL_NEW_VERSION                   2161
 #define ID_STR_CLICK_TO_INSTALL                      2162
+#define ID_STR_ONHOVER                               2163
 
 #define ID_STR_GAMEMODE                              2800
 #define ID_STR_GAMEMODE_START                        2801
@@ -360,6 +361,7 @@
 #define IDM_GAMEMODE_FULLSCREEN                      4078
 #define IDM_GAMEMODE_PROCESSLIST                     4079
 #define IDM_INSTALL_NEW_VERSION                      4080
+#define IDM_SKIN_HIDEONMOUSE_NONE                    4081
 
 #define IDM_SKIN_CUSTOMCONTEXTMENU_FIRST             9000
 #define IDM_SKIN_CUSTOMCONTEXTMENU_LAST              9024