fix(reset): fixed reset option not having effect

Author: vladelaina

include/config/config_applier.h

@@ -12,6 +12,20 @@
 #include <windows.h>
 #include "config_loader.h"
 
+/* ============================================================================
+ * Global flags
+ * ============================================================================ */
+
+/**
+ * @brief Force apply all config values, bypassing position preservation logic
+ * 
+ * When TRUE, ApplyDisplaySettings will apply window position from config
+ * even if current window position differs significantly.
+ * Used during reset operations to ensure defaults are applied.
+ * Automatically reset to FALSE after ApplyConfigSnapshot completes.
+ */
+extern BOOL g_ForceApplyConfig;
+
 /* ============================================================================
  * Public API
  * ============================================================================ */

src/config/config_applier.c

@@ -22,6 +22,9 @@
 /* Global text effect */
 extern TextEffectType CLOCK_TEXT_EFFECT;
 
+/* Force apply flag - used during reset to bypass position preservation */
+BOOL g_ForceApplyConfig = FALSE;
+
 /* ============================================================================
  * Helper: Language enum mapping
  * ============================================================================ */
@@ -112,24 +115,33 @@ void ApplyDisplaySettings(const ConfigSnapshot* snapshot) {
 
     HWND hwnd = FindWindowW(L"CatimeWindowClass", L"Catime");
     if (hwnd) {
-        /* Get current window position before updating globals */
-        RECT currentRect;
-        GetWindowRect(hwnd, &currentRect);
-        
-        /* Compare current position with config snapshot */
-        int deltaX = abs(currentRect.left - snapshot->windowPosX);
-        int deltaY = abs(currentRect.top - snapshot->windowPosY);
-        
-        if (deltaX > 10 || deltaY > 10) {
-            /* Significant difference: preserve current position (likely just saved) */
-            CLOCK_WINDOW_POS_X = currentRect.left;
-            CLOCK_WINDOW_POS_Y = currentRect.top;
-        } else {
-            /* Minor difference: apply config position */
-            CLOCK_WINDOW_POS_X = snapshot->windowPosX;
+        /* Force apply mode: always use config values (used during reset) */
+        if (g_ForceApplyConfig) {
             CLOCK_WINDOW_POS_Y = snapshot->windowPosY;
-            SetWindowPos(hwnd, NULL, CLOCK_WINDOW_POS_X, CLOCK_WINDOW_POS_Y,
-                        0, 0, SWP_NOSIZE | SWP_NOZORDER);
+            
+            /* For special position values (-2, -1), don't set position here.
+             * RecalculateWindowSize will handle it with correct window dimensions. */
+            if (snapshot->windowPosX != -2 && snapshot->windowPosX != -1) {
+                CLOCK_WINDOW_POS_X = snapshot->windowPosX;
+                SetWindowPos(hwnd, NULL, CLOCK_WINDOW_POS_X, CLOCK_WINDOW_POS_Y,
+                            0, 0, SWP_NOSIZE | SWP_NOZORDER);
+            }
+        } else {
+            /* Normal mode: preserve position if significantly different */
+            RECT currentRect;
+            GetWindowRect(hwnd, &currentRect);
+            int deltaX = abs(currentRect.left - snapshot->windowPosX);
+            int deltaY = abs(currentRect.top - snapshot->windowPosY);
+            
+            if (deltaX > 10 || deltaY > 10) {
+                CLOCK_WINDOW_POS_X = currentRect.left;
+                CLOCK_WINDOW_POS_Y = currentRect.top;
+            } else {
+                CLOCK_WINDOW_POS_X = snapshot->windowPosX;
+                CLOCK_WINDOW_POS_Y = snapshot->windowPosY;
+                SetWindowPos(hwnd, NULL, CLOCK_WINDOW_POS_X, CLOCK_WINDOW_POS_Y,
+                            0, 0, SWP_NOSIZE | SWP_NOZORDER);
+            }
         }
 
         BYTE alphaValue = (BYTE)((CLOCK_WINDOW_OPACITY * 255) / 100);

src/config/config_defaults.c

@@ -58,7 +58,7 @@ static const ConfigItemMeta CONFIG_METADATA[] = {
     {INI_SECTION_DISPLAY, "OPACITY_STEP_FAST", "5", CONFIG_TYPE_INT, CFG_OFFSET(opacityStepFast), CFG_NO_SIZE, "Opacity Ctrl+scroll step (1-100)"},
     {INI_SECTION_DISPLAY, "SCALE_STEP_NORMAL", "10", CONFIG_TYPE_INT, CFG_OFFSET(scaleStepNormal), CFG_NO_SIZE, "Scale scroll step (1-100)"},
     {INI_SECTION_DISPLAY, "SCALE_STEP_FAST", "15", CONFIG_TYPE_INT, CFG_OFFSET(scaleStepFast), CFG_NO_SIZE, "Scale Ctrl+scroll step (1-100)"},
-    {INI_SECTION_DISPLAY, "TEXT_EFFECT", "HOLOGRAPHIC", CONFIG_TYPE_ENUM, CFG_OFFSET(textEffect), CFG_NO_SIZE, "Text effect style (NONE/GLOW/GLASS/NEON/HOLOGRAPHIC/LIQUID)"},
+    {INI_SECTION_DISPLAY, "TEXT_EFFECT", "NONE", CONFIG_TYPE_ENUM, CFG_OFFSET(textEffect), CFG_NO_SIZE, "Text effect style (NONE/GLOW/GLASS/NEON/HOLOGRAPHIC/LIQUID)"},
 
     /* Timer settings */
     {INI_SECTION_TIMER, "CLOCK_DEFAULT_START_TIME", "1500", CONFIG_TYPE_INT, CFG_OFFSET(defaultStartTime), CFG_NO_SIZE, "Default timer duration (seconds)"},

src/config/config_recovery.c

@@ -132,9 +132,9 @@ BOOL ValidateTimerConfig(ConfigSnapshot* snapshot) {
             strcmp(snapshot->startupMode, "SHOW_TIME") != 0 &&
             strcmp(snapshot->startupMode, "NO_DISPLAY") != 0 &&
             strcmp(snapshot->startupMode, "POMODORO") != 0) {
-            LOG_WARNING("Invalid startup mode '%s', resetting to COUNTDOWN",
+            LOG_WARNING("Invalid startup mode '%s', resetting to SHOW_TIME",
                        snapshot->startupMode);
-            strncpy(snapshot->startupMode, "COUNTDOWN",
+            strncpy(snapshot->startupMode, "SHOW_TIME",
                     sizeof(snapshot->startupMode) - 1);
             snapshot->startupMode[sizeof(snapshot->startupMode) - 1] = '\0';
             modified = TRUE;

src/main/main_initialization.c

@@ -312,7 +312,7 @@ static StartupMode ParseStartupMode(const char* modeStr) {
     return STARTUP_MODE_DEFAULT;
 }
 
-static void HandleStartupMode(HWND hwnd) {
+void HandleStartupMode(HWND hwnd) {
     StartupMode mode = ParseStartupMode(CLOCK_STARTUP_MODE);
 
     LOG_INFO("Setting startup mode: %s", CLOCK_STARTUP_MODE);

src/timer/timer.c

@@ -28,7 +28,7 @@ BOOL CLOCK_SHOW_CURRENT_TIME = FALSE;
 BOOL CLOCK_USE_24HOUR = TRUE;
 BOOL CLOCK_SHOW_SECONDS = TRUE;
 BOOL CLOCK_COUNT_UP = FALSE;
-char CLOCK_STARTUP_MODE[20] = "COUNTDOWN";
+char CLOCK_STARTUP_MODE[20] = "SHOW_TIME";
 
 int CLOCK_TOTAL_TIME = 0;
 int countdown_elapsed_time = 0;

src/tray/tray_menu_submenus.c

@@ -164,8 +164,8 @@ void BuildPresetManagementSubmenu(HMENU hMenu) {
     char configPath[MAX_PATH];
     GetConfigPath(configPath, MAX_PATH);
 
-    char currentStartupMode[20] = "COUNTDOWN";
-    ReadIniString(INI_SECTION_TIMER, "STARTUP_MODE", "COUNTDOWN",
+    char currentStartupMode[20] = "SHOW_TIME";
+    ReadIniString(INI_SECTION_TIMER, "STARTUP_MODE", "SHOW_TIME",
                   currentStartupMode, sizeof(currentStartupMode), configPath);
 
     AppendMenuW(hStartupSettingsMenu, MF_STRING | 

src/window/window_core.c

@@ -136,16 +136,24 @@ HWND CreateMainWindow(HINSTANCE hInstance, int nCmdShow) {
     int initialWidth = (int)(CLOCK_BASE_WINDOW_WIDTH * CLOCK_WINDOW_SCALE);
     int initialHeight = (int)(CLOCK_BASE_WINDOW_HEIGHT * CLOCK_WINDOW_SCALE);
 
-    /* Auto-position logic */
-    if (CLOCK_WINDOW_POS_X == -2) {
-        int screenWidth = GetSystemMetrics(SM_CXSCREEN);
-        CLOCK_WINDOW_POS_X = (int)(screenWidth * 0.618f) - (initialWidth / 2);
-        if (CLOCK_WINDOW_POS_X + initialWidth > screenWidth) {
-            CLOCK_WINDOW_POS_X = screenWidth - initialWidth - 20;
+    /* Auto-position logic - use primary monitor dimensions */
+    if (CLOCK_WINDOW_POS_X == -2 || CLOCK_WINDOW_POS_X == -1) {
+        POINT pt = {0, 0};
+        HMONITOR hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY);
+        MONITORINFO mi = {sizeof(mi)};
+        GetMonitorInfo(hMon, &mi);
+        int screenWidth = mi.rcMonitor.right - mi.rcMonitor.left;
+        
+        if (CLOCK_WINDOW_POS_X == -2) {
+            /* Golden ratio: 0.618 from left of primary monitor */
+            CLOCK_WINDOW_POS_X = mi.rcMonitor.left + (int)(screenWidth * 0.618f) - (initialWidth / 2);
+            if (CLOCK_WINDOW_POS_X + initialWidth > mi.rcMonitor.right) {
+                CLOCK_WINDOW_POS_X = mi.rcMonitor.right - initialWidth - 20;
+            }
+        } else {
+            /* Center on primary monitor */
+            CLOCK_WINDOW_POS_X = mi.rcMonitor.left + (screenWidth - initialWidth) / 2;
         }
-    } else if (CLOCK_WINDOW_POS_X == -1) {
-        int screenWidth = GetSystemMetrics(SM_CXSCREEN);
-        CLOCK_WINDOW_POS_X = (screenWidth - initialWidth) / 2;
     }
 
     HWND hwnd = CreateWindowExW(

src/window/window_multimonitor.c

@@ -97,12 +97,25 @@ static void MoveWindowToDefaultPosition(HWND hwnd, HMONITOR hMonitor) {
 
     int width = rect.right - rect.left;
     int height = rect.bottom - rect.top;
+    int screenWidth = mi.rcWork.right - mi.rcWork.left;
 
-    /* Use default position from config.h (right-upper area) */
+    /* Use default position from config.h */
     int newX = DEFAULT_WINDOW_POS_X;
     int newY = DEFAULT_WINDOW_POS_Y;
 
-    /* Handle sentinel value -1: use top of screen */
+    /* Handle special X position values */
+    if (newX == -2) {
+        /* Golden ratio: 0.618 from left of monitor */
+        newX = mi.rcWork.left + (int)(screenWidth * 0.618f) - (width / 2);
+        if (newX + width > mi.rcWork.right) {
+            newX = mi.rcWork.right - width - 20;
+        }
+    } else if (newX == -1) {
+        /* Center on monitor */
+        newX = mi.rcWork.left + (screenWidth - width) / 2;
+    }
+    
+    /* Handle sentinel value -1 for Y: use top of screen */
     if (newY < 0) {
         newY = mi.rcWork.top;
     }

src/window_procedure/window_commands.c

@@ -14,6 +14,7 @@
 #include "timer/timer.h"
 #include "window.h"
 #include "config.h"
+#include "config/config_applier.h"
 #include "log.h"
 #include "language.h"
 #include "startup.h"
@@ -22,6 +23,8 @@
 #include "color/color.h"
 #include "pomodoro.h"
 #include "tray/tray.h"
+
+extern void HandleStartupMode(HWND hwnd);
 #include "dialog/dialog_procedure.h"
 #include "hotkey.h"
 #include "update_checker.h"
@@ -336,18 +339,56 @@ static LRESULT CmdBrowseFile(HWND hwnd, WPARAM wp, LPARAM lp) {
 }
 
 static LRESULT CmdResetPosition(HWND hwnd, WPARAM wp, LPARAM lp) {
-    (void)hwnd; (void)wp; (void)lp;
+    (void)wp; (void)lp;
 
-    /* Use default values from config.h */
-    char posX[32], posY[32];
-    snprintf(posX, sizeof(posX), "%d", DEFAULT_WINDOW_POS_X);
-    snprintf(posY, sizeof(posY), "%d", DEFAULT_WINDOW_POS_Y);
+    /* Write default values to config */
+    char posXStr[32], posYStr[32];
+    snprintf(posXStr, sizeof(posXStr), "%d", DEFAULT_WINDOW_POS_X);
+    snprintf(posYStr, sizeof(posYStr), "%d", DEFAULT_WINDOW_POS_Y);
 
-    WriteConfigKeyValue("CLOCK_WINDOW_POS_X", posX);
-    WriteConfigKeyValue("CLOCK_WINDOW_POS_Y", posY);
+    WriteConfigKeyValue("CLOCK_WINDOW_POS_X", posXStr);
+    WriteConfigKeyValue("CLOCK_WINDOW_POS_Y", posYStr);
     WriteConfigKeyValue("WINDOW_SCALE", DEFAULT_WINDOW_SCALE);
     WriteConfigKeyValue("PLUGIN_SCALE", DEFAULT_PLUGIN_SCALE);
 
+    /* Directly apply position (don't rely on hot-reload for special values) */
+    RECT windowRect;
+    GetWindowRect(hwnd, &windowRect);
+    int windowWidth = windowRect.right - windowRect.left;
+    
+    POINT pt = {0, 0};
+    HMONITOR hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY);
+    MONITORINFO mi = {sizeof(mi)};
+    GetMonitorInfo(hMon, &mi);
+    int screenWidth = mi.rcMonitor.right - mi.rcMonitor.left;
+    
+    int posX, posY;
+    
+    /* Handle special X position values */
+    if (DEFAULT_WINDOW_POS_X == -2) {
+        posX = mi.rcMonitor.left + (int)(screenWidth * 0.618f) - (windowWidth / 2);
+        if (posX + windowWidth > mi.rcMonitor.right) {
+            posX = mi.rcMonitor.right - windowWidth - 20;
+        }
+    } else if (DEFAULT_WINDOW_POS_X == -1) {
+        posX = mi.rcMonitor.left + (screenWidth - windowWidth) / 2;
+    } else {
+        posX = mi.rcMonitor.left + DEFAULT_WINDOW_POS_X;
+    }
+    
+    /* Handle special Y position value (-1 = top of monitor) */
+    if (DEFAULT_WINDOW_POS_Y == -1) {
+        posY = mi.rcMonitor.top;
+    } else if (DEFAULT_WINDOW_POS_Y < 0) {
+        posY = mi.rcMonitor.top;
+    } else {
+        posY = mi.rcMonitor.top + DEFAULT_WINDOW_POS_Y;
+    }
+    
+    CLOCK_WINDOW_POS_X = posX;
+    CLOCK_WINDOW_POS_Y = posY;
+    SetWindowPos(hwnd, NULL, posX, posY, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
+    
     return 0;
 }
 
@@ -375,18 +416,22 @@ static LRESULT CmdResetDefaults(HWND hwnd, WPARAM wp, LPARAM lp) {
 
     /* Step 5: Reload all configuration (same as startup) */
     LOG_INFO("Reset: Reloading default configuration...");
+    g_ForceApplyConfig = TRUE;  /* Force apply all config values */
     ReadConfig();
+    g_ForceApplyConfig = FALSE;
     LOG_INFO("Reset: Configuration reloaded successfully");
 
-    /* Step 5.5: Reset UI runtime state (not in config file) */
+    /* Step 6: Apply startup mode from config */
+    HandleStartupMode(hwnd);
+    LOG_INFO("Reset: Startup mode applied: %s", CLOCK_STARTUP_MODE);
+    
+    /* Step 7: Reset UI runtime state */
     CLOCK_EDIT_MODE = FALSE;
     SetClickThrough(hwnd, TRUE);
-    LOG_INFO("Reset: UI runtime state reset");
-    
-    /* Force timeout action to default (override config's preserve logic) */
     CLOCK_TIMEOUT_ACTION = TIMEOUT_ACTION_MESSAGE;
+    LOG_INFO("Reset: UI runtime state reset");
 
-    /* Step 5.6: Reload font (config sets FONT_FILE_NAME, but font needs to be loaded) */
+    /* Step 8: Reload font */
     if (IsFontsFolderPath(FONT_FILE_NAME)) {
         const char* relativePath = ExtractRelativePath(FONT_FILE_NAME);
         if (relativePath) {
@@ -401,16 +446,16 @@ static LRESULT CmdResetDefaults(HWND hwnd, WPARAM wp, LPARAM lp) {
         }
     }
 
-    /* Step 6: Refresh UI to match new config */
+    /* Step 9: Refresh UI to match new config */
     RecalculateWindowSize(hwnd);
     ShowWindow(hwnd, SW_SHOW);
     ResetTimerWithInterval(hwnd);
 
-    /* Step 7: Re-enable redraw and refresh display */
+    /* Step 10: Re-enable redraw and refresh display */
     SendMessage(hwnd, WM_SETREDRAW, TRUE, 0);
     RedrawWindow(hwnd, NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
 
-    /* Step 8: Re-register hotkeys with new config */
+    /* Step 11: Re-register hotkeys with new config */
     RegisterGlobalHotkeys(hwnd);
 
     LOG_INFO("========== Reset All Settings operation completed ==========\n");