sleeker UI arrows and finally refactored the tray state logic

Author: ArKT-7

QuickRotate.cpp

@@ -154,7 +154,13 @@ bool bCloseToTray = true;
 bool bAutoStart = false;
 bool bSettingsMode = false;
 bool bUpdateMode = false;
-int bTrayToggleLP = 1;
+enum TrayMode { TRAY_CYCLE = 0, TRAY_LANDPORT = 1, TRAY_FLIPLANDPORT = 2 };
+int bTrayToggleLP = TRAY_LANDPORT;
+constexpr const wchar_t* TRAY_MODE_TEXTS[] = {
+    L"Tray Click: Cycle Rotation (Next \u27F3)",
+    L"Tray Click: Landscape \u2039-\u203A Portrait",
+    L"Tray Click: (F) Landscape \u2039-\u203A Portrait"
+};
 wchar_t g_appDir[MAX_PATH];
 wchar_t g_exePath[MAX_PATH];
 wchar_t g_startMenuPath[MAX_PATH];
@@ -1178,14 +1184,10 @@ LRESULT CALLBACK WndProc(HWND h, UINT m, WPARAM w, LPARAM l) {
 
 #ifndef LITE
         int halfW = (BTN_W - 10) / 2;
-        hSetControls[0] = CreateMyButton(h, L"\u2B05 Back", ID_BTN_BACK, BTN_X, SETTINGS_Y, halfW, BTN_SH, BS_PUSHBUTTON | WS_TABSTOP);
+        hSetControls[0] = CreateMyButton(h, L"\u276E  Back", ID_BTN_BACK, BTN_X, SETTINGS_Y, halfW, BTN_SH, BS_PUSHBUTTON | WS_TABSTOP);
         hSetControls[11] = CreateMyButton(h, L"Check Update", ID_BTN_UPDATE, BTN_X + halfW + 10, SETTINGS_Y, halfW, BTN_SH, WS_TABSTOP);
         struct TogData { int idx; LPCWSTR txt; int id; int y; };
-        LPCWSTR trayText;
-        if (bTrayToggleLP == 1) trayText = L"Tray Click: Landscape \u2194 Portrait";
-        else if (bTrayToggleLP == 2) trayText = L"Tray Click: (F) Landscape \u2194 Portrait";
-        else trayText = L"Tray Click: Cycle Rotation (Next \u27F3)";
-        
+        LPCWSTR trayText = TRAY_MODE_TEXTS[bTrayToggleLP % 3];
         const wchar_t* themeText;
         if (bThemeMode == 0) themeText = L"Theme: System Default";
         else if (bThemeMode == 1) themeText = L"Theme: Light Mode";
@@ -1516,14 +1518,9 @@ LRESULT CALLBACK WndProc(HWND h, UINT m, WPARAM w, LPARAM l) {
             ForceRedraw((HWND)l);
         }
         else if (id == ID_CHK_TRAYMODE) {
-            if (bTrayToggleLP == 1) bTrayToggleLP = 2;
-            else if (bTrayToggleLP == 2) bTrayToggleLP = 0;
-            else bTrayToggleLP = 1;
-            const wchar_t* modeText;
-            if (bTrayToggleLP == 1) modeText = L"Tray Click: Landscape \u2194 Portrait";
-            else if (bTrayToggleLP == 2) modeText = L"Tray Click: (F) Landscape \u2194 Portrait";
-            else modeText = L"Tray Click: Cycle Rotation (Next \u27F3)";
-            SetWindowTextW(hSetControls[8], modeText);
+            bTrayToggleLP = (bTrayToggleLP == TRAY_LANDPORT) ? TRAY_FLIPLANDPORT : 
+                            (bTrayToggleLP == TRAY_FLIPLANDPORT) ? TRAY_CYCLE : TRAY_LANDPORT;
+            SetWindowTextW(hSetControls[8], TRAY_MODE_TEXTS[bTrayToggleLP % 3]);
             SaveSettings();
             ForceRedraw((HWND)l);
         }