Embed fonts and SPIR-V; Image List/UI fixes

Add build-time embedding for UI fonts and static Vulkan SPIR-V and wire it through the app and docs. Introduces OIIO_IMIV_EMBED_FONTS CMake option, embed_binary_header.cmake, and generated headers to include embedded DroidSans/DroidSansMono when enabled; preserve the old runtime fonts/ install/copy behavior when embedding is off. Update imiv_app to prefer embedded fonts, improve font loading fallbacks and logging. Adjust Image List behavior and UI: remove-from-session now retargets affected views (or clears them), keep the list visible when one item remains, add test-engine visibility overrides and a focused Image List centering regression test + CTest entry, and add imiv/tools/imiv_image_list_center_regression.py. Improve status bar/overlay text (file/specs/preview columns), viewport size tracking for smoother scroll sync, and various docs updates describing the embedding policy and runtime fallbacks.

Signed-off-by: Vlad (Kuzmin) Erium <libalias@gmail.com>
Signed-off-by: Vlad <shaamaan@gmail.com>

Author: ssh4net

src/doc/imiv_dev.rst

@@ -280,15 +280,15 @@ being a passive history view:
 
 * `>` marks the image shown in the active image view;
 * `[N]` reports how many open image views currently show that path;
-* a small inline close button appears for rows visible in the active view;
+* a small inline `x` button removes that path from the session queue;
 * the row popup menu routes the shared-library actions:
   `Open in active view`, `Open in new view`, `Close in active view`,
   `Close in all views`, and `Remove from session`.
 
 Those actions are implemented against the shared `ImageLibraryState` plus the
 current `MultiViewWorkspace`. `Close` mutates view bindings only. `Remove`
-edits the shared session queue and then retargets or clears any views that
-were showing the removed path.
+edits the shared session queue and then retargets any affected views to the
+next surviving queue item, or clears them if the queue becomes empty.
 
 Folder-open path filtering
 --------------------------
@@ -927,6 +927,9 @@ Important cache variables from `src/imiv/CMakeLists.txt` include:
   compile test-engine support when sources are available.
 * `OIIO_IMIV_USE_NATIVEFILEDIALOG`
   enable native file-open/save integration.
+* `OIIO_IMIV_EMBED_FONTS`
+  embed the `DroidSans.ttf` and `DroidSansMono.ttf` runtime fonts into the
+  :program:`imiv` binary. This is enabled by default.
 * `OIIO_IMIV_ADD_BACKEND_VERIFY_CTEST`
   add the longer per-backend verification CTest entries.
 
@@ -950,6 +953,78 @@ macOS build with Metal default and OpenGL also compiled::
       -D OIIO_IMIV_DEFAULT_RENDERER=metal \
       -D OIIO_IMIV_ENABLE_IMGUI_TEST_ENGINE=ON
 
+When `OIIO_IMIV_EMBED_FONTS=ON`, :program:`imiv` uses the embedded UI and mono
+fonts first and does not need an external `fonts/` directory at runtime.
+When it is `OFF`, :program:`imiv` tries to load those same fonts from the
+runtime `fonts/` directory and then falls back to Dear ImGui's default font if
+they are missing.
+
+
+Embedded binary assets
+======================
+
+:program:`imiv` now uses two build-time embedding paths for runtime assets that
+used to be external files.
+
+Fonts
+-----
+
+The `OIIO_IMIV_EMBED_FONTS` option controls whether the two fonts actually used
+by :program:`imiv` are compiled into the binary:
+
+* `src/fonts/Droid_Sans/DroidSans.ttf`
+* `src/fonts/Droid_Sans_Mono/DroidSansMono.ttf`
+
+`src/imiv/CMakeLists.txt` generates binary headers for those files through
+`src/imiv/embed_binary_header.cmake`. The generated headers live in the build
+directory and are included from `src/imiv/imiv_app.cpp` when
+`IMIV_EMBED_FONTS` is enabled in `imiv_build_config.h`.
+
+Runtime font loading order is:
+
+1. embedded font data, if the build enabled it;
+2. `fonts/` next to the executable;
+3. Dear ImGui's default font for the UI font, then the UI font again for the
+   mono slot if the mono font also could not be loaded.
+
+Static Vulkan shaders
+---------------------
+
+The static Vulkan upload and preview shaders are always embedded when the
+Vulkan backend is compiled. `src/imiv/CMakeLists.txt` first builds the SPIR-V
+files, then converts them into generated headers with
+`src/imiv/embed_spirv_header.cmake`.
+
+Those embedded headers cover the fixed-function Vulkan shader set in
+`src/imiv/shaders/`:
+
+* the upload compute shader variants;
+* the static preview vertex shader;
+* the static preview fragment shader.
+
+`src/imiv/imiv_vulkan_setup.cpp` and `src/imiv/imiv_vulkan_ocio.cpp` use the
+embedded SPIR-V words first and only fall back to `IMIV_SHADER_DIR` if needed.
+That fallback keeps unusual build layouts working, but normal packaged builds
+should no longer depend on external `.spv` files at runtime.
+
+What is not embedded
+--------------------
+
+Not every renderer-side asset is a static binary blob:
+
+* Vulkan OCIO preview still generates its fragment shader at runtime because it
+  depends on the active OCIO configuration and selected display/view.
+* OpenGL still compiles native GLSL source strings with the GL driver.
+* Metal still compiles embedded MSL source text at runtime.
+
+So the embedded-binary policy is intentionally narrow:
+
+* fonts are embedded to remove the runtime `fonts/` dependency by default;
+* static Vulkan SPIR-V is embedded to remove the runtime `.spv` dependency by
+  default;
+* dynamic OCIO and backend-native runtime shader generation remain runtime
+  features.
+
 At the time of this writing, the shared backend verifier is green on macOS for
 all three compiled backends:
 

