Add UI style presets and refactor mouse modes

Introduce a new ImGui app style system (imiv_style.h/.cpp) with selectable presets (IV/ImGui light/dark/classic) and helper functions to apply/sanitize presets. Persist UI state in a single persistent settings file (imiv.inf) and embed ImGui .ini contents when saving/loading; keep backwards compatibility with legacy prefs/ini files. Replace dark_palette with an integer style_preset, add a style combo in preferences, and apply styles at startup and when changed. Refactor area-sample/selection and mouse-mode handling: add set_area_sample_enabled and set_mouse_mode_action, update status bar mouse-mode UI and menu entries, and gate navigation/drag behaviors when area-sampling is active. Update various input/interaction logic (pan/zoom/drag handling) and fix zoom-drag scaling sign. Also update function signatures, constants, and a couple of regression test cases to reflect drag-based interactions.

Author: ssh4net

src/imiv/CMakeLists.txt

@@ -81,6 +81,7 @@ set (_imiv_core_sources
      imiv_ocio.cpp
      imiv_overlays.cpp
      imiv_shader_compile.cpp
+     imiv_style.cpp
      imiv_ui.cpp
      imiv_viewer.cpp
      imiv_vulkan_setup.cpp

src/imiv/imiv_actions.cpp

@@ -518,6 +518,35 @@ deselect_selection_action(ViewerState& viewer,
     viewer.last_error.clear();
 }
 
+void
+set_area_sample_enabled(ViewerState& viewer, PlaceholderUiState& ui_state,
+                        bool enabled)
+{
+    ui_state.show_area_probe_window = enabled;
+    if (enabled) {
+        ui_state.mouse_mode = 3;
+        sync_area_probe_to_selection(viewer, ui_state);
+        return;
+    }
+
+    if (ui_state.mouse_mode == 3)
+        ui_state.mouse_mode = 0;
+    clear_image_selection(viewer);
+    reset_area_probe_overlay(viewer);
+}
+
+void
+set_mouse_mode_action(ViewerState& viewer, PlaceholderUiState& ui_state,
+                      int mouse_mode)
+{
+    ui_state.mouse_mode = std::clamp(mouse_mode, 0, 4);
+    if (ui_state.mouse_mode == 3)
+        ui_state.mouse_mode = 0;
+    if (ui_state.show_area_probe_window) {
+        set_area_sample_enabled(viewer, ui_state, false);
+    }
+}
+
 void
 set_sort_mode_action(ViewerState& viewer, ImageSortMode mode)
 {

src/imiv/imiv_actions.h

@@ -34,6 +34,12 @@ void
 deselect_selection_action(ViewerState& viewer,
                           const PlaceholderUiState& ui_state);
 void
+set_area_sample_enabled(ViewerState& viewer, PlaceholderUiState& ui_state,
+                        bool enabled);
+void
+set_mouse_mode_action(ViewerState& viewer, PlaceholderUiState& ui_state,
+                      int mouse_mode);
+void
 set_sort_mode_action(ViewerState& viewer, ImageSortMode mode);
 void
 toggle_sort_reverse_action(ViewerState& viewer);

src/imiv/imiv_app.cpp

@@ -10,6 +10,7 @@
 #include "imiv_menu.h"
 #include "imiv_navigation.h"
 #include "imiv_ocio.h"
+#include "imiv_style.h"
 #include "imiv_test_engine.h"
 #include "imiv_types.h"
 #include "imiv_ui.h"
@@ -56,15 +57,6 @@ namespace Imiv {
 
 namespace {
 
-    void apply_imgui_style_defaults()
-    {
-        ImGuiStyle& style      = ImGui::GetStyle();
-        style.WindowBorderSize = 0.0f;
-        style.ChildBorderSize  = 0.0f;
-        style.PopupBorderSize  = 0.0f;
-        style.FrameBorderSize  = 0.0f;
-    }
-
     std::filesystem::path executable_directory_path()
     {
         const std::string program_path = Sysutil::this_program_path();
@@ -435,10 +427,25 @@ run(const AppConfig& config)
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
     io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
-    io.IniFilename       = "imiv.ini";
+    io.IniFilename       = nullptr;
     const AppFonts fonts = setup_app_fonts(verbose_logging);
-    ImGui::StyleColorsDark();
-    apply_imgui_style_defaults();
+    apply_imgui_app_style(AppStylePreset::ImGuiDark);
+    const std::filesystem::path settings_load_path
+        = persistent_state_file_path_for_load();
+    std::error_code settings_load_ec;
+    if (settings_load_path.filename() == "imiv.inf"
+        && std::filesystem::exists(settings_load_path, settings_load_ec)
+        && !settings_load_ec) {
+        ImGui::LoadIniSettingsFromDisk(settings_load_path.string().c_str());
+    } else {
+        const std::filesystem::path legacy_imgui_path
+            = legacy_imgui_ini_file_path();
+        settings_load_ec.clear();
+        if (std::filesystem::exists(legacy_imgui_path, settings_load_ec)
+            && !settings_load_ec) {
+            ImGui::LoadIniSettingsFromDisk(legacy_imgui_path.string().c_str());
+        }
+    }
     if (io.ConfigFlags & ImGuiConfigFlags_ViewportsEnable) {
         ImGuiStyle& style                 = ImGui::GetStyle();
         style.WindowRounding              = 0.0f;
@@ -597,11 +604,8 @@ run(const AppConfig& config)
         ui_state.show_area_probe_window = true;
         ui_state.mouse_mode             = 3;
     }
-    if (ui_state.dark_palette)
-        ImGui::StyleColorsDark();
-    else
-        ImGui::StyleColorsLight();
-    apply_imgui_style_defaults();
+    set_area_sample_enabled(viewer, ui_state, ui_state.show_area_probe_window);
+    apply_imgui_app_style(sanitize_app_style_preset(ui_state.style_preset));
 
     if (!run_config.input_paths.empty()) {
         append_loaded_image_paths(viewer, run_config.input_paths);
@@ -634,8 +638,17 @@ run(const AppConfig& config)
     glfwPollEvents();
     force_center_glfw_window(window);
 
+    auto save_combined_settings = [&](std::string& save_error_message) {
+        size_t imgui_ini_size      = 0;
+        const char* imgui_ini_text = ImGui::SaveIniSettingsToMemory(
+            &imgui_ini_size);
+        io.WantSaveIniSettings = false;
+        return save_persistent_state(ui_state, viewer, imgui_ini_text,
+                                     imgui_ini_size, save_error_message);
+    };
+
     bool request_exit         = false;
-    bool applied_dark_palette = ui_state.dark_palette;
+    int applied_style_preset  = ui_state.style_preset;
     int startup_center_frames = 90;
     while (!glfwWindowShouldClose(window)) {
         glfwPollEvents();
@@ -676,13 +689,12 @@ run(const AppConfig& config)
 #    endif
                            ,
                        window, vk_state);
-        if (ui_state.dark_palette != applied_dark_palette) {
-            if (ui_state.dark_palette)
-                ImGui::StyleColorsDark();
-            else
-                ImGui::StyleColorsLight();
-            apply_imgui_style_defaults();
-            applied_dark_palette = ui_state.dark_palette;
+        if (ui_state.style_preset != applied_style_preset) {
+            ui_state.style_preset = static_cast<int>(
+                sanitize_app_style_preset(ui_state.style_preset));
+            apply_imgui_app_style(
+                sanitize_app_style_preset(ui_state.style_preset));
+            applied_style_preset = ui_state.style_preset;
         }
 #    if defined(IMGUI_ENABLE_TEST_ENGINE)
         test_engine_maybe_show_windows(test_engine_runtime, test_engine_cfg);
@@ -713,12 +725,19 @@ run(const AppConfig& config)
         if (test_engine_should_close(test_engine_runtime, test_engine_cfg))
             glfwSetWindowShouldClose(window, GLFW_TRUE);
 #    endif
+        if (io.WantSaveIniSettings) {
+            std::string save_error_message;
+            if (!save_combined_settings(save_error_message)) {
+                print(stderr, "imiv: failed to save preferences: {}\n",
+                      save_error_message);
+            }
+        }
         if (request_exit)
             glfwSetWindowShouldClose(window, GLFW_TRUE);
     }
 
     std::string prefs_save_error;
-    if (!save_persistent_state(ui_state, viewer, prefs_save_error))
+    if (!save_combined_settings(prefs_save_error))
         print(stderr, "imiv: failed to save preferences: {}\n",
               prefs_save_error);
 

src/imiv/imiv_aux_windows.cpp

@@ -246,7 +246,24 @@ draw_preferences_window(PlaceholderUiState& ui, bool& show_window)
 
         ImGui::Spacing();
         ImGui::Checkbox("Linear interpolation", &ui.linear_interpolation);
-        ImGui::Checkbox("Dark palette", &ui.dark_palette);
+        const AppStylePreset current_style_preset = sanitize_app_style_preset(
+            ui.style_preset);
+        if (ImGui::BeginCombo("UI style",
+                              app_style_preset_name(current_style_preset))) {
+            for (int preset_value = static_cast<int>(AppStylePreset::IvLight);
+                 preset_value <= static_cast<int>(AppStylePreset::ImGuiClassic);
+                 ++preset_value) {
+                const AppStylePreset preset = static_cast<AppStylePreset>(
+                    preset_value);
+                const bool selected = preset == current_style_preset;
+                if (ImGui::Selectable(app_style_preset_name(preset), selected)) {
+                    ui.style_preset = preset_value;
+                }
+                if (selected)
+                    ImGui::SetItemDefaultFocus();
+            }
+            ImGui::EndCombo();
+        }
         ImGui::Checkbox("Generate mipmaps (requires restart)", &ui.auto_mipmap);
 
         ImGui::Spacing();

src/imiv/imiv_frame.cpp

@@ -487,31 +487,10 @@ draw_viewer_ui(ViewerState& viewer, PlaceholderUiState& ui_state,
     }
 #endif
 
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_INFO"))
-        ui_state.show_info_window = true;
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_PREFS"))
-        ui_state.show_preferences_window = true;
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_PREVIEW"))
-        ui_state.show_preview_window = true;
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_PIXEL"))
-        ui_state.show_pixelview_window = true;
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_AREA")) {
-        ui_state.show_area_probe_window = true;
-        ui_state.mouse_mode             = 3;
-        sync_area_probe_to_selection(viewer, ui_state);
-    }
-    if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_AUX_WINDOWS")) {
-        ui_state.show_info_window        = true;
-        ui_state.show_preferences_window = true;
-        ui_state.show_preview_window     = true;
-        ui_state.show_pixelview_window   = true;
-        ui_state.show_area_probe_window  = true;
-        ui_state.mouse_mode              = 3;
-        sync_area_probe_to_selection(viewer, ui_state);
-    }
     if (env_flag_is_truthy("IMIV_IMGUI_TEST_ENGINE_SHOW_DRAG_OVERLAY"))
         viewer.drag_overlay_active = true;
     apply_test_engine_ocio_overrides(ui_state);
+    set_area_sample_enabled(viewer, ui_state, ui_state.show_area_probe_window);
 
     collect_viewer_shortcuts(viewer, ui_state, developer_ui, actions,
                              request_exit);

src/imiv/imiv_image_view.cpp

@@ -184,7 +184,6 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
         ImTextureRef closeup_texture_ref;
         bool has_main_texture           = false;
         bool has_closeup_texture        = false;
-        bool image_canvas_pressed       = false;
         bool image_canvas_hovered       = false;
         bool image_canvas_active        = false;
         PendingZoomRequest pending_zoom = shortcut_zoom_request;
@@ -260,11 +259,10 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
         coord_map.window_pos = ImGui::GetWindowPos();
         if (has_main_texture && coord_map.valid) {
             ImGui::SetCursorScreenPos(coord_map.image_rect_min);
-            image_canvas_pressed = ImGui::InvisibleButton(
-                "##image_canvas", image_size,
-                ImGuiButtonFlags_MouseButtonLeft
-                    | ImGuiButtonFlags_MouseButtonRight
-                    | ImGuiButtonFlags_MouseButtonMiddle);
+            ImGui::InvisibleButton("##image_canvas", image_size,
+                                   ImGuiButtonFlags_MouseButtonLeft
+                                       | ImGuiButtonFlags_MouseButtonRight
+                                       | ImGuiButtonFlags_MouseButtonMiddle);
             image_canvas_hovered = ImGui::IsItemHovered(
                 ImGuiHoveredFlags_AllowWhenBlockedByActiveItem);
             image_canvas_active = ImGui::IsItemActive();
@@ -318,11 +316,10 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
         const ImGuiIO& io                 = ImGui::GetIO();
         const ImVec2 mouse                = io.MousePos;
         const bool area_probe_mode        = ui_state.show_area_probe_window;
-        const bool selection_capable_mode = (ui_state.mouse_mode == 3)
-                                            || area_probe_mode;
-        const bool mouse_in_image = point_in_rect(mouse,
-                                                  coord_map.image_rect_min,
-                                                  coord_map.image_rect_max);
+        const bool selection_capable_mode = area_probe_mode;
+        const bool mouse_in_image         = point_in_rect(mouse,
+                                                          coord_map.image_rect_min,
+                                                          coord_map.image_rect_max);
         const bool mouse_in_viewport
             = point_in_rect(mouse, coord_map.viewport_rect_min,
                             coord_map.viewport_rect_max);
@@ -332,24 +329,16 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
                                             && mouse_in_viewport;
         const bool image_canvas_accepts_mouse = image_canvas_hovered
                                                 || image_canvas_active;
-        const bool image_canvas_clicked_left
-            = image_canvas_pressed && io.MouseReleased[ImGuiMouseButton_Left];
-        const bool image_canvas_clicked_right
-            = image_canvas_pressed && io.MouseReleased[ImGuiMouseButton_Right];
         const bool empty_viewport_clicked_left
             = viewport_accepts_mouse && !mouse_in_image
               && ImGui::IsMouseClicked(ImGuiMouseButton_Left);
-        const bool empty_viewport_clicked_right
-            = viewport_accepts_mouse && !mouse_in_image
-              && ImGui::IsMouseClicked(ImGuiMouseButton_Right);
         const ImVec2 clamped_mouse
             = clamp_pos_to_rect(mouse, coord_map.image_rect_min,
                                 coord_map.image_rect_max);
         ImVec2 selection_source_uv(0.5f, 0.5f);
         const bool have_selection_source_uv
             = screen_to_source_uv(coord_map, clamped_mouse,
                                   selection_source_uv);
-        bool selection_consumed_left_release = false;
 
         ImVec2 source_uv(0.0f, 0.0f);
         int px = 0;
@@ -423,15 +412,13 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
                             viewer.selection_xend, viewer.selection_yend);
                         viewer.last_error.clear();
                     }
-                    selection_consumed_left_release = true;
                 } else if ((selection_capable_mode || area_probe_mode)
                            && (viewport_accepts_mouse
                                || image_canvas_accepts_mouse)) {
                     clear_image_selection(viewer);
                     sync_area_probe_to_selection(viewer, ui_state);
                     viewer.status_message = "Selection cleared";
                     viewer.last_error.clear();
-                    selection_consumed_left_release = true;
                 }
                 viewer.selection_press_active      = false;
                 viewer.selection_drag_active       = false;
@@ -445,7 +432,6 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
             sync_area_probe_to_selection(viewer, ui_state);
             viewer.status_message = "Selection cleared";
             viewer.last_error.clear();
-            selection_consumed_left_release = true;
         }
 
         bool want_pan       = false;
@@ -455,38 +441,23 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
             if (ui_state.mouse_mode == 1) {
                 want_pan = (!area_probe_mode
                             && ImGui::IsMouseDown(ImGuiMouseButton_Left))
-                           || ImGui::IsMouseDown(ImGuiMouseButton_Right)
                            || ImGui::IsMouseDown(ImGuiMouseButton_Middle);
             } else if (ui_state.mouse_mode == 0) {
-                const bool want_middle_pan
-                    = ImGui::IsMouseDown(ImGuiMouseButton_Middle)
+                const bool want_left_pan
+                    = !area_probe_mode
+                      && ImGui::IsMouseDown(ImGuiMouseButton_Left)
                       && (viewer.pan_drag_active || image_canvas_accepts_mouse
                           || viewport_accepts_mouse);
-                const bool want_alt_left_pan
-                    = !area_probe_mode && io.KeyAlt
-                      && ImGui::IsMouseDown(ImGuiMouseButton_Left)
+                const bool want_middle_pan
+                    = ImGui::IsMouseDown(ImGuiMouseButton_Middle)
                       && (viewer.pan_drag_active || image_canvas_accepts_mouse
                           || viewport_accepts_mouse);
-                want_pan       = want_middle_pan || want_alt_left_pan;
-                want_zoom_drag = io.KeyAlt
+                want_pan       = want_left_pan || want_middle_pan;
+                want_zoom_drag = !area_probe_mode
                                  && ImGui::IsMouseDown(ImGuiMouseButton_Right)
                                  && (viewer.zoom_drag_active
                                      || image_canvas_accepts_mouse
                                      || viewport_accepts_mouse);
-                if (!area_probe_mode && !io.KeyAlt
-                    && (image_canvas_clicked_left || image_canvas_clicked_right
-                        || empty_viewport_clicked_left
-                        || empty_viewport_clicked_right)) {
-                    if (!selection_consumed_left_release
-                        && (image_canvas_clicked_left
-                            || empty_viewport_clicked_left)) {
-                        request_zoom_scale(pending_zoom, 2.0f, true);
-                    }
-                    if (image_canvas_clicked_right
-                        || empty_viewport_clicked_right) {
-                        request_zoom_scale(pending_zoom, 0.5f, true);
-                    }
-                }
             }
         }
 
@@ -519,7 +490,7 @@ draw_image_window_contents(ViewerState& viewer, PlaceholderUiState& ui_state,
             } else {
                 const float dx    = mouse.x - viewer.drag_prev_mouse.x;
                 const float dy    = mouse.y - viewer.drag_prev_mouse.y;
-                const float scale = 1.0f + 0.005f * (dx + dy);
+                const float scale = 1.0f + 0.005f * (dy - dx);
                 if (scale > 0.0f)
                     request_zoom_scale(pending_zoom, scale, true);
                 viewer.drag_prev_mouse = mouse;