feat: merge draggable EXIF info panel support (#179) and bump version to v6.1.0.11

Author: justnullname

QuickView/EditState.h

@@ -196,6 +196,10 @@ struct AppConfig {
 
     bool ShowBorderIndicator = true;
 
+    // --- Info Panel Position ---
+    float InfoPanelX = 16.0f;
+    float InfoPanelY = 32.0f;
+
     // --- Control ---
     bool EnableCrossFade = true;        // Enable cross-fade animation when changing images
     int ZoomModeIn = 0;                 // 0=Auto, 1=Linear, 2=Nearest, 3=High Quality Cubic
@@ -375,6 +379,8 @@ struct ViewState {
     bool CompareActive = false;
     int ExifOrientation = 1; // EXIF Orientation (1-8, 1=Normal)
     bool IsPendingFullscreenExitDrag = false; // [Requirement] Exit fullscreen on drag
+    bool IsDraggingInfoPanel = false;
+    POINT InfoPanelDragAnchor = { 0, 0 };
 
     void Reset() {
         Zoom = 1.0f;
@@ -396,6 +402,8 @@ struct ViewState {
         CompareActive = false;
         ExifOrientation = 1;
         IsPendingFullscreenExitDrag = false;
+        IsDraggingInfoPanel = false;
+        InfoPanelDragAnchor = { 0, 0 };
     }
 };
 
@@ -475,6 +483,9 @@ struct RuntimeConfig {
     std::wstring SoftProofProfilePath; // Currently active proofing ICC path
     bool ShowGamutWarningOverlay = false;
 
+    float InfoPanelX = 16.0f;
+    float InfoPanelY = 32.0f;
+
     // Overlay (Tracing) Mode
     OverlayState OverlayModeState = OverlayState::Normal;
     BYTE OverlayAlpha = 128;           // Current opacity (0-255), default ~50%
@@ -510,6 +521,8 @@ struct RuntimeConfig {
         NavTraverse = cfg.NavTraverse;
         SortOrder = cfg.SortOrder;
         SortDescending = cfg.SortDescending;
+        InfoPanelX = cfg.InfoPanelX;
+        InfoPanelY = cfg.InfoPanelY;
     }
 };
 

QuickView/UIRenderer.cpp

@@ -271,6 +271,13 @@ HitTestResult UIRenderer::HitTest(float x, float y) {
         }
     }
 
+    // Draggable Panel Body
+    if (x >= m_lastInfoPanelRect.left && x <= m_lastInfoPanelRect.right &&
+        y >= m_lastInfoPanelRect.top && y <= m_lastInfoPanelRect.bottom) {
+        result.type = UIHitResult::InfoPanelDrag;
+        return result;
+    }
+
     // Not on any clickable element, reset hover
     m_hoverRowIndex = -1;
 
@@ -2615,7 +2622,9 @@ void UIRenderer::DrawCompactInfo(ID2D1DeviceContext* dc) {
     float textW = MeasureTextWidth(info);
     // [[maybe_unused]] float totalW = textW + 56.0f * s;
 
-    D2D1_RECT_F rect = D2D1::RectF(16.0f * s, 8.0f * s, 16.0f * s + textW, 32.0f * s);
+    float startX = g_runtime.InfoPanelX * s;
+    float startY = g_runtime.InfoPanelY * s;
+    D2D1_RECT_F rect = D2D1::RectF(startX, startY, startX + textW, startY + 24.0f * s);
     // [Visual Consistency] Follow UI theme instead of image luma
     const AdaptiveUiPalette palette = BuildAdaptivePalette(IsLightThemeActive() ? 1.0f : 0.0f, &m_compactInfoAdaptiveBlend);
 
@@ -2635,6 +2644,9 @@ void UIRenderer::DrawCompactInfo(ID2D1DeviceContext* dc) {
     // Close Button [x]
     m_panelCloseRect = D2D1::RectF(m_panelToggleRect.right + 4.0f * s, rect.top, m_panelToggleRect.right + 28.0f * s, rect.bottom);
     DrawTextWithFourWayShadow(dc, L"[x]", 3, m_panelFormat.Get(), m_panelCloseRect, brushRed.Get(), brushShadow.Get(), 1.1f * s);
+
+    // Save bounds for hit testing (include buttons)
+    m_lastInfoPanelRect = D2D1::RectF(rect.left, rect.top, m_panelCloseRect.right, m_panelCloseRect.bottom);
 }
 
 float UIRenderer::EstimateCanvasLuminance() const {
@@ -2835,13 +2847,14 @@ void UIRenderer::DrawInfoPanel(ID2D1DeviceContext* dc) {
     }
     width = (std::clamp)(width, 220.0f * s, 300.0f * s);
     float height = 26.0f * s + (float)m_infoGrid.size() * GRID_ROW_HEIGHT * s + 14.0f * s;
-    float startX = 16.0f * s;
-    float startY = 32.0f * s; 
+    float startX = g_runtime.InfoPanelX * s;
+    float startY = g_runtime.InfoPanelY * s;
 
     if (g_currentMetadata.HasGPS) height += 50.0f * s;
     if (g_runtime.InfoPanelExpanded && !g_currentMetadata.HistL.empty()) height += 100.0f * s;
 
     D2D1_RECT_F panelRect = D2D1::RectF(startX, startY, startX + width, startY + height);
+    m_lastInfoPanelRect = panelRect;
 
     // [Geek Glass] Panel Background Render
     QuickView::UI::GeekGlass::GeekGlassConfig glassConfig;

QuickView/UIRenderer.h

@@ -64,7 +64,8 @@ enum class UIHitResult {
     GPSLink,        // Click to open in Maps
     InfoRow,        // Click to copy row content
     HudToggleLite,  // Click to toggle HUD Lite mode
-    HudToggleExpand // Click to toggle HUD Expand mode
+    HudToggleExpand,// Click to toggle HUD Expand mode
+    InfoPanelDrag   // Drag to move Info Panel
 };
 
 // Window Controls Hit Test Result
@@ -140,6 +141,8 @@ class UIRenderer {
     // ===== Hit Testing (For Click Detection) =====
     HitTestResult HitTest(float x, float y);
 
+    float GetUIScale() const { return m_uiScale; }
+
     // ===== Accessors for Hit Rects =====
     D2D1_RECT_F GetPanelToggleRect() const { return m_panelToggleRect; }
     D2D1_RECT_F GetPanelCloseRect() const { return m_panelCloseRect; }
@@ -263,6 +266,7 @@ class UIRenderer {
     std::vector<D2D1_RECT_F> m_compareRowRects; // Track individual row rects in Compare HUD
     D2D1_RECT_F m_hudToggleLiteRect = {}; // Track HUD lite mode icon area
     D2D1_RECT_F m_hudToggleExpandRect = {}; // Track HUD expand mode icon area
+    D2D1_RECT_F m_lastInfoPanelRect = {};   // Cached bounds of the Info Panel
 
     // Grid Layout Constants
     static constexpr float GRID_ICON_WIDTH = 16.0f;

QuickView/main.cpp

@@ -8078,6 +8078,28 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
      // Mouse Interaction
      case WM_MOUSEMOVE: {
           g_currentCursor = LoadCursor(nullptr, IDC_ARROW);
+          if (g_viewState.IsDraggingInfoPanel) {
+              POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) };
+              int dx = pt.x - g_viewState.InfoPanelDragAnchor.x;
+              int dy = pt.y - g_viewState.InfoPanelDragAnchor.y;
+
+              if (dx != 0 || dy != 0) {
+                  float s = g_uiRenderer ? g_uiRenderer->GetUIScale() : 1.0f;
+                  g_runtime.InfoPanelX += dx / s;
+                  g_runtime.InfoPanelY += dy / s;
+
+                  // Keep it visible on screen (approx boundaries)
+                  RECT rc; GetClientRect(hwnd, &rc);
+                  float maxW = rc.right / s;
+                  float maxH = rc.bottom / s;
+                  g_runtime.InfoPanelX = std::max(0.0f, std::min(g_runtime.InfoPanelX, maxW - 50.0f));
+                  g_runtime.InfoPanelY = std::max(0.0f, std::min(g_runtime.InfoPanelY, maxH - 50.0f));
+
+                  g_viewState.InfoPanelDragAnchor = pt;
+                  RequestRepaint(PaintLayer::Static);
+              }
+              return 0; // Handled
+          }
           if (g_viewState.IsDragging) {
               g_currentCursor = LoadCursor(nullptr, IDC_SIZEALL);
           } else if (g_config.EdgeNavClick && !g_gallery.IsVisible() && !g_settingsOverlay.IsVisible() && !g_helpOverlay.IsVisible() && !g_dialog.IsVisible) {
@@ -8925,6 +8947,12 @@ SKIP_EDGE_NAV:;
              auto hit = g_uiRenderer->HitTest((float)pt.x, (float)pt.y);
 
              switch (hit.type) {
+                 case UIHitResult::InfoPanelDrag:
+                     g_viewState.IsDraggingInfoPanel = true;
+                     g_viewState.InfoPanelDragAnchor = pt;
+                     SetCapture(hwnd);
+                     return 0;
+
                  case UIHitResult::PanelToggle:
                      g_runtime.InfoPanelExpanded = !g_runtime.InfoPanelExpanded;
                      if (g_runtime.InfoPanelExpanded && g_currentMetadata.HistR.empty() && !g_imagePath.empty()) {
@@ -9148,6 +9176,15 @@ SKIP_EDGE_NAV:;
             return 0;
         }
 
+        if (g_viewState.IsDraggingInfoPanel) {
+            g_viewState.IsDraggingInfoPanel = false;
+            ReleaseCapture();
+            g_config.InfoPanelX = g_runtime.InfoPanelX;
+            g_config.InfoPanelY = g_runtime.InfoPanelY;
+            SaveConfig();
+            return 0;
+        }
+
         if (g_viewState.IsPendingFullscreenExitDrag) {
             g_viewState.IsPendingFullscreenExitDrag = false;
             ReleaseCapture();