src/doc/imiv_tests.rst

@@ -47,6 +47,12 @@ When the test engine is not compiled in, :program:`imiv` will warn if
 automation is requested through `IMIV_IMGUI_TEST_ENGINE*` environment
 variables.
 
+With the default build settings, focused regressions do not depend on an
+external `fonts/` directory or static Vulkan `.spv` files at runtime because
+those assets are embedded into the :program:`imiv` binary. OCIO preview
+regressions still depend on the runtime OCIO environment because the OCIO
+shader path is generated from the active configuration.
+
 
 Quick start
 ===========
@@ -173,6 +179,7 @@ Per-view recipe overrides:
 
 Image List actions:
 
+* `image_list_visible`
 * `image_list_select_index`
 * `image_list_open_new_view_index`
 * `image_list_close_active_index`
@@ -224,7 +231,11 @@ Recent focused GUI regressions in `src/imiv/tools/` include:
   default Image List visibility and docked layout on multi-image startup;
 * `imiv_image_list_interaction_regression.py`
   Image List single-click, open-in-new-view, close-in-active-view, and
-  remove-from-session behavior;
+  remove-from-session behavior, including keeping the list visible with one
+  remaining queue item;
+* `imiv_image_list_center_regression.py`
+  opening `Image List` after a single-image load preserves centered scroll
+  instead of snapping the image to the top-left;
 * `imiv_open_folder_regression.py`
   startup folder-open queue filtering for supported image files only;
 * `imiv_drag_drop_regression.py`

src/doc/imiv_user.rst

@@ -255,7 +255,8 @@ The `Image List` window currently supports:
 * open-count badge
   `[N]` shows how many open image views currently display that image;
 * inline close button
-  rows that are visible in the active image view show a small `x` button;
+  each row shows a small `x` button that removes that image from the current
+  session queue;
 * right-click context menu
   provides `Open in active view`, `Open in new view`,
   `Close in active view`, `Close in all views`, and
@@ -275,11 +276,24 @@ The main `Image` window remains the primary docked image pane. Additional
 `Image N` windows are currently created docked into the main dockspace.
 Undocking those image views is intentionally disabled in this first slice.
 
-When more than one image is loaded into the queue, `Image List` becomes
-visible automatically and defaults to a narrow docked pane on the right side
-of the main image area. Its dock position and size may still be saved by Dear
-ImGui layout persistence, but its open/closed visibility is not treated as a
-persistent preference.
+Current builds embed the `imiv` UI and mono fonts by default. If a build is
+configured without font embedding, :program:`imiv` first looks for the same
+fonts in its runtime `fonts/` directory and then falls back to Dear ImGui's
+default font if they are not present.
+
+Static Vulkan upload and preview shaders are also embedded into the binary at
+build time. That means normal Vulkan launches do not need separate `.spv`
+files next to the executable. OpenGL and Metal continue to compile their
+native shader source at runtime, and Vulkan OCIO preview still generates its
+backend shader at runtime because it depends on the active OCIO configuration.
+
+When the queue first grows beyond one image, `Image List` becomes visible
+automatically and defaults to a narrow docked pane on the right side of the
+main image area. If it is already open and the queue later shrinks to one
+remaining image, it stays open so the last session item can still be managed
+from the list. It hides automatically only when the queue becomes empty. Its
+dock position and size may still be saved by Dear ImGui layout persistence,
+but its open/closed visibility is not treated as a persistent preference.
 
 This is the first multi-view milestone. View windows already have independent
 loaded images, zoom, scroll, selection state, and preview recipe state.

src/imiv/CMakeLists.txt

@@ -22,6 +22,8 @@ set (OIIO_IMIV_GLSLANG_DEFAULT_LIMITS_LIBRARY "" CACHE FILEPATH
      "Optional explicit glslang-default-resource-limits library path for imiv runtime shader compilation")
 option (OIIO_IMIV_USE_NATIVEFILEDIALOG
         "Use nativefiledialog-extended for imiv file open/save actions" ON)
+option (OIIO_IMIV_EMBED_FONTS
+        "Embed imiv UI and mono fonts into the binary" ON)
 option (OIIO_IMIV_ENABLE_IMGUI_TEST_ENGINE
         "Build imiv with Dear ImGui Test Engine integration when sources are available" ON)
 option (OIIO_IMIV_ADD_UPLOAD_SMOKE_CTEST
@@ -228,6 +230,11 @@ set (_imiv_preview_vert_hdr "${CMAKE_CURRENT_BINARY_DIR}/imiv_preview_vert_spv.h
 set (_imiv_preview_frag_hdr "${CMAKE_CURRENT_BINARY_DIR}/imiv_preview_frag_spv.h")
 set (_imiv_shader_outputs)
 set (_imiv_embedded_shader_headers)
+set (_imiv_font_ui_ttf "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans.ttf")
+set (_imiv_font_mono_ttf "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/DroidSansMono.ttf")
+set (_imiv_font_ui_hdr "${CMAKE_CURRENT_BINARY_DIR}/imiv_font_droidsans_ttf.h")
+set (_imiv_font_mono_hdr "${CMAKE_CURRENT_BINARY_DIR}/imiv_font_droidsansmono_ttf.h")
+set (_imiv_embedded_font_headers)
 
 function (_imiv_add_embedded_spirv_header input_spv output_hdr symbol_name)
     add_custom_command (
@@ -243,6 +250,36 @@ function (_imiv_add_embedded_spirv_header input_spv output_hdr symbol_name)
         COMMENT "imiv: embedding Vulkan shader ${symbol_name}")
 endfunction ()
 
+function (_imiv_add_embedded_binary_header input_bin output_hdr symbol_name)
+    add_custom_command (
+        OUTPUT "${output_hdr}"
+        COMMAND ${CMAKE_COMMAND}
+                -DINPUT="${input_bin}"
+                -DOUTPUT="${output_hdr}"
+                -DSYMBOL_NAME="${symbol_name}"
+                -P "${CMAKE_CURRENT_SOURCE_DIR}/embed_binary_header.cmake"
+        DEPENDS
+            "${input_bin}"
+            "${CMAKE_CURRENT_SOURCE_DIR}/embed_binary_header.cmake"
+        COMMENT "imiv: embedding binary asset ${symbol_name}")
+endfunction ()
+
+if (OIIO_IMIV_EMBED_FONTS)
+    if (NOT EXISTS "${_imiv_font_ui_ttf}" OR NOT EXISTS "${_imiv_font_mono_ttf}")
+        message (FATAL_ERROR
+                 "imiv: OIIO_IMIV_EMBED_FONTS=ON requires ${_imiv_font_ui_ttf} and ${_imiv_font_mono_ttf}")
+    endif ()
+    _imiv_add_embedded_binary_header ("${_imiv_font_ui_ttf}"
+                                      "${_imiv_font_ui_hdr}"
+                                      "g_imiv_font_droidsans_ttf")
+    _imiv_add_embedded_binary_header ("${_imiv_font_mono_ttf}"
+                                      "${_imiv_font_mono_hdr}"
+                                      "g_imiv_font_droidsansmono_ttf")
+    list (APPEND _imiv_embedded_font_headers
+          "${_imiv_font_ui_hdr}"
+          "${_imiv_font_mono_hdr}")
+endif ()
+
 if (_imiv_want_vulkan)
     find_program (OIIO_IMIV_GLSLC_EXECUTABLE
                   NAMES glslc
@@ -815,6 +852,7 @@ endif ()
 set (IMIV_WITH_VULKAN 0)
 set (IMIV_WITH_METAL 0)
 set (IMIV_WITH_OPENGL 0)
+set (IMIV_EMBED_FONTS 0)
 set (IMIV_BUILD_DEFAULT_BACKEND_KIND -1)
 if (_imiv_enabled_vulkan)
     set (IMIV_WITH_VULKAN 1)
@@ -825,6 +863,9 @@ endif ()
 if (_imiv_enabled_opengl)
     set (IMIV_WITH_OPENGL 1)
 endif ()
+if (OIIO_IMIV_EMBED_FONTS)
+    set (IMIV_EMBED_FONTS 1)
+endif ()
 if (_imiv_renderer_is_vulkan)
     set (IMIV_BUILD_DEFAULT_BACKEND_KIND 0)
 elseif (_imiv_renderer_is_metal)
@@ -860,7 +901,8 @@ set (_imiv_core_sources
      ${_imiv_shared_sources}
      ${_imiv_test_engine_integration_sources}
      ${_imiv_platform_glfw_sources}
-     ${_imiv_renderer_enabled_sources})
+     ${_imiv_renderer_enabled_sources}
+     ${_imiv_embedded_font_headers})
 
 set (_imiv_imgui_renderer_sources)
 if (_imiv_enabled_vulkan)
@@ -1016,40 +1058,38 @@ if (TARGET imiv)
         target_compile_definitions (imiv PRIVATE IMIV_HAS_NFD=0)
     endif ()
 
-    add_custom_command (
-        TARGET imiv POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans"
-        COMMAND ${CMAKE_COMMAND} -E make_directory
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans.ttf"
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans/DroidSans.ttf"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans-Bold.ttf"
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans/DroidSans-Bold.ttf"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/droid-lic.txt"
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans/droid-lic.txt"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/droid-lic.txt"
-                "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono/droid-lic.txt"
-        VERBATIM)
-
-    install (FILES
-                 "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans.ttf"
-                 "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans-Bold.ttf"
-                 "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/droid-lic.txt"
-             DESTINATION
-                 "${CMAKE_INSTALL_BINDIR}/fonts/Droid_Sans")
-    install (FILES
-                 "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
-                 "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/droid-lic.txt"
-             DESTINATION
-                 "${CMAKE_INSTALL_BINDIR}/fonts/Droid_Sans_Mono")
+    if (NOT OIIO_IMIV_EMBED_FONTS)
+        add_custom_command (
+            TARGET imiv POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E make_directory
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans"
+            COMMAND ${CMAKE_COMMAND} -E make_directory
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans.ttf"
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans/DroidSans.ttf"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/droid-lic.txt"
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans/droid-lic.txt"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/droid-lic.txt"
+                    "$<TARGET_FILE_DIR:imiv>/fonts/Droid_Sans_Mono/droid-lic.txt"
+            VERBATIM)
+
+        install (FILES
+                     "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/DroidSans.ttf"
+                     "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans/droid-lic.txt"
+                 DESTINATION
+                     "${CMAKE_INSTALL_BINDIR}/fonts/Droid_Sans")
+        install (FILES
+                     "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/DroidSansMono.ttf"
+                     "${PROJECT_SOURCE_DIR}/src/fonts/Droid_Sans_Mono/droid-lic.txt"
+                 DESTINATION
+                     "${CMAKE_INSTALL_BINDIR}/fonts/Droid_Sans_Mono")
+    endif ()
 endif ()
 
 if (MSVC)
@@ -1430,6 +1470,24 @@ if (TARGET imiv
             LABELS "imiv;gui;imiv_multiview"
             TIMEOUT 180)
 
+    if (TARGET oiiotool)
+        add_test (
+            NAME imiv_image_list_center_regression
+            COMMAND
+                "${Python3_EXECUTABLE}"
+                "${CMAKE_CURRENT_SOURCE_DIR}/tools/imiv_image_list_center_regression.py"
+                --bin "$<TARGET_FILE:imiv>"
+                --cwd "$<TARGET_FILE_DIR:imiv>"
+                --backend opengl
+                --oiiotool "$<TARGET_FILE:oiiotool>"
+                --env-script "${CMAKE_BINARY_DIR}/imiv_env.sh"
+                --out-dir "${CMAKE_BINARY_DIR}/imiv_captures/image_list_center_regression")
+        set_tests_properties (
+            imiv_image_list_center_regression PROPERTIES
+                LABELS "imiv;gui;imiv_multiview"
+                TIMEOUT 180)
+    endif ()
+
     add_test (
         NAME imiv_drag_drop_regression
         COMMAND