diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea78..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7d..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/QuickView.ico b/QuickView.ico deleted file mode 100644 index c3a5137b..00000000 Binary files a/QuickView.ico and /dev/null differ diff --git a/QuickView/AppStrings.h b/QuickView/AppStrings.h deleted file mode 100644 index 73b773f7..00000000 --- a/QuickView/AppStrings.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -/// -/// Centralized string resources for easy localization -/// -namespace AppStrings { - // OSD Messages - static const wchar_t* OSD_NoImage = L"No image loaded"; - static const wchar_t* OSD_Lossless = L"Lossless"; - static const wchar_t* OSD_ReencodedLossless = L"Re-encoded (Lossless)"; - static const wchar_t* OSD_EdgeAdapted = L"Edge Adapted"; - static const wchar_t* OSD_Reencoded = L"Re-encoded"; - static const wchar_t* OSD_ReadOnly = L"Access denied - file may be in use or read-only"; - static const wchar_t* OSD_NotPerfect = L"Transform is not perfect (Edge optimized)"; - - // Transform Action Names - static const wchar_t* Action_RotateCW = L"Rotate 90\x00B0 CW"; - static const wchar_t* Action_RotateCCW = L"Rotate 90\x00B0 CCW"; - static const wchar_t* Action_Rotate180 = L"Rotate 180\x00B0"; - static const wchar_t* Action_FlipH = L"Flip Horizontal"; - static const wchar_t* Action_FlipV = L"Flip Vertical"; - - // Dialog Strings - static const wchar_t* Dialog_SaveTitle = L"Save Changes?"; - static const wchar_t* Dialog_SaveContent = L"The image has been modified. Do you want to save changes?"; - static const wchar_t* Dialog_ButtonSave = L"Save"; - static const wchar_t* Dialog_ButtonSaveAs = L"Save As..."; - static const wchar_t* Dialog_ButtonDiscard = L"Discard"; - - // Checkbox Labels - static const wchar_t* Checkbox_AlwaysSaveLossless = L"Always save lossless transforms"; - static const wchar_t* Checkbox_AlwaysSaveEdgeAdapted = L"Always save edge-adapted"; - static const wchar_t* Checkbox_AlwaysSaveLossy = L"Always save re-encoded"; - - // HEIC Codec Missing - static const wchar_t* OSD_HEICCodecMissing = L"Cannot decode HEIC - Install HEVC Video Extension"; - static const wchar_t* Dialog_HEICTitle = L"Cannot decode HEIC"; - static const wchar_t* Dialog_HEICContent = L"Your system is missing the HEVC Video Extension.\nQuickView uses system hardware acceleration for best performance."; - static const wchar_t* Dialog_HEICGetExtension = L"Get Extension (Free)"; - static const wchar_t* Dialog_Cancel = L"Cancel"; -} diff --git a/QuickView/ContextMenu.cpp b/QuickView/ContextMenu.cpp deleted file mode 100644 index 79f0ba09..00000000 --- a/QuickView/ContextMenu.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "pch.h" -#include "ContextMenu.h" -#include -#include - -// ============================================================ -// ContextMenu.cpp - Right-click Context Menu Implementation -// ============================================================ - -void ShowContextMenu(HWND hwnd, POINT pt, bool hasImage, bool needsExtensionFix, bool isWindowLocked, bool showInfoPanel, bool alwaysOnTop, bool renderRaw, bool isRawFile) { - HMENU hMenu = CreatePopupMenu(); - if (!hMenu) return; - - // ======================================================== - // [Open & Edit] Group - // ======================================================== - AppendMenuW(hMenu, MF_STRING, IDM_OPEN, L"Open...\tCtrl+O"); - AppendMenuW(hMenu, hasImage ? MF_STRING : MF_GRAYED, IDM_OPENWITH_DEFAULT, L"Open With..."); - AppendMenuW(hMenu, MF_STRING, IDM_EDIT, L"Edit (Default App)\tE"); - AppendMenuW(hMenu, MF_STRING, IDM_SHOW_IN_EXPLORER, L"Show in Explorer\tEnter"); - AppendMenuW(hMenu, MF_SEPARATOR, 0, nullptr); - AppendMenuW(hMenu, MF_STRING, IDM_COPY_IMAGE, L"Copy Image\tCtrl+C"); - AppendMenuW(hMenu, MF_STRING, IDM_COPY_PATH, L"Copy Path\tCtrl+Alt+C"); - AppendMenuW(hMenu, MF_STRING, IDM_PRINT, L"Print\tCtrl+P"); - AppendMenuW(hMenu, MF_SEPARATOR, 0, nullptr); - - // ======================================================== - // [Transform] Submenu - // ======================================================== - HMENU hTransformMenu = CreatePopupMenu(); - AppendMenuW(hTransformMenu, MF_STRING, IDM_ROTATE_CW, L"Rotate +90\xB0\tR"); // \xB0 is degree symbol - AppendMenuW(hTransformMenu, MF_STRING, IDM_ROTATE_CCW, L"Rotate -90\xB0\tShift+R"); - AppendMenuW(hTransformMenu, MF_STRING, IDM_FLIP_H, L"Flip Horizontal\tH"); - AppendMenuW(hTransformMenu, MF_STRING, IDM_FLIP_V, L"Flip Vertical\tV"); - - AppendMenuW(hMenu, hasImage ? MF_POPUP : (MF_POPUP | MF_GRAYED), (UINT_PTR)hTransformMenu, L"Transform"); - - // ======================================================== - // [View] Submenu - // ======================================================== - HMENU hViewMenu = CreatePopupMenu(); - AppendMenuW(hViewMenu, MF_STRING, IDM_ZOOM_100, L"Actual Size (100%)\t1 / Z"); - AppendMenuW(hViewMenu, MF_STRING, IDM_ZOOM_FIT, L"Fit to Screen\t0 / F"); - AppendMenuW(hViewMenu, MF_STRING, IDM_ZOOM_IN, L"Zoom In\t+ / Ctrl +"); - AppendMenuW(hViewMenu, MF_STRING, IDM_ZOOM_OUT, L"Zoom Out\t- / Ctrl -"); - AppendMenuW(hViewMenu, MF_SEPARATOR, 0, nullptr); - AppendMenuW(hViewMenu, MF_STRING | (isWindowLocked ? MF_CHECKED : 0), IDM_LOCK_WINDOW_SIZE, L"Lock Window Size"); - AppendMenuW(hViewMenu, MF_STRING | (alwaysOnTop ? MF_CHECKED : 0), IDM_ALWAYS_ON_TOP, L"Always on Top\tCtrl+T"); - AppendMenuW(hViewMenu, MF_SEPARATOR, 0, nullptr); - AppendMenuW(hViewMenu, MF_STRING, IDM_HUD_GALLERY, L"HUD Gallery\tT"); - - // Check states: - // Lite Info -> showInfoPanel && !infoPanelExpanded - AppendMenuW(hViewMenu, MF_STRING, IDM_LITE_INFO, L"Lite Info Panel\tTab"); - AppendMenuW(hViewMenu, MF_STRING | (showInfoPanel ? MF_CHECKED : 0), IDM_SHOW_INFO_PANEL, L"Show Info Panel\tI"); - AppendMenuW(hViewMenu, MF_SEPARATOR, 0, nullptr); - - UINT rawFlags = MF_STRING; - if (!isRawFile) rawFlags |= MF_GRAYED; - if (renderRaw) rawFlags |= MF_CHECKED; - AppendMenuW(hViewMenu, rawFlags, IDM_RENDER_RAW, L"Render RAW"); - - AppendMenuW(hViewMenu, MF_STRING, IDM_FULLSCREEN, L"Fullscreen\tF11"); - - AppendMenuW(hMenu, MF_POPUP, (UINT_PTR)hViewMenu, L"View"); - - // Set as Wallpaper submenu - HMENU hWallpaperMenu = CreatePopupMenu(); - AppendMenuW(hWallpaperMenu, MF_STRING, IDM_WALLPAPER_FILL, L"Fill"); - AppendMenuW(hWallpaperMenu, MF_STRING, IDM_WALLPAPER_FIT, L"Fit"); - AppendMenuW(hWallpaperMenu, MF_STRING, IDM_WALLPAPER_TILE, L"Tile"); - AppendMenuW(hMenu, hasImage ? MF_POPUP : (MF_POPUP | MF_GRAYED), (UINT_PTR)hWallpaperMenu, L"Set as Wallpaper"); - - AppendMenuW(hMenu, MF_SEPARATOR, 0, nullptr); - - // ======================================================== - // [File Operations] Group - // ======================================================== - AppendMenuW(hMenu, hasImage ? MF_STRING : MF_GRAYED, IDM_RENAME, L"Rename\tF2"); - AppendMenuW(hMenu, (hasImage && needsExtensionFix) ? MF_STRING : MF_GRAYED, IDM_FIX_EXTENSION, L"Fix Extension"); - AppendMenuW(hMenu, hasImage ? MF_STRING : MF_GRAYED, IDM_DELETE, L"Delete\tDel"); - AppendMenuW(hMenu, MF_SEPARATOR, 0, nullptr); - - // ======================================================== - // [Settings] Group - // ======================================================== - AppendMenuW(hMenu, MF_STRING, IDM_SETTINGS, L"Settings..."); - AppendMenuW(hMenu, MF_STRING, IDM_ABOUT, L"About QuickView"); - AppendMenuW(hMenu, MF_STRING, IDM_EXIT, L"Exit\tMButton/Esc"); - - // Show menu - TrackPopupMenu(hMenu, TPM_RIGHTBUTTON | TPM_LEFTALIGN | TPM_TOPALIGN, - pt.x, pt.y, 0, hwnd, nullptr); - - DestroyMenu(hMenu); -} diff --git a/QuickView/ContextMenu.h b/QuickView/ContextMenu.h deleted file mode 100644 index 3ee52eb8..00000000 --- a/QuickView/ContextMenu.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once -// ============================================================ -// ContextMenu.h - Right-click Context Menu Definitions -// ============================================================ - -#include - -// ============================================================ -// Command IDs (WM_COMMAND wParam) -// ============================================================ -enum ContextMenuCommand : UINT { - // [打开 & 编辑] Group - IDM_OPEN = 1001, - IDM_OPENWITH_DEFAULT, - IDM_EDIT, // Open with default editor - IDM_SHOW_IN_EXPLORER, - IDM_COPY_IMAGE, - IDM_COPY_PATH, - IDM_PRINT, - - // [视图控制] Group - IDM_FULLSCREEN, - IDM_ZOOM_100, - IDM_ZOOM_FIT, // Lite - IDM_ZOOM_IN, - IDM_ZOOM_OUT, - IDM_LOCK_WINDOW_SIZE, - IDM_SHOW_INFO_PANEL, // Full - IDM_LITE_INFO, // Lite - IDM_ALWAYS_ON_TOP, - IDM_RENDER_RAW, // Sync with toolbar - IDM_HUD_GALLERY, - IDM_WALLPAPER_FILL, - IDM_WALLPAPER_FIT, - IDM_WALLPAPER_TILE, - - // [Transform] Group - IDM_ROTATE_CW, - IDM_ROTATE_CCW, - IDM_FLIP_H, - IDM_FLIP_V, - - // [文件操作] Group - IDM_RENAME, - IDM_FIX_EXTENSION, - IDM_DELETE, - - // [应用设置] Group - IDM_SETTINGS, - IDM_ABOUT, - IDM_EXIT, -}; - -/// -/// Show context menu at specified screen position -/// -/// Parent window handle -/// Screen coordinates for menu position -/// Whether an image is currently loaded -/// Whether extension fix is available -/// Whether window size is locked -/// Whether info panel is shown -/// Whether window is always on top -/// Whether Render RAW mode is active -/// Whether current file is RAW format -void ShowContextMenu(HWND hwnd, POINT pt, bool hasImage, bool needsExtensionFix, bool isWindowLocked, bool showInfoPanel, bool alwaysOnTop, bool renderRaw, bool isRawFile); diff --git a/QuickView/CoroutineTypes.h b/QuickView/CoroutineTypes.h deleted file mode 100644 index 940670a6..00000000 --- a/QuickView/CoroutineTypes.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once -#include -#include -#include -#include -#define WIN32_LEAN_AND_MEAN -#include - -// Simple Fire-and-Forget coroutine type for top-level calls (e.g. from event handlers) -struct FireAndForget { - struct promise_type { - FireAndForget get_return_object() { return {}; } - std::suspend_never initial_suspend() { return {}; } - std::suspend_never final_suspend() noexcept { return {}; } - void return_void() {} - void unhandled_exception() { std::terminate(); } // Verify: Real apps might want to log - }; -}; - -// Awaitable to switch to a background thread -struct ResumeBackground { - bool await_ready() const { return false; } - void await_suspend(std::coroutine_handle<> h) { - std::thread([h]() { h.resume(); }).detach(); - } - void await_resume() {} -}; - -// Helper to switch to main thread (requires HWND) -struct ResumeMainThread { - HWND m_hwnd; - ResumeMainThread(HWND hwnd) : m_hwnd(hwnd) {} - - bool await_ready() const { return false; } - void await_suspend(std::coroutine_handle<> h) { - // Post a custom message or use a thread-safe queue. - // For simplicity in this project, we can use PostMessage with a callback? - // Actually, Win32 message loop needs a way to execute this. - // Let's use a custom message WM_APP + 1 for "Execute Coroutine Handle" - PostMessage(m_hwnd, WM_APP + 1, 0, (LPARAM)h.address()); - } - void await_resume() {} -}; diff --git a/QuickView/EditState.h b/QuickView/EditState.h deleted file mode 100644 index 7bd952b7..00000000 --- a/QuickView/EditState.h +++ /dev/null @@ -1,107 +0,0 @@ -#pragma once -#include "pch.h" -#include "LosslessTransform.h" // For EditQuality enum - -// EditQuality enum definition moved to LosslessTransform.h - -/// -/// Current edit state for non-destructive editing -/// -struct EditState { - bool IsDirty = false; // Has unsaved changes - std::wstring TempFilePath; // Temp file path - std::wstring OriginalFilePath; // Original file path - EditQuality Quality = EditQuality::Lossless; - int TotalRotation = 0; // Cumulative rotation (0/90/180/270) - bool FlippedH = false; // Horizontal flip state - bool FlippedV = false; // Vertical flip state - - void Reset() { - IsDirty = false; - TempFilePath.clear(); - OriginalFilePath.clear(); // Fix: Clear original path on reset - TotalRotation = 0; - FlippedH = false; - FlippedV = false; - Quality = EditQuality::Lossless; - } - - /// - /// Get color for OSD based on edit quality - /// - D2D1_COLOR_F GetQualityColor() const { - switch (Quality) { - case EditQuality::Lossless: - case EditQuality::LosslessReenc: - return D2D1::ColorF(0.1f, 0.6f, 0.1f, 0.9f); // Green - case EditQuality::EdgeAdapted: - return D2D1::ColorF(0.7f, 0.5f, 0.0f, 0.9f); // Yellow/Orange - case EditQuality::Lossy: - return D2D1::ColorF(0.7f, 0.2f, 0.1f, 0.9f); // Red - default: - return D2D1::ColorF(0.3f, 0.3f, 0.3f, 0.9f); // Gray - } - } - - /// - /// Get quality description for OSD - /// - const wchar_t* GetQualityText() const { - switch (Quality) { - case EditQuality::Lossless: return L"Lossless"; - case EditQuality::LosslessReenc: return L"Re-encoded (Lossless)"; - case EditQuality::EdgeAdapted: return L"Edge Adapted"; - case EditQuality::Lossy: return L"Re-encoded"; - default: return L""; - } - } -}; - -enum class MouseAction { - None, WindowDrag, PanImage, ExitApp, FitWindow -}; - -/// -/// Application configuration (for future settings menu) -/// -struct AppConfig { - bool AutoSaveOnSwitch = false; // Auto-save when switching images - bool AlwaysSaveLossless = false; // Always save lossless transforms - bool AlwaysSaveEdgeAdapted = false; // Always save edge-adapted transforms - bool AlwaysSaveLossy = false; // Always save lossy transforms - bool ShowSavePrompt = true; // Show save prompt - float DialogAlpha = 0.95f; // OSD Dialog transparency - - // Interaction - bool ResizeWindowOnZoom = true; - bool RenderRAW = false; // Sync RAW preview state - MouseAction LeftDragAction = MouseAction::WindowDrag; - MouseAction MiddleDragAction = MouseAction::PanImage; - MouseAction MiddleClickAction = MouseAction::ExitApp; - bool AutoHideWindowControls = true; - - // View options - bool LockWindowSize = false; // Prevent window auto-resize - bool ShowInfoPanel = false; // Master Toggle - bool InfoPanelExpanded = false; // Compact vs Full - bool ForceRawDecode = false; // Force full RAW decoding (slower but high res) - bool AlwaysOnTop = false; // Window always on top - - /// - /// Should auto-save for given quality? - /// - bool ShouldAutoSave(EditQuality quality) const { - if (AutoSaveOnSwitch) return true; - switch (quality) { - case EditQuality::Lossless: - case EditQuality::LosslessReenc: - return AlwaysSaveLossless; - case EditQuality::EdgeAdapted: - return AlwaysSaveEdgeAdapted; - case EditQuality::Lossy: - return AlwaysSaveLossy; - default: - return false; - } - } -}; diff --git a/QuickView/FileNavigator.h b/QuickView/FileNavigator.h deleted file mode 100644 index 2ded2926..00000000 --- a/QuickView/FileNavigator.h +++ /dev/null @@ -1,102 +0,0 @@ -#pragma once -#include -#include -#include -#include -#include - -class FileNavigator { -public: - void Initialize(const std::wstring& currentPath) { - namespace fs = std::filesystem; - fs::path p(currentPath); - if (!fs::exists(p)) return; - - m_files.clear(); - m_currentIndex = -1; - - // Parent directory - fs::path dir = p.parent_path(); - if (dir.empty()) return; - - // Supported extensions (Basic list for now) - const std::vector extensions = { L".jpg", L".jpeg", L".png", L".webp", L".bmp", L".gif", L".heic", L".avif" }; - - try { - for (const auto& entry : fs::directory_iterator(dir)) { - if (entry.is_regular_file()) { - std::wstring ext = entry.path().extension().wstring(); - std::transform(ext.begin(), ext.end(), ext.begin(), [](wchar_t c){ return std::towlower(c); }); - - for (const auto& supp : extensions) { - if (ext == supp) { - m_files.push_back(entry.path().wstring()); - break; - } - } - } - } - } catch (...) {} - - // Natural Sort would be better, but lexicon is fine for start - std::sort(m_files.begin(), m_files.end()); - - // Find current index - std::wstring currentFull = p.wstring(); - for (size_t i = 0; i < m_files.size(); ++i) { - if (m_files[i] == currentFull) { - m_currentIndex = (int)i; - break; - } - } - } - - std::wstring Next() { - if (m_files.empty()) return L""; - m_currentIndex = (m_currentIndex + 1) % m_files.size(); - return m_files[m_currentIndex]; - } - - std::wstring Previous() { - if (m_files.empty()) return L""; - m_currentIndex = (m_currentIndex - 1 + m_files.size()) % m_files.size(); - return m_files[m_currentIndex]; - } - - std::wstring PeekNext() const { - if (m_files.empty()) return L""; - size_t nextIdx = (m_currentIndex + 1) % m_files.size(); - return m_files[nextIdx]; - } - - std::wstring PeekPrevious() const { - if (m_files.empty()) return L""; - size_t prevIdx = (m_currentIndex - 1 + m_files.size()) % m_files.size(); - return m_files[prevIdx]; - } - - // Status info - // Status info - size_t Count() const { return m_files.size(); } - int Index() const { return m_currentIndex; } - - // Random Access (For Gallery Virtualization) - const std::wstring& GetFile(int index) const { - static std::wstring empty; - if (index < 0 || index >= (int)m_files.size()) return empty; - return m_files[index]; - } - - int FindIndex(const std::wstring& path) const { - auto it = std::find(m_files.begin(), m_files.end(), path); - if (it != m_files.end()) return (int)std::distance(m_files.begin(), it); - return -1; - } - - const std::vector& GetAllFiles() const { return m_files; } - - -private: - std::vector m_files; - int m_currentIndex = -1; -}; diff --git a/QuickView/GalleryOverlay.cpp b/QuickView/GalleryOverlay.cpp deleted file mode 100644 index bb8e2fb5..00000000 --- a/QuickView/GalleryOverlay.cpp +++ /dev/null @@ -1,362 +0,0 @@ -#include "pch.h" -#include "GalleryOverlay.h" -#include "ThumbnailManager.h" -#include "FileNavigator.h" -#include -#include - -GalleryOverlay::GalleryOverlay() {} - -GalleryOverlay::~GalleryOverlay() {} - -void GalleryOverlay::Initialize(ThumbnailManager* pThumbMgr, FileNavigator* pNav) { - m_pThumbMgr = pThumbMgr; - m_pNav = pNav; -} - -void GalleryOverlay::Open(int currentIndex) { - if (!m_pNav || m_pNav->Count() == 0) return; - - m_isVisible = true; - m_opacity = 0.0f; // Start fade in - m_selectedIndex = currentIndex; - - // Smart Reveal: Calculate Scroll Top to center the current item - // We need layout info (cell width/height). But we might not have Render size yet. - // Assuming Render gets called soon. We can set target index and handle scrolling in Render? - // Or just estimating layout if we know window size. - // Let's defer exact scroll calculation to first Render if size is unknown? - // Actually, we can pre-calc if we assume full window. But Render passes size. - // Let's set a flag "FocusOnNextRender" or handle it in Render logic if first frame. - // For now, let's just do a best guess or force EnsureVisible logic in Render. - // Actually, OnPaint calls Render. -} - -void GalleryOverlay::Close() { - m_isVisible = false; - if (m_pThumbMgr) m_pThumbMgr->ClearQueue(); // Stop loading -} - -void GalleryOverlay::Update(float deltaTime) { - if (m_isVisible && m_opacity < 1.0f) { - m_opacity += deltaTime * 5.0f; // 0.2s fade in - if (m_opacity > 1.0f) m_opacity = 1.0f; - } -} - -void GalleryOverlay::EnsureVisible(int index) { - if (index < 0 || m_cellHeight <= 0) return; - - int row = index / m_cols; - float itemTop = PADDING + row * (m_cellHeight + GAP); - float itemBottom = itemTop + m_cellHeight; - - // Current Viewport - float viewTop = m_scrollTop; - float viewBottom = m_scrollTop + m_totalHeight; // Wait, m_totalHeight is content height. ViewHeight is screen height. - // We need screen height. - // Let's rely on Render to clamp. - // Here we just adjust m_scrollTop. - // We need D2D size here? - // Let's store last known viewport height. -} - -// Helper to center crop -static D2D1_RECT_F GetCenterCropRect(D2D1_SIZE_F imgSize, D2D1_RECT_F destRect) { - float imgRatio = imgSize.width / imgSize.height; - float destW = destRect.right - destRect.left; - float destH = destRect.bottom - destRect.top; - float destRatio = destW / destH; - - D2D1_RECT_F srcRect; - if (imgRatio > destRatio) { - // Image is wider, crop sides - float scale = imgSize.height / destH; - float cropW = destW * scale; - float offset = (imgSize.width - cropW) / 2.0f; - srcRect = D2D1::RectF(offset, 0, offset + cropW, imgSize.height); - } else { - // Image is taller, crop top/bottom - float scale = imgSize.width / destW; - float cropH = destH * scale; - float offset = (imgSize.height - cropH) / 2.0f; - srcRect = D2D1::RectF(0, offset, imgSize.width, offset + cropH); - } - return srcRect; -} - -void GalleryOverlay::Render(ID2D1DeviceContext* pDC, const D2D1_SIZE_F& size) { - if (!m_isVisible || !m_pThumbMgr || !m_pNav) return; - - // Init resources - if (!m_brushBg) pDC->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.85f), &m_brushBg); - if (!m_brushSelection) pDC->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::DodgerBlue), &m_brushSelection); // Accent - if (!m_brushText) pDC->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &m_brushText); - - // Background - D2D1_RECT_F screenRect = D2D1::RectF(0, 0, size.width, size.height); - m_brushBg->SetOpacity(m_opacity * 0.85f); - pDC->FillRectangle(screenRect, m_brushBg.Get()); - - // Init Text Resources (Lazy) - if (!m_dwriteFactory) { - DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast(m_dwriteFactory.GetAddressOf())); - } - if (m_dwriteFactory && !m_textFormat) { - m_dwriteFactory->CreateTextFormat(L"Consolas", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &m_textFormat); - m_dwriteFactory->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 20.0f, L"en-us", &m_textFormatOSD); - } - - size_t count = m_pNav->Count(); - if (count == 0) return; - - // Layout Calculation - float availWidth = size.width - PADDING * 2; - // Calculate cols: Adaptive. Min 180px per col. - m_cols = std::max(1, (int)(availWidth / (THUMB_SIZE_MIN + GAP))); - - // Refine cell width to fill space - // availWidth = cols * w + (cols-1) * gap - m_cellWidth = (availWidth - (m_cols - 1) * GAP) / m_cols; - m_cellHeight = m_cellWidth * 0.75f; // 4:3 Aspect (User suggested 1:1 or 4:3. 4:3 is nice for photo) - // Actually user said "Square (1:1) or 4:3". Let's use 1:1 for "Geek" look (Square Grid) - m_cellHeight = m_cellWidth; - - int rows = (int)((count + m_cols - 1) / m_cols); - m_totalHeight = PADDING * 2 + rows * (m_cellHeight + GAP) - GAP; - m_maxScroll = std::max(0.0f, m_totalHeight - size.height); - - // Smart Reveal (First Frame Logic) - static bool firstFrame = true; // Use member if re-opening needs this. m_opacity < 0.1f implies just opened. - if (m_opacity < 0.2f && m_selectedIndex >= 0) { // Approx first few frames - int row = m_selectedIndex / m_cols; - float targetY = PADDING + row * (m_cellHeight + GAP); - // Center it - m_scrollTop = targetY - size.height / 2.0f + m_cellHeight / 2.0f; - // Clamp - if (m_scrollTop < 0) m_scrollTop = 0; - if (m_scrollTop > m_maxScroll) m_scrollTop = m_maxScroll; - } - - // Virtualization Range - // Visible Y range: m_scrollTop to m_scrollTop + size.height - int startRow = std::max(0, (int)((m_scrollTop - PADDING) / (m_cellHeight + GAP))); - int endRow = std::min(rows - 1, (int)((m_scrollTop + size.height - PADDING) / (m_cellHeight + GAP)) + 1); - - int startIdx = startRow * m_cols; - int endIdx = std::min((int)count - 1, (endRow + 1) * m_cols - 1); - - int centerIdx = (startIdx + endIdx) / 2; - - // Notify Manager to clear old tasks - m_pThumbMgr->UpdateOptimizedPriority(startIdx, endIdx, centerIdx); - - pDC->SetTransform(D2D1::Matrix3x2F::Translation(0, -m_scrollTop)); - m_brushBg->SetOpacity(m_opacity); // Reset specific opacity for render? Back to 1 for content? - // Actually content opacity should match m_opacity. - - // Loop Visible Items - for (int i = startIdx; i <= endIdx; ++i) { - int r = i / m_cols; - int c = i % m_cols; - - float x = PADDING + c * (m_cellWidth + GAP); - float y = PADDING + r * (m_cellHeight + GAP); - D2D1_RECT_F cellRect = D2D1::RectF(x, y, x + m_cellWidth, y + m_cellHeight); - - // Selection Highlight - if (i == m_selectedIndex) { - D2D1_RECT_F highlight = D2D1::RectF(x-4, y-4, x+m_cellWidth+4, y+m_cellHeight+4); - pDC->FillRoundedRectangle(D2D1::RoundedRect(highlight, 4, 4), m_brushSelection.Get()); - } - - // Get Thumbnail - const std::wstring& path = m_pNav->GetFile(i); - auto bmp = m_pThumbMgr->GetThumbnail(i, path.c_str(), pDC); - - if (bmp) { - D2D1_SIZE_F bmpSize = bmp->GetSize(); - D2D1_RECT_F src = GetCenterCropRect(bmpSize, cellRect); - pDC->DrawBitmap(bmp.Get(), cellRect, m_opacity, D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, src); - } else { - // Placeholder (Gray Box) call QueueRequest - D2D1_COLOR_F color = D2D1::ColorF(0.2f, 0.2f, 0.2f, m_opacity); - ComPtr phBrush; - pDC->CreateSolidColorBrush(color, &phBrush); - pDC->FillRectangle(cellRect, phBrush.Get()); - - // Queue! (Priority based on distance to center) - int prio = std::abs(i - centerIdx); - m_pThumbMgr->QueueRequest(i, path.c_str(), prio); - - // Draw "Loading..." ? Optional. - } - - // Draw Info on Hover (User request) - if (m_hoverIndex == i && m_textFormat) { - // Draw Hover items on top of EVERYTHING? - // Actually inside loop is fine if z-order is managed, but tooltips should be top-most. - // We can defer drawing or just assume loop order (later items cover previous). - // But if I hover item 5, item 6 might overlap tooltip? - // Not if tooltip is drawn AFTER loop. - } - } - - // Draw Hover Tooltip (Top-most) - if (m_hoverIndex >= startIdx && m_hoverIndex <= endIdx) { // Visible check - int r = m_hoverIndex / m_cols; - int c = m_hoverIndex % m_cols; - float x = PADDING + c * (m_cellWidth + GAP); - float y = PADDING + r * (m_cellHeight + GAP); - - ThumbnailManager::ImageInfo info = m_pThumbMgr->GetImageInfo(m_hoverIndex); - std::wstring path = m_pNav->GetFile(m_hoverIndex); - size_t lastSlash = path.find_last_of(L"\\/"); - std::wstring filename = (lastSlash != std::wstring::npos) ? path.substr(lastSlash + 1) : path; - - std::wstring desc = filename + L"\n"; - if (info.isValid) { - desc += std::to_wstring(info.origWidth) + L" x " + std::to_wstring(info.origHeight) + L"\n"; - desc += std::to_wstring(info.fileSize / 1024) + L" KB"; - } else { - desc += L"Loading..."; - } - - // Measure text rough layout - float tooltipW = 200.0f; - float tooltipH = 60.0f; // Approx - - D2D1_RECT_F tooltipRect = D2D1::RectF(x + 10, y + 10, x + 10 + tooltipW, y + 10 + tooltipH); - - // Ensure inside screen (optional, skipping for brevity) - - m_brushBg->SetOpacity(0.9f); - pDC->FillRoundedRectangle(D2D1::RoundedRect(tooltipRect, 4, 4), m_brushBg.Get()); - - m_brushText->SetOpacity(1.0f); - pDC->DrawText(desc.c_str(), (UINT32)desc.length(), m_textFormat.Get(), - D2D1::RectF(tooltipRect.left + 5, tooltipRect.top + 5, tooltipRect.right - 5, tooltipRect.bottom - 5), - m_brushText.Get()); - } - - pDC->SetTransform(D2D1::Matrix3x2F::Identity()); -} - -bool GalleryOverlay::OnMouseWheel(int delta) { - if (!m_isVisible) return false; - float scrollSpeed = 60.0f; // Pixels per detent - m_scrollTop -= (delta / 120.0f) * scrollSpeed * 3.0f; // 3x speed for "Smooth/Fast" feel - - if (m_scrollTop < 0) m_scrollTop = 0; - if (m_scrollTop > m_maxScroll) m_scrollTop = m_maxScroll; - return true; -} - -bool GalleryOverlay::OnKeyDown(UINT key) { - if (!m_isVisible) return false; - - switch (key) { - case VK_ESCAPE: - case 'T': - Close(); - return true; - - case VK_RETURN: - if (m_selectedIndex >= 0) Close(); // Main window should pick up selected index from Navigator? - // Wait, we need to sync Navigator! - // Close() checks m_selectedIndex but we need access to change Navigator index. - // Navigator doesn't allow setting arbitrary index easily? - // FileNavigator::Initialize(path)? - // Or add FileNavigator::SetIndex? - // The user plan said "Close and jump". - // We should ensure Navigator is updated. - return true; - - case VK_LEFT: m_selectedIndex = std::max(0, m_selectedIndex - 1); break; - case VK_RIGHT: m_selectedIndex = std::min((int)m_pNav->Count() - 1, m_selectedIndex + 1); break; - case VK_UP: m_selectedIndex = std::max(0, m_selectedIndex - m_cols); break; - case VK_DOWN: m_selectedIndex = std::min((int)m_pNav->Count() - 1, m_selectedIndex + m_cols); break; - - case VK_PRIOR: // PgUp - m_selectedIndex = std::max(0, m_selectedIndex - m_cols * 5); // Jump 5 rows - break; - case VK_NEXT: // PgDown - m_selectedIndex = std::min((int)m_pNav->Count() - 1, m_selectedIndex + m_cols * 5); - break; - - case VK_HOME: m_selectedIndex = 0; break; - case VK_END: m_selectedIndex = (int)m_pNav->Count() - 1; break; - } - - // Auto-scroll to selection - if (m_selectedIndex >= 0) { - int row = m_selectedIndex / m_cols; - float itemTop = PADDING + row * (m_cellHeight + GAP); - float itemBottom = itemTop + m_cellHeight; - - // Assume screen height (need to track it or guess) - // Best effort: we need to persist viewHeight to do this logic here. - // Let's assume OnMouseWheel/Render updates m_maxScroll logic using viewHeight, - // but we don't have it here. We can just invalidate and let specific EnsureVisible logic defined in Render/Update handle it? - // Or better: In Render, if selected is out of view, scroll to it? - // Let's implement simple "Scroll To Selection" in Render if input changed selection. - } - return true; -} - -bool GalleryOverlay::OnLButtonDown(int x, int y) { - if (!m_isVisible) return false; - int idx = HitTest((float)x, (float)y + m_scrollTop); // Adjust for scroll - if (idx >= 0) { - m_selectedIndex = idx; - Close(); // Confirm selection - return true; - } - // Click outside = Close? - Close(); - return true; -} - -bool GalleryOverlay::OnMouseMove(int x, int y) { - if (!m_isVisible) return false; - m_hoverIndex = HitTest((float)x, (float)y + m_scrollTop); - return true; // Consume? maybe not? -} - -int GalleryOverlay::HitTest(float x, float y) { - // Inverse of layout - // y = PADDING + r * (h + GAP) - // r = (y - PADDING) / (h + GAP) - if (x < PADDING || y < PADDING) return -1; - - float rowF = (y - PADDING) / (m_cellHeight + GAP); - float colF = (x - PADDING) / (m_cellWidth + GAP); - - int r = (int)rowF; - int c = (int)colF; - - // Check gaps (fractional part) - float rowFrac = rowF - r; - float colFrac = colF - c; - - // If in gap (GAP is small, but strictly speaking) - // Just ignore gap precision for easier clicking? Or be strict. - // Strict is cleaner. - // GAP relative to total stride: - // Stride = Cell + GAP. - // If local pos within stride > Cell, it's gap. - - // Simpler check: Index - if (c >= m_cols) return -1; - - int index = r * m_cols + c; - if (index >= (int)m_pNav->Count()) return -1; - - // Check rect - float cellR = PADDING + c * (m_cellWidth + GAP) + m_cellWidth; - float cellB = PADDING + r * (m_cellHeight + GAP) + m_cellHeight; - - if (x > cellR || y > cellB) return -1; // In gap - - return index; -} diff --git a/QuickView/GalleryOverlay.h b/QuickView/GalleryOverlay.h deleted file mode 100644 index eb638086..00000000 --- a/QuickView/GalleryOverlay.h +++ /dev/null @@ -1,76 +0,0 @@ -#pragma once -#include "pch.h" -#include "ThumbnailManager.h" -#include "FileNavigator.h" - -// Forward declaration if needed, but we include headers. -// We need ID2D1DeviceContext - -class GalleryOverlay { -public: - GalleryOverlay(); - ~GalleryOverlay(); - - void Initialize(ThumbnailManager* pThumbMgr, FileNavigator* pNav); - - // Render the gallery overlay - void Render(ID2D1DeviceContext* pDC, const D2D1_SIZE_F& size); - - // Interaction - bool OnKeyDown(UINT key); // Returns true if handled - bool OnMouseWheel(int delta); - bool OnLButtonDown(int x, int y); - bool OnMouseMove(int x, int y); - - // State Control - void Open(int currentIndex); - void Close(); - bool IsVisible() const { return m_isVisible; } - float GetOpacity() const { return m_opacity; } - - // Returns selected index when closed via Enter/Click - int GetSelectedIndex() const { return m_selectedIndex; } - - // Animation tick (fade in) - void Update(float deltaTime); - -private: - ThumbnailManager* m_pThumbMgr = nullptr; - FileNavigator* m_pNav = nullptr; - - bool m_isVisible = false; - float m_opacity = 0.0f; // 0.0 - 1.0 (Fade in) - - // Scroll state - float m_scrollTop = 0.0f; - float m_maxScroll = 0.0f; - float m_targetScrollTop = 0.0f; // For smooth scroll if needed (simplified to direct scroll for now) - - // Layout - int m_cols = 6; - float m_cellWidth = 0.0f; - float m_cellHeight = 0.0f; // Square cells - float m_totalHeight = 0.0f; - - int m_selectedIndex = -1; - int m_hoverIndex = -1; - - // Constants - const float GAP = 12.0f; - const float PADDING = 40.0f; // Outer padding - const float THUMB_SIZE_MIN = 180.0f; // Adaptive sizing - - // Resources - ComPtr m_brushBg; - ComPtr m_brushSelection; - ComPtr m_brushText; - - // Text Rendering - ComPtr m_dwriteFactory; - ComPtr m_textFormat; // For Grid cells - ComPtr m_textFormatOSD; // For global stats - ComPtr m_brushTextBg; - - void EnsureVisible(int index); - int HitTest(float x, float y); -}; diff --git a/QuickView/ImageLoader.cpp b/QuickView/ImageLoader.cpp deleted file mode 100644 index 6f68fe99..00000000 --- a/QuickView/ImageLoader.cpp +++ /dev/null @@ -1,1978 +0,0 @@ -#include "pch.h" - -// NanoSVG -#pragma warning(push) -#pragma warning(disable: 4244) -#pragma warning(disable: 4702) -#define NANOSVG_IMPLEMENTATION -#define NANOSVGRAST_IMPLEMENTATION -#include "../third_party/nanosvg/nanosvg.h" -#include "../third_party/nanosvg/nanosvgrast.h" -#pragma warning(pop) -#include "ImageLoader.h" -#include // JXL -#include "WuffsLoader.h" -#include "StbLoader.h" -#include "TinyExrLoader.h" -#include -#include "PreviewExtractor.h" - -// Helper to detect format from file content (Magic Bytes) -static std::wstring DetectFormatFromContent(LPCWSTR filePath) { - // 1. Read first 16 bytes for Magic Number - uint8_t magic[16] = {0}; - bool magicRead = false; - { - HANDLE hFile = CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - if (hFile != INVALID_HANDLE_VALUE) { - DWORD bytesRead = 0; - if (ReadFile(hFile, magic, 16, &bytesRead, nullptr) && bytesRead >= 4) { - magicRead = true; - } - CloseHandle(hFile); - } - } - - if (!magicRead) return L"Unknown"; - - // Check JPEG: FF D8 FF - if (magic[0] == 0xFF && magic[1] == 0xD8 && magic[2] == 0xFF) return L"JPEG"; - - // Check PNG: 89 50 4E 47 - if (magic[0] == 0x89 && magic[1] == 0x50 && magic[2] == 0x4E && magic[3] == 0x47) return L"PNG"; - - // Check WebP: RIFF ... WEBP - if (magic[0] == 'R' && magic[1] == 'I' && magic[2] == 'F' && magic[3] == 'F' && - magic[8] == 'W' && magic[9] == 'E' && magic[10] == 'B' && magic[11] == 'P') return L"WebP"; - - // Check AVIF: ftypavif - if (magic[4] == 'f' && magic[5] == 't' && magic[6] == 'y' && magic[7] == 'p' && - magic[8] == 'a' && magic[9] == 'v' && magic[10] == 'i' && magic[11] == 'f') return L"AVIF"; - - // Check HEIC/HEIF: ftyp + brand - // Common brands: heic, heix, hevc, heim, heis, hevm, hevs, mif1, msf1 - if (magic[4] == 'f' && magic[5] == 't' && magic[6] == 'y' && magic[7] == 'p') { - // Check brand at offset 8 - if ((magic[8] == 'h' && magic[9] == 'e' && magic[10] == 'i' && (magic[11] == 'c' || magic[11] == 'x' || magic[11] == 's' || magic[11] == 'm')) || // heic, heix, heis, heim - (magic[8] == 'h' && magic[9] == 'e' && magic[10] == 'v' && (magic[11] == 'c' || magic[11] == 'm' || magic[11] == 's')) || // hevc, hevm, hevs - (magic[8] == 'm' && magic[9] == 'i' && magic[10] == 'f' && magic[11] == '1') || // mif1 - (magic[8] == 'm' && magic[9] == 's' && magic[10] == 'f' && magic[11] == '1')) // msf1 - { - return L"HEIC"; // Unified as HEIC/HEIF - } - } - - // Check JXL: FF 0A or 00 00 00 0C JXL - if (magic[0] == 0xFF && magic[1] == 0x0A) return L"JXL"; - if (magic[0] == 0x00 && magic[1] == 0x00 && magic[2] == 0x00 && magic[3] == 0x0C && - magic[4] == 'J' && magic[5] == 'X' && magic[6] == 'L' && magic[7] == ' ') return L"JXL"; - - // Check GIF: GIF87a or GIF89a - if (magic[0] == 'G' && magic[1] == 'I' && magic[2] == 'F' && magic[3] == '8' && - (magic[4] == '7' || magic[4] == '9') && magic[5] == 'a') return L"GIF"; - - // Check BMP: BM - if (magic[0] == 'B' && magic[1] == 'M') return L"BMP"; - - // Check PSD: 8BPS - if (magic[0] == '8' && magic[1] == 'B' && magic[2] == 'P' && magic[3] == 'S') return L"PSD"; - - // Check HDR: #?RADIANCE or #?RGBE - if (magic[0] == '#' && magic[1] == '?') return L"HDR"; - - // Check EXR: v/1\x01 (0x76 0x2f 0x31 0x01) - if (magic[0] == 0x76 && magic[1] == 0x2F && magic[2] == 0x31 && magic[3] == 0x01) return L"EXR"; - - // Check PIC: 0x53 0x80 ... - if (magic[0] == 0x53 && magic[1] == 0x80 && magic[2] == 0xF6 && magic[3] == 0x34) return L"PIC"; - - // Check PNM: P1-P7 - if (magic[0] == 'P' && magic[1] >= '1' && magic[1] <= '7') return L"PNM"; - - // Check QOI: qoif - if (magic[0] == 'q' && magic[1] == 'o' && magic[2] == 'i' && magic[3] == 'f') return L"QOI"; - - // Check PCX: 0x0A ... - if (magic[0] == 0x0A) return L"PCX"; - - // Check ICO: 00 00 01 00 - if (magic[0] == 0x00 && magic[1] == 0x00 && magic[2] == 0x01 && magic[3] == 0x00) return L"ICO"; - - // Check TIFF: II (49 49 2A 00) or MM (4D 4D 00 2A) - if (magic[0] == 0x49 && magic[1] == 0x49 && magic[2] == 0x2A && magic[3] == 0x00) return L"TIFF"; - if (magic[0] == 0x4D && magic[1] == 0x4D && magic[2] == 0x00 && magic[3] == 0x2A) return L"TIFF"; - - return L"Unknown"; -} - -HRESULT CImageLoader::Initialize(IWICImagingFactory* wicFactory) { - if (!wicFactory) return E_INVALIDARG; - m_wicFactory = wicFactory; - return S_OK; -} - -HRESULT CImageLoader::LoadFromFile(LPCWSTR filePath, IWICBitmapSource** bitmap) { - if (!filePath || !bitmap) return E_INVALIDARG; - - // Delegate to the new architecture (Detected Logic + Specialized Loaders + WIC Fallback) - IWICBitmap* pBitmap = nullptr; - std::wstring loaderName; // Optional, or ignore - - // We cast IWICBitmap** to IWICBitmapSource**? - // No, LoadToMemory returns IWICBitmap. We want IWICBitmapSource. - // IWICBitmap* supports IWICBitmapSource interface. - // But pointers are different? No, inheritance. - - // Actually LoadToMemory signature: - // HRESULT LoadToMemory(LPCWSTR filePath, IWICBitmap** ppBitmap, std::wstring* pLoaderName = nullptr); - - ComPtr ptrBitmap; - HRESULT hr = LoadToMemory(filePath, &ptrBitmap, nullptr); - - if (SUCCEEDED(hr)) { - *bitmap = ptrBitmap.Detach(); // Detach gives strictly the pointer. - return S_OK; - } - - return hr; -} - -#include - -// High-Performance Library Includes -// libpng REMOVED - replaced by Wuffs -#include // libwebp -#include -#include // libavif -#include // libjxl -#include -#include -#include // libraw - -#include -#include -#include -#include // For hardware_concurrency - -// Wuffs (Google's memory-safe decoder) -// Implementation is in WuffsImpl.cpp with selective module loading -#include "WuffsLoader.h" - -// Global storage for format details (set by loaders, read by main) -static std::wstring g_lastFormatDetails; - -// Helper to read file to vector -bool ReadFileToVector(LPCWSTR filePath, std::vector& buffer) { - HANDLE hFile = CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - if (hFile == INVALID_HANDLE_VALUE) return false; - - DWORD fileSize = GetFileSize(hFile, nullptr); - if (fileSize == INVALID_FILE_SIZE) { CloseHandle(hFile); return false; } - - buffer.resize(fileSize); - DWORD bytesRead; - BOOL result = ReadFile(hFile, buffer.data(), fileSize, &bytesRead, nullptr); - CloseHandle(hFile); - return result && bytesRead == fileSize; -} - -HRESULT CImageLoader::CreateWICBitmapFromMemory(UINT width, UINT height, REFGUID format, UINT stride, UINT size, BYTE* data, IWICBitmap** ppBitmap) { - if (!m_wicFactory) return E_FAIL; - return m_wicFactory->CreateBitmapFromMemory(width, height, format, stride, size, data, ppBitmap); -} - -// Standard JPEG luminance quantization table (Q=50) -static const int std_luminance_qtable[64] = { - 16, 11, 10, 16, 24, 40, 51, 61, - 12, 12, 14, 19, 26, 58, 60, 55, - 14, 13, 16, 24, 40, 57, 69, 56, - 14, 17, 22, 29, 51, 87, 80, 62, - 18, 22, 37, 56, 68, 109, 103, 77, - 24, 35, 55, 64, 81, 104, 113, 92, - 49, 64, 78, 87, 103, 121, 120, 101, - 72, 92, 95, 98, 112, 100, 103, 99 -}; - -// Estimate JPEG quality from quantization table in buffer -// Returns 0-100, or -1 if unable to parse -static int GetJpegQualityFromBuffer(const uint8_t* data, size_t size) { - if (!data || size < 20) return -1; - - // Search for DQT marker (0xFF, 0xDB) - for (size_t i = 0; i < size - 70; i++) { - if (data[i] == 0xFF && data[i + 1] == 0xDB) { - // Found DQT marker - size_t offset = i + 4; // Skip marker + length - if (offset + 64 >= size) return -1; - - // Read first 64 quantization values - int qtable[64]; - for (int j = 0; j < 64; j++) { - qtable[j] = data[offset + j]; - } - - // Calculate average scale compared to standard table - double total_scale = 0.0; - for (int j = 0; j < 64; j++) { - if (std_luminance_qtable[j] > 0) { - total_scale += (double)qtable[j] / std_luminance_qtable[j]; - } - } - double avg_scale = total_scale / 64.0; - - // Convert scale to quality (0-100) - int quality; - if (avg_scale <= 0.0) quality = 100; - else if (avg_scale >= 1.0) { - quality = (int)(50.0 / avg_scale); - } else { - quality = (int)(100.0 - (avg_scale * 50.0)); - } - - if (quality > 100) quality = 100; - if (quality < 1) quality = 1; - - return quality; - } - } - return -1; -} - -// ---------------------------------------------------------------------------- -// JPEG (libjpeg-turbo) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadJPEG(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector jpegBuf; - if (!ReadFileToVector(filePath, jpegBuf)) return E_FAIL; - - // Initialize TurboJPEG (Decompressor) - tjhandle tjInstance = tj3Init(TJINIT_DECOMPRESS); - if (!tjInstance) return E_FAIL; - - HRESULT hr = E_FAIL; - - // Parse header (TurboJPEG v3 API) - if (tj3DecompressHeader(tjInstance, jpegBuf.data(), jpegBuf.size()) == 0) { - - // Get dimensions from handle - int width = tj3Get(tjInstance, TJPARAM_JPEGWIDTH); - int height = tj3Get(tjInstance, TJPARAM_JPEGHEIGHT); - int jpegSubsamp = tj3Get(tjInstance, TJPARAM_SUBSAMP); - int jpegColorspace = tj3Get(tjInstance, TJPARAM_COLORSPACE); - - if (width > 0 && height > 0) { - // Decompress to BGRX (compatible with PBGRA/BGRA) - // Stride must be 4-byte aligned (width * 4 is always 4-byte aligned) - int pixelFormat = TJPF_BGRX; - int stride = width * 4; - size_t bufSize = (size_t)stride * height; - - std::vector pixelBuf(bufSize); - - if (tj3Decompress8(tjInstance, jpegBuf.data(), jpegBuf.size(), pixelBuf.data(), stride, pixelFormat) == 0) { - // Create WIC Bitmap from pixels - hr = CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppPBGRA, stride, (UINT)bufSize, pixelBuf.data(), ppBitmap); - - // Extract format details with quality estimation - if (SUCCEEDED(hr)) { - std::wstring subsamp; - switch (jpegSubsamp) { - case TJSAMP_444: subsamp = L"4:4:4"; break; - case TJSAMP_422: subsamp = L"4:2:2"; break; - case TJSAMP_420: subsamp = L"4:2:0"; break; - case TJSAMP_GRAY: subsamp = L"Gray"; break; - case TJSAMP_440: subsamp = L"4:4:0"; break; - default: subsamp = L""; break; - } - - // Estimate quality from quantization table - int quality = GetJpegQualityFromBuffer(jpegBuf.data(), jpegBuf.size()); - if (quality > 0) { - wchar_t buf[64]; - swprintf_s(buf, L"%s Q~%d", subsamp.c_str(), quality); - g_lastFormatDetails = buf; - } else { - g_lastFormatDetails = subsamp; - } - } - } - } - } - - tj3Destroy(tjInstance); - return hr; -} - -// ---------------------------------------------------------------------------- -// Step 2: Optimized Thumbnail Loading -// ---------------------------------------------------------------------------- - -HRESULT CImageLoader::LoadThumbJPEGFromMemory(const uint8_t* pBuf, size_t size, int targetSize, ThumbData* pData) { - if (!pData || !pBuf || size == 0) return E_INVALIDARG; - - tjhandle tj = tj3Init(TJINIT_DECOMPRESS); - if (!tj) return E_FAIL; - - // Helper to auto-destroy handle - struct TjGuard { tjhandle h; ~TjGuard() { if(h) tj3Destroy(h); } } guard{tj}; - - int width = 0, height = 0; - if (tj3DecompressHeader(tj, pBuf, size) < 0) { - return E_FAIL; - } - width = tj3Get(tj, TJPARAM_JPEGWIDTH); - height = tj3Get(tj, TJPARAM_JPEGHEIGHT); - pData->origWidth = width; - pData->origHeight = height; - pData->fileSize = size; - - if (width <= 0 || height <= 0) return E_FAIL; - - // Calculate Scaling Factor - int numFactors; - tjscalingfactor* factors = tj3GetScalingFactors(&numFactors); - tjscalingfactor chosenFactor = { 1, 1 }; - - // Find smallest factor that produces a dimension >= targetSize - int bestMetric = 999999; - for (int i = 0; i < numFactors; i++) { - int sW = TJSCALED(width, factors[i]); - int sH = TJSCALED(height, factors[i]); - // Ideally we want >= targetSize. - // If all are smaller, pick largest (1/1). - if (sW >= targetSize && sH >= targetSize) { - int metric = sW; - if (metric < bestMetric) { - bestMetric = metric; - chosenFactor = factors[i]; - } - } - } - - if (tj3SetScalingFactor(tj, chosenFactor) < 0) { - // Fallback to 1/1 - tjscalingfactor one = {1, 1}; - tj3SetScalingFactor(tj, one); - } - - int finalW = TJSCALED(width, chosenFactor); - int finalH = TJSCALED(height, chosenFactor); - - // Decode directly to target buffer - pData->width = finalW; - pData->height = finalH; - pData->stride = finalW * 4; - pData->pixels.resize(pData->stride * finalH); - - // Use TJPF_BGRA for D2D compatibility - // Note: TurboJPEG BGRA is straight alpha. If extracted thumb has no alpha (JPEG doesn't), it's opaque (A=255). - if (tj3Decompress8(tj, pBuf, size, pData->pixels.data(), pData->stride, TJPF_BGRA) < 0) { - return E_FAIL; - } - - pData->isValid = true; - return S_OK; -} - -HRESULT CImageLoader::LoadThumbWebPFromMemory(const uint8_t* pBuf, size_t size, int targetSize, ThumbData* pData) { - if (!pData || !pBuf || size == 0) return E_INVALIDARG; - - // Advanced API for threading + scaling support - WebPDecoderConfig config; - if (!WebPInitDecoderConfig(&config)) return E_FAIL; - - if (WebPGetFeatures(pBuf, size, &config.input) != VP8_STATUS_OK) return E_FAIL; - - int w = config.input.width; - int h = config.input.height; - pData->origWidth = w; - pData->origHeight = h; - pData->fileSize = size; - if (w <= 0 || h <= 0) return E_FAIL; - - // Calculate Ratio aiming for targetSize in smallest dimension (cover)? - // Or fit? - // TurboJPEG logic above tries to find a metric >= targetSize. - // Let's match typical scaler logic: Match one dimension to target size? - // Actually WebP scaling is arbitrary (unlike JPEG which is 1/2, 1/4, 1/8). - // So we can request exact size? - // WebP documentation says "scaled_width/height". - // "The output buffer will be scaled to these dimensions". - // So we can request exactly targetSize X something. - - // Let's compute exact target size maintaining aspect ratio. - float ratio = std::max((float)targetSize/w, (float)targetSize/h); - // If ratio >= 1.0 (Image smaller than target), keep original. - int newW, newH; - if (ratio >= 1.0f) { - newW = w; - newH = h; - } else { - newW = (int)(w * ratio); - newH = (int)(h * ratio); - if (newW < 1) newW = 1; - if (newH < 1) newH = 1; - } - - config.options.use_threads = 1; - config.options.use_scaling = 1; - config.options.scaled_width = newW; - config.options.scaled_height = newH; - config.options.no_fancy_upsampling = 1; // Speed up - config.output.colorspace = MODE_BGRA; // Direct BGRA - - // Decode - if (WebPDecode(pBuf, size, &config) != VP8_STATUS_OK) { - WebPFreeDecBuffer(&config.output); - return E_FAIL; - } - - // Copy/Move to ThumbData - // We could have decoded directly to pData->pixels if we resized it first and used external memory. - // But stride handling: WebP stride might differ? - // config.output.u.RGBA.stride usually is width*4 for MODE_BGRA. - - uint8_t* output = config.output.u.RGBA.rgba; - int stride = config.output.u.RGBA.stride; - int dataSize = config.output.u.RGBA.size; - - pData->width = newW; - pData->height = newH; - pData->stride = newW * 4; // Our target stride - - if (stride == pData->stride) { - pData->pixels.assign(output, output + dataSize); - } else { - // Copy row by row - pData->pixels.resize(pData->stride * newH); - for(int y=0; ypixels.data() + y * pData->stride; - memcpy(dst, src, std::min(stride, pData->stride)); - } - } - - pData->isValid = true; - WebPFreeDecBuffer(&config.output); - return S_OK; -} - -HRESULT CImageLoader::LoadThumbJPEG(LPCWSTR filePath, int targetSize, ThumbData* pData) { - if (!pData) return E_INVALIDARG; - - std::vector jpegBuf; - if (!ReadFileToVector(filePath, jpegBuf)) return E_FAIL; - - return LoadThumbJPEGFromMemory(jpegBuf.data(), jpegBuf.size(), targetSize, pData); -} - -HRESULT CImageLoader::LoadThumbnail(LPCWSTR filePath, int targetSize, ThumbData* pData) { - if (!pData) return E_INVALIDARG; - pData->isValid = false; - - // Get file size (cheap) - // Actually we iterate file path anyway. But if we read to vector, we know size. - // If we use WIC, we might not know size unless we query file. - // Let's use std::filesystem for non-vector paths logic - // But most paths read vector. - - // Detect format - std::wstring format = DetectFormatFromContent(filePath); - - // 1. Optimized Path (JPEG) - if (format == L"JPEG") { - if (SUCCEEDED(LoadThumbJPEG(filePath, targetSize, pData))) { - return S_OK; - } - } else if (format == L"WebP") { - // 1b. Optimized WebP (Scaled & Multithreaded) - std::vector buf; - if (ReadFileToVector(filePath, buf)) { - if (SUCCEEDED(LoadThumbWebPFromMemory(buf.data(), buf.size(), targetSize, pData))) { - return S_OK; - } - } - } - - // 1b. Optimized Extraction (RAW / HEIC / PSD) via PreviewExtractor - // Check extension logic or format details? - // DetectFormatFromContent usually returns "RAW (ARW)" or "HEIC". - // Let's use extension check for speed first (since Detect might read file). - // Actually LoadThumbnail passed filePath. - - std::wstring ext = filePath; - size_t dot = ext.find_last_of(L'.'); - if (dot != std::wstring::npos) { - std::wstring e = ext.substr(dot); - std::transform(e.begin(), e.end(), e.begin(), ::towlower); - - bool tryExtract = false; - bool isRaw = (e == L".arw" || e == L".cr2" || e == L".nef" || e == L".dng" || e == L".orf" || e == L".rw2" || e == L".raf"); - bool isHeic = (e == L".heic" || e == L".heif" || e == L".avif"); // AVIF might not have exif thumb, but worth try? - bool isPsd = (e == L".psd" || e == L".psb"); - - if (isRaw || isHeic || isPsd) { - // Read file header/content - // Note: RAW/PSD extraction might need significant portion of file. - // For now, read whole file. (Memory Mapped would be better, but Read works). - std::vector buf; - if (ReadFileToVector(filePath, buf)) { - PreviewExtractor::ExtractedData exData; - bool extracted = false; - - if (isRaw) extracted = PreviewExtractor::ExtractFromRAW(buf.data(), buf.size(), exData); - else if (isHeic) extracted = PreviewExtractor::ExtractFromHEIC(buf.data(), buf.size(), exData); - else if (isPsd) extracted = PreviewExtractor::ExtractFromPSD(buf.data(), buf.size(), exData); - - if (extracted && exData.IsValid()) { - // It's a JPEG buffer! - if (SUCCEEDED(LoadThumbJPEGFromMemory(exData.pData, exData.size, targetSize, pData))) { - // For extracted previews, we might not know the FULL RAW dimensions here unless parsed. - // However, preview dimensions (pData->origWidth) are set by LoadThumbJPEGFromMemory. - // That's the preview dimension, not RAW dimension. - // User might want RAW dimension. - // But getting RAW dimension requires parsing TIFF/HEIC headers fully. - // PreviewExtractor might have that info? - // For now, let's accept Preview Size or File Size. - // But File Size should be the RAW file size. - // buf.size() is the RAW file size. - pData->fileSize = buf.size(); - return S_OK; - } - } - } - } - } - - // 2. Fallback Path (WIC Scaler for everything else) - - // Fail Fast: Check Dimensions to prevent OOM on massive files (e.g. 20k x 20k) - // Only needed for fallback path which likely does full decode. - { - ComPtr decoder; - // Used GENERIC_READ. WIC Decoder is fast (reads header only). - if (SUCCEEDED(m_wicFactory->CreateDecoderFromFilename(filePath, nullptr, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder))) { - ComPtr frame; - if (SUCCEEDED(decoder->GetFrame(0, &frame))) { - UINT w = 0, h = 0; - frame->GetSize(&w, &h); - // Limit: 16384x16384 (268 MP). - // RGBA = 268 * 4 = 1GB per image. - // 1GB is too much for a thumbnail thread. - if (w > 16384 || h > 16384) { - return E_OUTOFMEMORY; - } - } - } - } - - ComPtr source; - // Use LoadFromFile to leverage specialized loaders where possible (e.g. Wuffs for PNG) - HRESULT hr = LoadFromFile(filePath, &source); - - if (FAILED(hr) || !source) return hr; - - // Scale - UINT origW, origH; - source->GetSize(&origW, &origH); - if (origW == 0 || origH == 0) return E_FAIL; - - // Compute ratio to fill targetSize (Center Crop style needs slightly larger coverage? - // Or just fit? Gallery uses Center Crop. So we should scale such that MIN(w,h) >= targetSize. - // Let's ensure both dims >= targetSize if possible, or at least one matches? - // Actually for center crop, we need the *smaller* dimension to be at least targetSize. - // wait, if we request targetSize, we usually mean the cell size. - // let's aim for the image covering targetSize x targetSize. - // So scale factor = max(targetSize/w, targetSize/h). - - double ratio = std::max((double)targetSize / origW, (double)targetSize / origH); - - UINT newW, newH; - if (ratio >= 1.0) { - // Image is smaller than thumbnail slot? Keep original (don't upscale bloat) - // Or upscale if needed? Let's just keep original effectively. - // Actually WIC Scaler handles upscaling too. - // For thumbnails, usually we are downscaling. - // If image is tiny, maybe just use it. - newW = origW; - newH = origH; - } else { - newW = (UINT)(origW * ratio); - newH = (UINT)(origH * ratio); - if (newW < 1) newW = 1; - if (newH < 1) newH = 1; - } - - // WIC Scaler - ComPtr scaler; - if (FAILED(m_wicFactory->CreateBitmapScaler(&scaler))) return E_FAIL; - - if (FAILED(scaler->Initialize(source.Get(), newW, newH, WICBitmapInterpolationModeFant))) return E_FAIL; - - // Format Converter (Ensure PBGRA/BGRA for D2D) - ComPtr converter; - if (FAILED(m_wicFactory->CreateFormatConverter(&converter))) return E_FAIL; - - // D2D prefers PBGRA usually, but we used BGRA for TurboJPEG. - // CreateBitmap functions usually accept both if specified correctly. - // Let's use PBGRA (Premultiplied BGRA) which works best with D2D alpha blending. - // TurboJPEG TJPF_BGRA is technically straight alpha (not premultiplied). - // D2D supports IgnoreAlpha or StraightAlpha via different flags, but PBGRA is standard. - // If JPG has no alpha, BGRA == PBGRA. So it's fine. - // But PNG might have alpha. WIC converter to PBGRA handles premultiplication. - - if (FAILED(converter->Initialize(scaler.Get(), GUID_WICPixelFormat32bppPBGRA, WICBitmapDitherTypeNone, nullptr, 0.f, WICBitmapPaletteTypeMedianCut))) return E_FAIL; - - // Copy to raw buffer - pData->width = newW; - pData->height = newH; - pData->stride = newW * 4; - pData->pixels.resize(pData->stride * newH); - - hr = converter->CopyPixels(nullptr, pData->stride, (UINT)pData->pixels.size(), pData->pixels.data()); - hr = converter->CopyPixels(nullptr, pData->stride, (UINT)pData->pixels.size(), pData->pixels.data()); - if (SUCCEEDED(hr)) { - pData->origWidth = origW; - pData->origHeight = origH; - // FileSize? - // Check file manually - WIN32_FILE_ATTRIBUTE_DATA fad; - if (GetFileAttributesEx(filePath, GetFileExInfoStandard, &fad)) { - pData->fileSize = (static_cast(fad.nFileSizeHigh) << 32) | fad.nFileSizeLow; - } - pData->isValid = true; - } - return hr; -} - -// LoadPNG REMOVED - replaced by LoadPngWuffs (Wuffs decoder) - -// ---------------------------------------------------------------------------- -// WebP (libwebp) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadWebP(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector webpBuf; - if (!ReadFileToVector(filePath, webpBuf)) return E_FAIL; - - // Advanced API for threading support - WebPDecoderConfig config; - if (!WebPInitDecoderConfig(&config)) return E_FAIL; - - // Enable multi-threaded decoding - config.options.use_threads = 1; - // Set output colorspace to BGRA (WIC compatible) - config.output.colorspace = MODE_BGRA; - - // Decode directly to buffer managed by WebP? - // No, standard flow is: - // 1. GetFeatures (to determine size) - // 2. Allocate buffer (optional, or let WebP do it) - // 3. Decode - - if (WebPGetFeatures(webpBuf.data(), webpBuf.size(), &config.input) != VP8_STATUS_OK) return E_FAIL; - - // Check dimensions - int width = config.input.width; - int height = config.input.height; - if (width == 0 || height == 0) return E_FAIL; - - // Decode - if (WebPDecode(webpBuf.data(), webpBuf.size(), &config) != VP8_STATUS_OK) { - WebPFreeDecBuffer(&config.output); - return E_FAIL; - } - - uint8_t* output = config.output.u.RGBA.rgba; - int stride = config.output.u.RGBA.stride; - int size = stride * height; - - HRESULT hr = CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppPBGRA, stride, size, output, ppBitmap); - - // Extract format details (VP8 = Lossy, VP8L/Lossless Flag = Lossless) - if (SUCCEEDED(hr)) { - // Check if lossless format (VP8L) - // WebP format: RIFF header + VP8/VP8L chunk - // VP8L signature: 0x2F at offset 15 (after RIFF+WEBP headers) - if (config.input.format == 2) { // VP8L = lossless - g_lastFormatDetails = L"Lossless"; - } else { - g_lastFormatDetails = L"Lossy"; - } - if (config.input.has_alpha) g_lastFormatDetails += L" +Alpha"; - } - - WebPFreeDecBuffer(&config.output); - return hr; -} - -// ---------------------------------------------------------------------------- -// AVIF (libavif + dav1d) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadAVIF(LPCWSTR filePath, IWICBitmap** ppBitmap) { - if (!filePath || !ppBitmap) return E_INVALIDARG; - - // Read file to memory buffer - std::vector avifBuf; - if (!ReadFileToVector(filePath, avifBuf)) return E_FAIL; - - // Create Decoder - avifDecoder* decoder = avifDecoderCreate(); - if (!decoder) return E_OUTOFMEMORY; - - // Enable multi-threaded decoding - // Use hardware_concurrency() to maximize throughput on multi-core CPUs - unsigned int threads = std::thread::hardware_concurrency(); - if (threads > 0) { - decoder->maxThreads = threads; - } else { - decoder->maxThreads = 4; // Fallback sensible default - } - - // Set Memory Source - avifResult result = avifDecoderSetIOMemory(decoder, avifBuf.data(), avifBuf.size()); - if (result != AVIF_RESULT_OK) { - avifDecoderDestroy(decoder); - return E_FAIL; - } - - // Parse - result = avifDecoderParse(decoder); - if (result != AVIF_RESULT_OK) { - avifDecoderDestroy(decoder); - return E_FAIL; - } - - // Next Image (Frame 0) - result = avifDecoderNextImage(decoder); - if (result != AVIF_RESULT_OK) { - avifDecoderDestroy(decoder); - return E_FAIL; - } - - // Convert YUV to RGB - avifRGBImage rgb; - avifRGBImageSetDefaults(&rgb, decoder->image); - - // Configure for WIC (BGRA, 8-bit) - rgb.format = AVIF_RGB_FORMAT_BGRA; - rgb.depth = 8; - - // Calculate stride and size - // Note: libavif might want to allocate its own pixels or proper stride - // Let's allocate our own buffer for safety and control - rgb.rowBytes = rgb.width * 4; - std::vector pixelData(rgb.rowBytes * rgb.height); - rgb.pixels = pixelData.data(); - - result = avifImageYUVToRGB(decoder->image, &rgb); - if (result != AVIF_RESULT_OK) { - avifDecoderDestroy(decoder); - return E_FAIL; - } - - // Create WIC Bitmap - HRESULT hr = CreateWICBitmapFromMemory(rgb.width, rgb.height, GUID_WICPixelFormat32bppPBGRA, (UINT)rgb.rowBytes, (UINT)pixelData.size(), pixelData.data(), ppBitmap); - - // Extract format details (bit depth) - if (SUCCEEDED(hr)) { - int depth = decoder->image->depth; - wchar_t buf[32]; - swprintf_s(buf, L"%d-bit", depth); - g_lastFormatDetails = buf; - if (decoder->image->alphaPlane != nullptr) g_lastFormatDetails += L" +Alpha"; - } - - avifDecoderDestroy(decoder); - return hr; -} - -// ---------------------------------------------------------------------------- -// JPEG XL (libjxl) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadJXL(LPCWSTR filePath, IWICBitmap** ppBitmap) { - if (!filePath || !ppBitmap) return E_INVALIDARG; - - std::vector jxlBuf; - if (!ReadFileToVector(filePath, jxlBuf)) return E_FAIL; - - // 1. Create Decoder and Runner - JxlDecoder* dec = JxlDecoderCreate(NULL); - if (!dec) return E_OUTOFMEMORY; - - // Use max threads (default to system CPU count) - void* runner = JxlResizableParallelRunnerCreate(NULL); - if (!runner) { - JxlDecoderDestroy(dec); - return E_OUTOFMEMORY; - } - - JxlDecoderSetParallelRunner(dec, JxlResizableParallelRunner, runner); - - // 2. Subscribe to events - if (JXL_DEC_SUCCESS != JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE)) { - JxlResizableParallelRunnerDestroy(runner); - JxlDecoderDestroy(dec); - return E_FAIL; - } - - // 3. Set Input - JxlDecoderSetInput(dec, jxlBuf.data(), jxlBuf.size()); - - JxlBasicInfo info; - JxlPixelFormat format = { 4, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0 }; // RGBA - - std::vector pixels; - HRESULT hr = E_FAIL; - - // 4. Decode Loop - for (;;) { - JxlDecoderStatus status = JxlDecoderProcessInput(dec); - - if (status == JXL_DEC_ERROR) { - hr = E_FAIL; - break; - } - else if (status == JXL_DEC_SUCCESS) { - hr = S_OK; - break; - } - else if (status == JXL_DEC_BASIC_INFO) { - if (JXL_DEC_SUCCESS != JxlDecoderGetBasicInfo(dec, &info)) { - hr = E_FAIL; break; - } - // Resize buffer - size_t stride = info.xsize * 4; - pixels.resize(stride * info.ysize); - } - else if (status == JXL_DEC_NEED_IMAGE_OUT_BUFFER) { - size_t bufferSize = pixels.size(); - JxlDecoderSetImageOutBuffer(dec, &format, pixels.data(), bufferSize); - } - else if (status == JXL_DEC_FULL_IMAGE) { - // Nothing to do, just continue - } - else { - // Unknown status or need more input (should not happen with full buffer) - // break; (Don't break, loop might need to continue) - } - } - - if (SUCCEEDED(hr)) { - // JXL outputs RGBA (by default assumption with 4 channels and standard). - // WIC needs a GUID. We use GUID_WICPixelFormat32bppRGBA. - // QuickView's RenderEngine might expect PBGRA. WIC FormatConverter usually runs after loading if needed (fallback uses it). - // BUT, CImageLoader::LoadToMemory returns a Bitmap. Main loop expects to Draw it. - // D2D CreateBitmapFromWicBitmap automatically converts if possible. - // So RGBA is fine. - hr = CreateWICBitmapFromMemory(info.xsize, info.ysize, GUID_WICPixelFormat32bppRGBA, info.xsize * 4, (UINT)pixels.size(), pixels.data(), ppBitmap); - } - - JxlResizableParallelRunnerDestroy(runner); - JxlDecoderDestroy(dec); - return hr; -} - -// ---------------------------------------------------------------------------- -// RAW (LibRaw) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadRaw(LPCWSTR filePath, IWICBitmap** ppBitmap, bool forceFullDecode) { - // Optimization: Try to load embedded JPEG preview first (FAST) - // Fallback: Full RAW decode (SLOW) - - std::vector rawBuf; - if (!ReadFileToVector(filePath, rawBuf)) return E_FAIL; - - LibRaw RawProcessor; - if (RawProcessor.open_buffer(rawBuf.data(), rawBuf.size()) != LIBRAW_SUCCESS) return E_FAIL; - - // 1. Try Unpack Thumbnail (Embedded Preview) - FASTEST - if (!forceFullDecode && RawProcessor.unpack_thumb() == LIBRAW_SUCCESS) { - int err = 0; - libraw_processed_image_t* thumb = RawProcessor.dcraw_make_mem_thumb(&err); - - if (thumb) { - if (thumb->type == LIBRAW_IMAGE_JPEG) { - // JPEG Thumbnail - ComPtr stream; - HRESULT hr = m_wicFactory->CreateStream(&stream); - if (SUCCEEDED(hr)) hr = stream->InitializeFromMemory(thumb->data, thumb->data_size); - - ComPtr decoder; - if (SUCCEEDED(hr)) hr = m_wicFactory->CreateDecoderFromStream(stream.Get(), nullptr, WICDecodeMetadataCacheOnDemand, &decoder); - - ComPtr frame; - if (SUCCEEDED(hr)) hr = decoder->GetFrame(0, &frame); - - ComPtr converter; - if (SUCCEEDED(hr)) hr = m_wicFactory->CreateFormatConverter(&converter); - if (SUCCEEDED(hr)) hr = converter->Initialize(frame.Get(), GUID_WICPixelFormat32bppPBGRA, WICBitmapDitherTypeNone, nullptr, 0.f, WICBitmapPaletteTypeMedianCut); - - if (SUCCEEDED(hr)) { - hr = m_wicFactory->CreateBitmapFromSource(converter.Get(), WICBitmapCacheOnLoad, ppBitmap); - } - - if (SUCCEEDED(hr)) { - RawProcessor.dcraw_clear_mem(thumb); - return hr; // Success with JPEG Preview! - } - } else if (thumb->type == LIBRAW_IMAGE_BITMAP) { - // Bitmap Thumbnail (RGB) - if (thumb->bits == 8 && thumb->colors == 3) { - UINT width = thumb->width; - UINT height = thumb->height; - UINT stride = width * 3; - HRESULT hr = CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat24bppRGB, stride, thumb->data_size, thumb->data, ppBitmap); - if (SUCCEEDED(hr)) { - RawProcessor.dcraw_clear_mem(thumb); - return hr; // Success with Bitmap Preview! - } - } - } - RawProcessor.dcraw_clear_mem(thumb); - } - } - - // 2. Fallback: Full Decode (Slow) - // Optimization: Disable Auto WB (slow), use Camera WB - RawProcessor.imgdata.params.use_camera_wb = 1; - RawProcessor.imgdata.params.use_auto_wb = 0; // Speed up - RawProcessor.imgdata.params.user_qual = 2; // 0=Linear(fast), 2=AHD(good), 3=AHD+Interpolation - - // If you want extreme speed at cost of resolution, uncomment: - // RawProcessor.imgdata.params.half_size = 1; - - if (RawProcessor.unpack() != LIBRAW_SUCCESS) return E_FAIL; - if (RawProcessor.dcraw_process() != LIBRAW_SUCCESS) return E_FAIL; - - libraw_processed_image_t* image = RawProcessor.dcraw_make_mem_image(); - if (!image) return E_FAIL; - - HRESULT hr = E_FAIL; - - if (image->type == LIBRAW_IMAGE_BITMAP) { - if (image->bits == 8 && image->colors == 3) { - UINT width = image->width; - UINT height = image->height; - UINT stride = width * 3; - hr = CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat24bppRGB, stride, image->data_size, image->data, ppBitmap); - } - } - - RawProcessor.dcraw_clear_mem(image); - return hr; -} - -HRESULT CImageLoader::LoadToMemory(LPCWSTR filePath, IWICBitmap** ppBitmap, std::wstring* pLoaderName, bool forceFullDecode) { - if (!filePath || !ppBitmap) return E_INVALIDARG; - - // Clear previous format details to avoid residue when switching formats - g_lastFormatDetails.clear(); - - std::wstring path = filePath; - std::transform(path.begin(), path.end(), path.begin(), ::towlower); - - // ------------------------------------------------------------- - // Architecture Upgrade: Robust Format Detection & Fallback - // ------------------------------------------------------------- - - // 1. Detect Format - std::wstring detectedFmt = DetectFormatFromContent(filePath); - - // ------------------------------------------------------------- - // Architecture Upgrade: Priority-Based Loading - // ------------------------------------------------------------- - - // 1. High-Performance Special Format Loaders (Bypass WIC) - if (detectedFmt == L"JPEG") { - HRESULT hr = LoadJPEG(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"libjpeg-turbo"; return S_OK; } - } - else if (detectedFmt == L"PNG") { - HRESULT hr = LoadPngWuffs(filePath, ppBitmap); // Wuffs is faster/safer - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs PNG"; return S_OK; } - } - else if (detectedFmt == L"WebP") { - HRESULT hr = LoadWebP(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"libwebp"; return S_OK; } - } - else if (detectedFmt == L"AVIF") { - HRESULT hr = LoadAVIF(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"libavif"; return S_OK; } - } - else if (detectedFmt == L"JXL") { - HRESULT hr = LoadJXL(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"libjxl"; return S_OK; } - } - else if (detectedFmt == L"GIF") { - HRESULT hr = LoadGifWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs GIF"; return S_OK; } - } - else if (detectedFmt == L"BMP") { - HRESULT hr = LoadBmpWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs BMP"; return S_OK; } - } - else if (detectedFmt == L"TGA") { - HRESULT hr = LoadTgaWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs TGA"; return S_OK; } - } - else if (detectedFmt == L"WBMP") { - HRESULT hr = LoadWbmpWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs WBMP"; return S_OK; } - } - else if (detectedFmt == L"PSD") { - HRESULT hr = LoadStbImage(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Stb Image (PSD)"; return S_OK; } - } - else if (detectedFmt == L"HDR") { - HRESULT hr = LoadStbImage(filePath, ppBitmap, true); // float - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Stb Image (HDR)"; return S_OK; } - } - else if (detectedFmt == L"PIC") { - HRESULT hr = LoadStbImage(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Stb Image (PIC)"; return S_OK; } - } - else if (detectedFmt == L"PNM") { - // Try Wuffs first (safer), fallback to Stb? Not needed, Wuffs covers well. - HRESULT hr = LoadNetpbmWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs NetPBM"; return S_OK; } - } - else if (detectedFmt == L"EXR") { - HRESULT hr = LoadTinyExrImage(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"TinyEXR"; return S_OK; } - } - else if (detectedFmt == L"SVG") { - HRESULT hr = LoadSVG(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"NanoSVG"; return S_OK; } - } - else if (detectedFmt == L"QOI") { - HRESULT hr = LoadQoiWuffs(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Wuffs QOI"; return S_OK; } - } - else if (detectedFmt == L"PCX") { - HRESULT hr = LoadPCX(filePath, ppBitmap); - if (SUCCEEDED(hr)) { if (pLoaderName) *pLoaderName = L"Custom PCX"; return S_OK; } - } - - // RAW Check (no magic bytes usually reliable, use extension + try) - if (detectedFmt == L"Unknown") { // Raw files often have no standard magic or complicated ones - // Check extension - if (path.ends_with(L".arw") || path.ends_with(L".cr2") || path.ends_with(L".nef") || - path.ends_with(L".dng") || path.ends_with(L".orf") || path.ends_with(L".rw2") || - path.ends_with(L".raf") || path.ends_with(L".pef") || path.ends_with(L".srw") || path.ends_with(L".cr3")) { - HRESULT hr = LoadRaw(filePath, ppBitmap, forceFullDecode); - if (SUCCEEDED(hr)) { - if (pLoaderName) *pLoaderName = forceFullDecode ? L"LibRaw (Full)" : L"LibRaw (Preview)"; - return S_OK; - } - } - } - - - // 3. Robust Fallback to WIC (Standard Loading) - if (pLoaderName) *pLoaderName = L"WIC (Fallback)"; - - // If High-Perf loader failed (e.g. malformed specific header, unsupported feature) OR format verified but unimplemented (stub), - // OR format unknown. - // --------------------------------------------------------- - - // 1. Load Lazy Source - ComPtr source; - // Note: Can't use this->LoadFromFile nicely if we want to avoid double-open, - // but LoadFromFile uses WIC factory directly. Let's just use the WIC path inline or call existing helper. - // Re-use existing WIC fallback logic: - - ComPtr decoder; - HRESULT hr = m_wicFactory->CreateDecoderFromFilename( - filePath, nullptr, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder - ); - if (FAILED(hr)) return hr; - - ComPtr frame; - hr = decoder->GetFrame(0, &frame); - if (FAILED(hr)) return hr; - - // 2. Convert to D2D Compatible Format (PBGRA32) - ComPtr converter; - hr = m_wicFactory->CreateFormatConverter(&converter); - if (FAILED(hr)) return hr; - - hr = converter->Initialize( - frame.Get(), // Use frame source - GUID_WICPixelFormat32bppPBGRA, - WICBitmapDitherTypeNone, - nullptr, - 0.f, - WICBitmapPaletteTypeMedianCut - ); - if (FAILED(hr)) return hr; - - // 3. Force Decode to Memory - return m_wicFactory->CreateBitmapFromSource( - converter.Get(), - WICBitmapCacheOnLoad, - ppBitmap - ); -} - -std::wstring CImageLoader::GetLastFormatDetails() const { - return g_lastFormatDetails; -} - -HRESULT CImageLoader::GetImageSize(LPCWSTR filePath, UINT* width, UINT* height) { - if (!filePath || !width || !height) return E_INVALIDARG; - - ComPtr bitmap; - HRESULT hr = LoadFromFile(filePath, &bitmap); - if (FAILED(hr)) return hr; - - return bitmap->GetSize(width, height); -} - -// ---------------------------------------------------------------------------- -// Wuffs PNG Decoder (Google's memory-safe decoder) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadPngWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector pngBuf; - if (!ReadFileToVector(filePath, pngBuf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodePNG(pngBuf.data(), pngBuf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs GIF Decoder (First frame only for now) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadGifWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector gifBuf; - if (!ReadFileToVector(filePath, gifBuf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeGIF(gifBuf.data(), gifBuf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs BMP Decoder -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadBmpWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeBMP(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs TGA Decoder -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadTgaWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeTGA(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs WBMP Decoder -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadWbmpWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeWBMP(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Stb Image Decoder (PSD, HDR, PIC, PNM) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadStbImage(LPCWSTR filePath, IWICBitmap** ppBitmap, bool floatFormat) { - // Read file to memory first (Solves Windows Unicode Path issues reliably) - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - int width = 0, height = 0, channels = 0; - std::vector pixelData; - - // Use Memory Loader - if (!StbLoader::LoadImageFromMemory(buf.data(), buf.size(), &width, &height, &channels, pixelData, floatFormat)) { - return E_FAIL; - } - - if (floatFormat) { - // HDR: Create float bitmap (128bpp RGBA Float) - size_t stride = width * 4 * sizeof(float); - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat128bppRGBAFloat, - (UINT)stride, (UINT)pixelData.size(), (BYTE*)pixelData.data(), ppBitmap); - } else { - // Standard 8-bit RGBA - // WIC prefers BGRA for 32bpp - // Swap R and B - uint8_t* p = pixelData.data(); - size_t pixelCount = (size_t)width * height; - for (size_t i = 0; i < pixelCount; i++) { - std::swap(p[i*4], p[i*4+2]); // Swap R and B - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)pixelData.size(), pixelData.data(), ppBitmap); - } -} - -// ---------------------------------------------------------------------------- -// TinyEXR Decoder -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadTinyExrImage(LPCWSTR filePath, IWICBitmap** ppBitmap) { - // Read file to memory (Solves Path and Locking issues) - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - int width = 0, height = 0; - std::vector pixelData; - - // Use Memory Loader - if (!TinyExrLoader::LoadEXRFromMemory(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - // TinyEXR returns RGBA floats. - // Create WIC Bitmap (128bpp RGBA Float) - size_t stride = width * 4 * sizeof(float); - // Note: pixelData.size() is count of floats. Size in bytes is size() * sizeof(float). - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat128bppRGBAFloat, - (UINT)stride, (UINT)(pixelData.size() * sizeof(float)), (BYTE*)pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// NanoSVG Decoder (SVG Support) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadSVG(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector fileData; - if (!ReadFileToVector(filePath, fileData)) return E_FAIL; - - // NanoSVG parses char* string (null terminated recommended) - std::vector xmlData(fileData.begin(), fileData.end()); - xmlData.push_back('\0'); - - // Parse (96 DPI default units) - // Note: nsvgParse modifies the input string content during parsing (destructive) - NSVGimage* image = nsvgParse(xmlData.data(), "px", 96.0f); - if (!image) return E_FAIL; - - // Scale Logic: 2.0x for crisp rendering - float scale = 2.0f; - - // Safety size limit (e.g. 8k) - float maxDim = 8192.0f; - if (image->width * scale > maxDim || image->height * scale > maxDim) { - float aspect = image->width / image->height; - if (aspect > 1.0f) { - scale = maxDim / image->width; - } else { - scale = maxDim / image->height; - } - } - - int width = (int)(image->width * scale); - int height = (int)(image->height * scale); - - if (width <= 0 || height <= 0) { - nsvgDelete(image); - return E_FAIL; - } - - // Rasterize - NSVGrasterizer* rast = nsvgCreateRasterizer(); - if (!rast) { - nsvgDelete(image); - return E_OUTOFMEMORY; - } - - // NanoSVG generates RGBA (32-bit) - size_t stride = width * 4; - size_t size = stride * height; - std::vector imgData(size); - - nsvgRasterize(rast, image, 0, 0, scale, imgData.data(), width, height, (int)stride); - - nsvgDeleteRasterizer(rast); - nsvgDelete(image); - - // Create WIC Bitmap (GUID_WICPixelFormat32bppRGBA) - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppRGBA, - (UINT)stride, (UINT)size, imgData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs NetPBM (PAM, PBM, PGM, PPM) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadNetpbmWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeNetpbm(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)(stride * height), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Wuffs QOI (Quite OK Image) -// ---------------------------------------------------------------------------- -HRESULT CImageLoader::LoadQoiWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector buf; - if (!ReadFileToVector(filePath, buf)) return E_FAIL; - - uint32_t width = 0, height = 0; - std::vector pixelData; - - if (!WuffsLoader::DecodeQOI(buf.data(), buf.size(), &width, &height, pixelData)) { - return E_FAIL; - } - - size_t stride = width * 4; - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppBGRA, - (UINT)stride, (UINT)(stride * height), pixelData.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Custom PCX Decoder (Since stb_image lacks support) -// ---------------------------------------------------------------------------- -#pragma pack(push, 1) -struct PCXHeader { - uint8_t manufacturer; // 0x0A - uint8_t version; - uint8_t encoding; // 1 = RLE - uint8_t bitsPerPixel; - uint16_t xmin, ymin, xmax, ymax; - uint16_t hDpi, vDpi; - uint8_t palette[48]; - uint8_t reserved; - uint8_t colorPlanes; - uint16_t bytesPerLine; - uint16_t paletteType; - uint16_t hScreenSize, vScreenSize; - uint8_t filler[54]; -}; -#pragma pack(pop) - -HRESULT CImageLoader::LoadPCX(LPCWSTR filePath, IWICBitmap** ppBitmap) { - std::vector data; - if (!ReadFileToVector(filePath, data)) return E_FAIL; - - if (data.size() < sizeof(PCXHeader)) return E_FAIL; - - const PCXHeader* header = (const PCXHeader*)data.data(); - if (header->manufacturer != 0x0A) return E_FAIL; - if (header->encoding != 1) return E_FAIL; // Only RLE supported - - int width = header->xmax - header->xmin + 1; - int height = header->ymax - header->ymin + 1; - if (width <= 0 || height <= 0) return E_FAIL; - if (width > 32768 || height > 32768) return E_FAIL; - - // Decode RLE - size_t scanlineBytes = header->bytesPerLine * header->colorPlanes; - std::vector decodedBytes(scanlineBytes * height); - uint8_t* dst = decodedBytes.data(); - uint8_t* dstEnd = dst + decodedBytes.size(); - - const uint8_t* ptr = data.data() + 128; - const uint8_t* end = data.data() + data.size(); - - while (dst < dstEnd && ptr < end) { - uint8_t byte = *ptr++; - if ((byte & 0xC0) == 0xC0) { - uint8_t count = byte & 0x3F; - if (ptr >= end) break; - uint8_t val = *ptr++; - if (dst + count > dstEnd) count = (uint8_t)(dstEnd - dst); - memset(dst, val, count); - dst += count; - } else { - *dst++ = byte; - } - } - - // Convert to RGBA - std::vector rgba(width * height * 4); - - if (header->colorPlanes == 3 && header->bitsPerPixel == 8) { - // 24-bit RGB - for (int y = 0; y < height; y++) { - uint8_t* rowSrc = decodedBytes.data() + y * scanlineBytes; - uint8_t* rSrc = rowSrc; - uint8_t* gSrc = rowSrc + header->bytesPerLine; - uint8_t* bSrc = rowSrc + header->bytesPerLine * 2; - uint8_t* dstRow = rgba.data() + y * width * 4; - - for (int x = 0; x < width; x++) { - if (x < header->bytesPerLine) { - dstRow[x * 4 + 0] = rSrc[x]; - dstRow[x * 4 + 1] = gSrc[x]; - dstRow[x * 4 + 2] = bSrc[x]; - dstRow[x * 4 + 3] = 255; - } - } - } - } else if (header->colorPlanes == 1 && header->bitsPerPixel == 8) { - // 256 color palette (at end of file) - if (data.size() < 769) return E_FAIL; - const uint8_t* palPtr = data.data() + data.size() - 768; - - for (int y = 0; y < height; y++) { - uint8_t* rowSrc = decodedBytes.data() + y * scanlineBytes; - uint8_t* dstRow = rgba.data() + y * width * 4; - for (int x = 0; x < width; x++) { - if (x < header->bytesPerLine) { - uint8_t idx = rowSrc[x]; - dstRow[x * 4 + 0] = palPtr[idx * 3 + 0]; - dstRow[x * 4 + 1] = palPtr[idx * 3 + 1]; - dstRow[x * 4 + 2] = palPtr[idx * 3 + 2]; - dstRow[x * 4 + 3] = 255; - } - } - } - } else { - return E_FAIL; // Unsupported format - } - - return CreateWICBitmapFromMemory(width, height, GUID_WICPixelFormat32bppRGBA, - width * 4, width * height * 4, rgba.data(), ppBitmap); -} - -// ---------------------------------------------------------------------------- -// Metadata Implementation -// ---------------------------------------------------------------------------- - -#include -#include -#include -#pragma comment(lib, "propsys.lib") - -static HRESULT GetMetadataString(IWICMetadataQueryReader* reader, LPCWSTR query, std::wstring& out) { - if (!reader) return E_INVALIDARG; - PROPVARIANT val; PropVariantInit(&val); - HRESULT hr = reader->GetMetadataByName(query, &val); - if (SUCCEEDED(hr)) { - WCHAR buf[512] = {}; - if (SUCCEEDED(PropVariantToString(val, buf, 512))) { - out = buf; - } - PropVariantClear(&val); - } - return hr; -} - -static double DecodeRational(unsigned __int64 val) { - uint32_t num = (uint32_t)(val & 0xFFFFFFFF); - uint32_t den = (uint32_t)(val >> 32); - if (den == 0) return 0.0; - return (double)num / (double)den; -} - -static double DecodeSignedRational(unsigned __int64 val) { - // EXIF SRATIONAL: Low 32 bits = signed numerator, High 32 bits = signed denominator - int32_t num = (int32_t)(val & 0xFFFFFFFF); - int32_t den = (int32_t)(val >> 32); - if (den == 0) return 0.0; - return (double)num / (double)den; -} - -static HRESULT GetMetadataSignedRational(IWICMetadataQueryReader* reader, LPCWSTR query, double* out) { - if (!reader || !out) return E_INVALIDARG; - PROPVARIANT val; PropVariantInit(&val); - HRESULT hr = reader->GetMetadataByName(query, &val); - if (SUCCEEDED(hr)) { - if (val.vt == VT_UI8) { - *out = DecodeSignedRational(val.uhVal.QuadPart); - } else if (val.vt == VT_I8) { - *out = DecodeSignedRational((unsigned __int64)val.hVal.QuadPart); - } else if (val.vt == VT_I4) { - *out = (double)val.lVal; // Already a ratio? - } else if (val.vt == VT_R8) { - *out = val.dblVal; - } else { - // Fallback: Try standard conversion but it may fail for RATIONAL - hr = E_FAIL; // Skip if unknown type - } - PropVariantClear(&val); - } - return hr; -} - -static HRESULT GetMetadataRational(IWICMetadataQueryReader* reader, LPCWSTR query, double* out) { - if (!reader || !out) return E_INVALIDARG; - PROPVARIANT val; PropVariantInit(&val); - HRESULT hr = reader->GetMetadataByName(query, &val); - if (SUCCEEDED(hr)) { - if (val.vt == VT_UI8) { - *out = DecodeRational(val.uhVal.QuadPart); - } else { - PropVariantToDouble(val, out); - } - PropVariantClear(&val); - } - return hr; -} - - - -static HRESULT GetMetadataGPS(IWICMetadataQueryReader* reader, LPCWSTR coordQuery, LPCWSTR refQuery, double* outVal) { - if (!reader || !outVal) return E_INVALIDARG; - - // 1. Read Reference (N/S/E/W) - WCHAR refBuf[16] = {}; - PROPVARIANT varRef; PropVariantInit(&varRef); - if (SUCCEEDED(reader->GetMetadataByName(refQuery, &varRef))) { - PropVariantToString(varRef, refBuf, 16); - PropVariantClear(&varRef); - } - - // 2. Read Coordinate (Vector of 3 UI8s) - PROPVARIANT varCoord; PropVariantInit(&varCoord); - HRESULT hr = reader->GetMetadataByName(coordQuery, &varCoord); - if (FAILED(hr)) return hr; - - double result = 0.0; - - if (varCoord.vt == (VT_UI8 | VT_VECTOR)) { - if (varCoord.cauh.cElems == 3) { - double deg = DecodeRational(varCoord.cauh.pElems[0].QuadPart); - double min = DecodeRational(varCoord.cauh.pElems[1].QuadPart); - double sec = DecodeRational(varCoord.cauh.pElems[2].QuadPart); - result = deg + min/60.0 + sec/3600.0; - } - } - PropVariantClear(&varCoord); - - // Apply Ref (S or W means negative) - if (refBuf[0] == 'S' || refBuf[0] == 's' || refBuf[0] == 'W' || refBuf[0] == 'w') { - result = -result; - } - - *outVal = result; - return S_OK; -} - -HRESULT CImageLoader::ReadMetadata(LPCWSTR filePath, ImageMetadata* pMetadata) { - if (!filePath || !pMetadata) return E_INVALIDARG; - *pMetadata = {}; // Clear - - if (!m_wicFactory) return E_FAIL; - - // 1. Detect Format (New robust logic) - pMetadata->Format = DetectFormatFromContent(filePath); - - // 2. Create Decoder based on file (Safe fallback) - ComPtr decoder; - HRESULT hr = m_wicFactory->CreateDecoderFromFilename(filePath, nullptr, GENERIC_READ, WICDecodeMetadataCacheOnDemand, &decoder); - - if (FAILED(hr)) { - // If WIC failed but we detected a format (e.g. JXL, Custom RAW), return S_OK so we at least have the Format field - if (pMetadata->Format != L"Unknown") return S_OK; - return hr; - } - - // WIC Format check (Secondary verification or detail) - // If our magic byte detector returned generic or WIC has better info? - // Actually our detector is better for JXL/AVIF/WebP often. - // Just keep the Magic Byte result as primary. - /* - GUID containerFormat; - if (SUCCEEDED(decoder->GetContainerFormat(&containerFormat))) { - // ... WIC detection fallback if needed ... - } - */ - - // 2. Get Frame 0 - ComPtr frame; - hr = decoder->GetFrame(0, &frame); - if (FAILED(hr)) return S_FALSE; - - // 3. Basic Info - frame->GetSize(&pMetadata->Width, &pMetadata->Height); - - // File Size & Time Fallback - HANDLE hFile = CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr); - if (hFile != INVALID_HANDLE_VALUE) { - LARGE_INTEGER size; - if (GetFileSizeEx(hFile, &size)) pMetadata->FileSize = size.QuadPart; - - // Get File Modify Time (Fallback for Date) - FILETIME ftWrite; - if (GetFileTime(hFile, nullptr, nullptr, &ftWrite)) { - SYSTEMTIME st; FileTimeToSystemTime(&ftWrite, &st); - wchar_t buf[64]; - swprintf_s(buf, L"%04d-%02d-%02d %02d:%02d:%02d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond); - // We store it, but if EXIF exists, we overwrite - pMetadata->Date = buf; - } - CloseHandle(hFile); - } - - // 4. Metadata Query - ComPtr reader; - if (FAILED(frame->GetMetadataQueryReader(&reader))) return S_OK; - - // 5. Read Tags - // 5. Read Tags (Try multiple paths for robustness) - const wchar_t* makeQueries[] = { L"/app1/ifd/{ushort=271}", L"/ifd/{ushort=271}" }; - for (auto q : makeQueries) if (SUCCEEDED(GetMetadataString(reader.Get(), q, pMetadata->Make)) && !pMetadata->Make.empty()) break; - - const wchar_t* modelQueries[] = { L"/app1/ifd/{ushort=272}", L"/ifd/{ushort=272}" }; - for (auto q : modelQueries) if (SUCCEEDED(GetMetadataString(reader.Get(), q, pMetadata->Model)) && !pMetadata->Model.empty()) break; - - const wchar_t* dateQueries[] = { L"/app1/ifd/exif/{ushort=36867}", L"/app1/ifd/{ushort=306}", L"/ifd/exif/{ushort=36867}", L"/ifd/{ushort=306}" }; - for (auto q : dateQueries) if (SUCCEEDED(GetMetadataString(reader.Get(), q, pMetadata->Date)) && !pMetadata->Date.empty()) break; - - // ISO (34855) - std::wstring iso; - const wchar_t* isoQueries[] = { L"/app1/ifd/exif/{ushort=34855}", L"/ifd/exif/{ushort=34855}", L"/app1/ifd/{ushort=34855}" }; - for (auto q : isoQueries) { - if (SUCCEEDED(GetMetadataString(reader.Get(), q, iso)) && !iso.empty()) { - pMetadata->ISO = iso; break; - } - } - - // Aperture (FNumber 33437) - double fnum = 0.0; - const wchar_t* fnumQueries[] = { L"/app1/ifd/exif/{ushort=33437}", L"/ifd/exif/{ushort=33437}", L"/app1/ifd/{ushort=33437}" }; - for (auto q : fnumQueries) { - if (SUCCEEDED(GetMetadataRational(reader.Get(), q, &fnum))) { - wchar_t buf[32]; swprintf_s(buf, L"f/%.1f", fnum); - pMetadata->Aperture = buf; - break; - } - } - - // ExposureTime (33434) - double expTime = 0.0; - const wchar_t* expQueries[] = { L"/app1/ifd/exif/{ushort=33434}", L"/ifd/exif/{ushort=33434}", L"/app1/ifd/{ushort=33434}" }; - for (auto q : expQueries) { - if (SUCCEEDED(GetMetadataRational(reader.Get(), q, &expTime))) { - if (expTime > 0) { - if (expTime < 1.0) { - wchar_t buf[32]; swprintf_s(buf, L"1/%.0f", 1.0 / expTime); - pMetadata->Shutter = buf; - } else { - wchar_t buf[32]; swprintf_s(buf, L"%.1f\"", expTime); - pMetadata->Shutter = buf; - } - } - break; - } - } - - // FocalLength (37386) - double focal = 0.0; - const wchar_t* focalQueries[] = { L"/app1/ifd/exif/{ushort=37386}", L"/ifd/exif/{ushort=37386}", L"/app1/ifd/{ushort=37386}" }; - for (auto q : focalQueries) { - if (SUCCEEDED(GetMetadataRational(reader.Get(), q, &focal))) { - wchar_t buf[64]; - // Try to get 35mm equivalent (0xa405) - double focal35 = 0.0; - const wchar_t* focal35Queries[] = { L"/app1/ifd/exif/{ushort=41989}", L"/ifd/exif/{ushort=41989}" }; - for (auto q35 : focal35Queries) { - if (SUCCEEDED(GetMetadataRational(reader.Get(), q35, &focal35)) && focal35 > 0) break; - } - if (focal35 > 0) { - swprintf_s(buf, L"%.0fmm (%.0fmm)", focal, focal35); - } else { - swprintf_s(buf, L"%.0fmm", focal); - } - pMetadata->Focal = buf; - break; - } - } - - // Lens Model (42036 or 0xA434) - const wchar_t* lensQueries[] = { L"/app1/ifd/exif/{ushort=42036}", L"/ifd/exif/{ushort=42036}" }; - for (auto q : lensQueries) if (SUCCEEDED(GetMetadataString(reader.Get(), q, pMetadata->Lens)) && !pMetadata->Lens.empty()) break; - - // Software (305) - Try multiple paths - const wchar_t* softQueries[] = { L"/app1/ifd/{ushort=305}", L"/ifd/{ushort=305}" }; - for (auto q : softQueries) if (SUCCEEDED(GetMetadataString(reader.Get(), q, pMetadata->Software)) && !pMetadata->Software.empty()) break; - - // ColorSpace Detection: - // 1. Try to get ICC Profile embedded in image for accurate color space name - // 2. Fall back to EXIF ColorSpace tag (0xa001) - - // Try ICC Profile first - Get color context from frame - ComPtr iccFrame; - if (SUCCEEDED(decoder->GetFrame(0, &iccFrame))) { - ComPtr colorContext; - if (SUCCEEDED(m_wicFactory->CreateColorContext(&colorContext))) { - UINT count = 0; - IWICColorContext* contexts[1] = { colorContext.Get() }; - hr = iccFrame->GetColorContexts(1, contexts, &count); - if (SUCCEEDED(hr) && count > 0) { - // Get profile bytes and parse description - UINT profileSize = 0; - colorContext->GetProfileBytes(0, nullptr, &profileSize); - if (profileSize > 128) { // ICC profile header is 128 bytes - std::vector profileData(profileSize); - if (SUCCEEDED(colorContext->GetProfileBytes(profileSize, profileData.data(), &profileSize))) { - // ICC Profile structure: - // Offset 12-15: Profile/Device class (signature) - // We need to find 'desc' tag for profile description - // Tag table starts at offset 128 - UINT tagCount = (profileData[128] << 24) | (profileData[129] << 16) | (profileData[130] << 8) | profileData[131]; - for (UINT i = 0; i < tagCount && i < 50; i++) { - UINT tagOffset = 132 + i * 12; - if (tagOffset + 12 > profileSize) break; - // Check for 'desc' tag signature - if (profileData[tagOffset] == 'd' && profileData[tagOffset+1] == 'e' && - profileData[tagOffset+2] == 's' && profileData[tagOffset+3] == 'c') { - UINT descOffset = (profileData[tagOffset+4] << 24) | (profileData[tagOffset+5] << 16) | - (profileData[tagOffset+6] << 8) | profileData[tagOffset+7]; - UINT descSize = (profileData[tagOffset+8] << 24) | (profileData[tagOffset+9] << 16) | - (profileData[tagOffset+10] << 8) | profileData[tagOffset+11]; - if (descOffset + 12 < profileSize && descSize > 12) { - // Skip type signature (4 bytes) and reserved (4 bytes) - // ASCII count at offset+8 - UINT strLen = (profileData[descOffset+8] << 24) | (profileData[descOffset+9] << 16) | - (profileData[descOffset+10] << 8) | profileData[descOffset+11]; - if (strLen > 0 && strLen < 128 && descOffset + 12 + strLen <= profileSize) { - std::string desc((char*)&profileData[descOffset + 12], strLen - 1); - // Common profiles - if (desc.find("Display P3") != std::string::npos) pMetadata->ColorSpace = L"Display P3"; - else if (desc.find("sRGB") != std::string::npos) pMetadata->ColorSpace = L"sRGB"; - else if (desc.find("Adobe RGB") != std::string::npos) pMetadata->ColorSpace = L"Adobe RGB"; - else if (desc.find("DCI-P3") != std::string::npos) pMetadata->ColorSpace = L"DCI-P3"; - else if (desc.find("Rec. 2020") != std::string::npos || desc.find("BT.2020") != std::string::npos) pMetadata->ColorSpace = L"Rec.2020"; - else { - // Use first 20 chars of description - std::wstring wdesc(desc.begin(), desc.end()); - if (wdesc.length() > 20) wdesc = wdesc.substr(0, 20) + L"..."; - pMetadata->ColorSpace = wdesc; - } - } - } - break; - } - } - } - } - } - } - } - - // Fallback to EXIF ColorSpace if ICC not found - if (pMetadata->ColorSpace.empty()) { - PROPVARIANT csVar; PropVariantInit(&csVar); - const wchar_t* csQueries[] = { L"/app1/ifd/exif/{ushort=40961}", L"/ifd/exif/{ushort=40961}" }; - for (auto q : csQueries) { - if (SUCCEEDED(reader->GetMetadataByName(q, &csVar))) { - UINT csVal = 0; - if (csVar.vt == VT_UI2) csVal = csVar.uiVal; - else if (csVar.vt == VT_UI4) csVal = csVar.ulVal; - - if (csVal == 1) pMetadata->ColorSpace = L"sRGB"; - else if (csVal == 2) pMetadata->ColorSpace = L"Adobe RGB"; - else if (csVal == 65535) pMetadata->ColorSpace = L"Wide Gamut"; - PropVariantClear(&csVar); - break; - } - } - } - - // Exposure Bias (37380) - Signed Rational - double bias = 0.0; - const wchar_t* biasQueries[] = { L"/app1/ifd/exif/{ushort=37380}", L"/ifd/exif/{ushort=37380}" }; - for (auto q : biasQueries) if (SUCCEEDED(GetMetadataSignedRational(reader.Get(), q, &bias))) { - if (std::abs(bias) > 0.0001) { // Check non-zero with epsilon - wchar_t buf[32]; swprintf_s(buf, L"%+.1f ev", bias); - pMetadata->ExposureBias = buf; - } - break; - } - - // Flash (37377) - PROPVARIANT flashVar; PropVariantInit(&flashVar); - const wchar_t* flashQueries[] = { L"/app1/ifd/exif/{ushort=37377}", L"/ifd/exif/{ushort=37377}" }; - for (auto q : flashQueries) { - if (SUCCEEDED(reader->GetMetadataByName(q, &flashVar))) { - UINT flashVal = 0; - if (flashVar.vt == VT_UI2) flashVal = flashVar.uiVal; - else if (flashVar.vt == VT_UI4) flashVal = flashVar.ulVal; - - pMetadata->Flash = (flashVal & 1) ? L"Flash: On" : L"Flash: Off"; // Simple logic - if ((flashVal & 1) == 0) pMetadata->Flash = L""; // Don't show if Off? Or show "Flash: Off"? User said "Whether there is flash". "Off" is info. - // But usually clean UI hides "Off". "Windows Photo" shows it. - // I'll show it if it was explicitly recorded. - PropVariantClear(&flashVar); - break; - } - } - - // GPS - double lat = 0, lon = 0; - bool foundGPS = false; - - // Block 1: Try /app1/ifd/gps/... - if (SUCCEEDED(GetMetadataGPS(reader.Get(), L"/app1/ifd/gps/{ushort=2}", L"/app1/ifd/gps/{ushort=1}", &lat)) && - SUCCEEDED(GetMetadataGPS(reader.Get(), L"/app1/ifd/gps/{ushort=4}", L"/app1/ifd/gps/{ushort=3}", &lon))) { - foundGPS = true; - } - // Block 2: Try /ifd/gps/... (Fallback) - else if (SUCCEEDED(GetMetadataGPS(reader.Get(), L"/ifd/gps/{ushort=2}", L"/ifd/gps/{ushort=1}", &lat)) && - SUCCEEDED(GetMetadataGPS(reader.Get(), L"/ifd/gps/{ushort=4}", L"/ifd/gps/{ushort=3}", &lon))) { - foundGPS = true; - } - - if (foundGPS) { - pMetadata->HasGPS = true; - pMetadata->Latitude = lat; - pMetadata->Longitude = lon; - - // Altitude - Try multiple paths for HEIC/JPEG compatibility - double alt = 0; - const wchar_t* altQueries[] = { - L"/app1/ifd/gps/{ushort=6}", - L"/ifd/gps/{ushort=6}", - L"/ifd/{ushort=34853}/{ushort=6}" // GPS IFD pointer method - }; - for (auto q : altQueries) { - if (SUCCEEDED(GetMetadataRational(reader.Get(), q, &alt))) { - pMetadata->Altitude = alt; - // Check Ref (5): 0=Above, 1=Below - PROPVARIANT altRef; PropVariantInit(&altRef); - // Try corresponding ref path - std::wstring refPath = q; - size_t pos = refPath.rfind(L"6}"); - if (pos != std::wstring::npos) refPath.replace(pos, 2, L"5}"); - if (SUCCEEDED(reader->GetMetadataByName(refPath.c_str(), &altRef))) { - if (altRef.vt == VT_UI1 && altRef.bVal == 1) pMetadata->Altitude = -alt; - PropVariantClear(&altRef); - } - break; - } - } - } - - return S_OK; -} - -HRESULT CImageLoader::ComputeHistogram(IWICBitmapSource* source, ImageMetadata* pMetadata) { - if (!source || !pMetadata) return E_INVALIDARG; - - // Reset - pMetadata->HistR.assign(256, 0); - pMetadata->HistG.assign(256, 0); - pMetadata->HistB.assign(256, 0); - pMetadata->HistL.assign(256, 0); - - ComPtr bitmap; - if (FAILED(source->QueryInterface(IID_PPV_ARGS(&bitmap)))) { - return E_NOINTERFACE; - } - - ComPtr lock; - if (FAILED(bitmap->Lock(nullptr, WICBitmapLockRead, &lock))) return E_FAIL; - - UINT width = 0, height = 0; - bitmap->GetSize(&width, &height); - - UINT stride = 0; - lock->GetStride(&stride); - - UINT bufSize = 0; - BYTE* ptr = nullptr; - if (FAILED(lock->GetDataPointer(&bufSize, &ptr))) return E_FAIL; - - WICPixelFormatGUID format; - source->GetPixelFormat(&format); - - // Determine offsets - int offsetR = 0, offsetG = 1, offsetB = 2; // Default RGBA - if (IsEqualGUID(format, GUID_WICPixelFormat32bppBGRA) || - IsEqualGUID(format, GUID_WICPixelFormat32bppPBGRA)) { - offsetR = 2; offsetG = 1; offsetB = 0; - } - - // Optimized Histogram Calculation - // For small images (< 2MP), use Step=1 (Exact). - // For large images, use Step > 1 (Sparse). - - UINT64 totalPixels = (UINT64)width * height; - - UINT step = 1; - if (totalPixels > 2000000) { // 2MP threshold - // Target ~250k samples - step = (UINT)sqrt(totalPixels / 250000.0); - if (step < 1) step = 1; - } - - // Sampling Loop - for (UINT y = 0; y < height; y += step) { - BYTE* row = ptr + (UINT64)y * stride; // Use 64-bit math for stride offset safety - for (UINT x = 0; x < width; x += step) { - // Safety check for last pixel in row? - // x*4 should be < stride. x < width implies x*4 < width*4 <= stride. - // But if stride is tight... - - BYTE r = row[x * 4 + offsetR]; - BYTE g = row[x * 4 + offsetG]; - BYTE b = row[x * 4 + offsetB]; - - pMetadata->HistR[r]++; - pMetadata->HistG[g]++; - pMetadata->HistB[b]++; - - // Luma (Integer approx: 0.2126R + 0.7152G + 0.0722B) - // (54*R + 183*G + 18*B) / 256 - BYTE l = (BYTE)((54 * r + 183 * g + 19 * b) >> 8); - pMetadata->HistL[l]++; - } - } - - return S_OK; -} diff --git a/QuickView/ImageLoader.h b/QuickView/ImageLoader.h deleted file mode 100644 index d7bb1d2d..00000000 --- a/QuickView/ImageLoader.h +++ /dev/null @@ -1,165 +0,0 @@ -#pragma once -#include "pch.h" -#include - -/// -/// Image Loader -/// Uses WIC to load image files -/// -class CImageLoader { -public: - CImageLoader() = default; - ~CImageLoader() = default; - - /// - /// Initialize loader - /// - HRESULT Initialize(IWICImagingFactory* wicFactory); - - // --- Metadata Structure --- - struct ImageMetadata { - std::wstring Make; - std::wstring Model; - std::wstring Lens; - std::wstring ISO; // e.g. "ISO 100" - std::wstring Aperture; // e.g. "f/2.8" - std::wstring Shutter; // e.g. "1/500s" - std::wstring Focal; // e.g. "50mm" - std::wstring ExposureBias; // e.g. "+0.3 EV" - std::wstring Flash; // New: Flash status - std::wstring Date; // EXIF Date or File Date fallback - std::wstring Software; // New: Software/Firmware - - UINT Width = 0; - UINT Height = 0; - UINT64 FileSize = 0; - std::wstring Format; // e.g. "JPEG", "RAW (ARW)" - std::wstring FormatDetails; // e.g. "4:2:0", "10-bit", "Lossy" - std::wstring ColorSpace; // e.g. "sRGB", "Display P3", "Adobe RGB" - - // Decoder Info - std::wstring LoaderName; // e.g. "TurboJPEG", "libavif" - DWORD LoadTimeMs = 0; // Load time in milliseconds - - // GPS - bool HasGPS = false; - double Latitude = 0.0; - double Longitude = 0.0; - double Altitude = 0.0; // New: Altitude - - // Histogram (256 bins) - std::vector HistR; - std::vector HistG; - std::vector HistB; - std::vector HistL; // Luminance - - bool IsEmpty() const { return Make.empty() && Model.empty() && ISO.empty() && Date.empty(); } - - std::wstring GetCompactString() const { - std::wstring s; - if (!Make.empty()) s += Make + L" "; - if (!Model.empty()) s += Model; - if (!Focal.empty()) s += (s.empty() ? L"" : L" ") + Focal; - if (!ISO.empty()) s += (s.empty() ? L"" : L" ") + (L"ISO " + ISO); - if (!Aperture.empty()) s += L" " + Aperture; - if (!Shutter.empty()) s += L" " + Shutter; - if (!ExposureBias.empty()) s += L" " + ExposureBias; - return s; - } - }; - - // --- NEW: Raw Thumbnail Data (Zero-Copy flow) --- - struct ThumbData { - std::vector pixels; // Raw BGRA (Compatible with PBGRA/BGRX) - int width; - int height; - int stride; - bool isValid = false; - - // Metadata for Hover - int origWidth = 0; - int origHeight = 0; - uint64_t fileSize = 0; - }; - - /// - /// Read metadata from file using WIC - /// - HRESULT ReadMetadata(LPCWSTR filePath, ImageMetadata* pMetadata); - - /// - /// Compute Histogram from bitmap (Sparse Sampling supported) - /// - HRESULT ComputeHistogram(IWICBitmapSource* source, ImageMetadata* pMetadata); - - /// - /// Load WIC bitmap from file - /// - HRESULT LoadFromFile(LPCWSTR filePath, IWICBitmapSource** bitmap); - - /// - /// Load WIC bitmap from file and force decode to memory - /// - HRESULT LoadToMemory(LPCWSTR filePath, IWICBitmap** ppBitmap, std::wstring* pLoaderName = nullptr, bool forceFullDecode = false); // Force decode to memory - - /// - /// NEW: Load Thumbnail (Raw Data) - /// Optimizes for speed using TurboJPEG scaling where possible. - /// Returns raw BGRA buffer. - /// - HRESULT LoadThumbnail(LPCWSTR filePath, int targetSize, ThumbData* pData); - - - /// - /// Get format details from last load (e.g. "4:2:0", "10-bit") - /// - std::wstring GetLastFormatDetails() const; - - /// - /// Get image size without full decode - /// - HRESULT GetImageSize(LPCWSTR filePath, UINT* width, UINT* height); - - // Helper: Create WIC bitmap from raw bits - HRESULT CreateWICBitmapFromMemory(UINT width, UINT height, REFGUID format, UINT stride, UINT size, BYTE* data, IWICBitmap** ppBitmap); - -private: - ComPtr m_wicFactory; - - // Specialized High-Performance Loaders - HRESULT LoadJPEG(LPCWSTR filePath, IWICBitmap** ppBitmap); // libjpeg-turbo - HRESULT LoadThumbJPEG(LPCWSTR filePath, int targetSize, ThumbData* pData); // New TurboJPEG Scaled Loader - HRESULT LoadThumbJPEGFromMemory(const uint8_t* pBuf, size_t size, int targetSize, ThumbData* pData); // Helper for in-memory buffers - HRESULT LoadThumbWebPFromMemory(const uint8_t* pBuf, size_t size, int targetSize, ThumbData* pData); // Helper for WebP buffers - - // LoadPNG REMOVED - replaced by LoadPngWuffs - HRESULT LoadWebP(LPCWSTR filePath, IWICBitmap** ppBitmap); // libwebp - HRESULT LoadAVIF(LPCWSTR filePath, IWICBitmap** ppBitmap); // libavif + dav1d - HRESULT LoadJXL(LPCWSTR filePath, IWICBitmap** ppBitmap); // libjxl - HRESULT LoadRaw(LPCWSTR filePath, IWICBitmap** ppBitmap, bool forceFullDecode); // libraw - - // Wuffs (Google's memory-safe decoder) - Ultimate Performance - HRESULT LoadPngWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); // Wuffs PNG (replaces libpng) - HRESULT LoadGifWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); // Wuffs GIF (replaces WIC) - HRESULT LoadBmpWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); // Wuffs BMP (Safer than WIC) - HRESULT LoadTgaWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); // Wuffs TGA (New support) - HRESULT LoadWbmpWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); // Wuffs WBMP (Fix sample) - - // Stb Image (Legacy/Special Formats: PSD, HDR, PIC, PNM) - HRESULT LoadStbImage(LPCWSTR filePath, IWICBitmap** ppBitmap, bool floatFormat = false); - - // TinyEXR (OpenEXR) - HRESULT LoadTinyExrImage(LPCWSTR filePath, IWICBitmap** ppBitmap); - - // NanoSVG (SVG) - HRESULT LoadSVG(LPCWSTR filePath, IWICBitmap** ppBitmap); - - // NetPBM via Wuffs (PAM, PBM, PGM, PPM) - HRESULT LoadNetpbmWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); - - // QOI via Wuffs - HRESULT LoadQoiWuffs(LPCWSTR filePath, IWICBitmap** ppBitmap); - - // Custom PCX Decoder - HRESULT LoadPCX(LPCWSTR filePath, IWICBitmap** ppBitmap); -}; diff --git a/QuickView/LosslessTransform.cpp b/QuickView/LosslessTransform.cpp deleted file mode 100644 index 3a5df210..00000000 --- a/QuickView/LosslessTransform.cpp +++ /dev/null @@ -1,489 +0,0 @@ -#include "pch.h" -#include "LosslessTransform.h" - -// Include libjpeg-turbo header -// Include libjpeg-turbo header -#include - - -// JPEG magic bytes: FF D8 FF -static const unsigned char JPEG_MAGIC[] = { 0xFF, 0xD8, 0xFF }; -// PNG magic bytes: 89 50 4E 47 -static const unsigned char PNG_MAGIC[] = { 0x89, 0x50, 0x4E, 0x47 }; - -// Helper: Read file into memory -static unsigned char* ReadFileToMemory(LPCWSTR filePath, unsigned int& lengthBytes) { - const unsigned int MAX_FILE_SIZE = 1024 * 1024 * 100; // 100 MB - - lengthBytes = 0; - HANDLE hFile = ::CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - return nullptr; - } - - LARGE_INTEGER fileSize; - if (!::GetFileSizeEx(hFile, &fileSize) || fileSize.QuadPart > MAX_FILE_SIZE) { - ::CloseHandle(hFile); - return nullptr; - } - - unsigned char* buffer = new(std::nothrow) unsigned char[static_cast(fileSize.QuadPart)]; - if (!buffer) { - ::CloseHandle(hFile); - return nullptr; - } - - DWORD bytesRead; - if (!::ReadFile(hFile, buffer, static_cast(fileSize.QuadPart), &bytesRead, NULL) || - bytesRead != fileSize.QuadPart) { - delete[] buffer; - ::CloseHandle(hFile); - return nullptr; - } - - ::CloseHandle(hFile); - lengthBytes = static_cast(fileSize.QuadPart); - return buffer; -} - -// Helper: Read first N bytes of file to check magic -static bool ReadFileMagic(LPCWSTR filePath, unsigned char* buffer, size_t count) { - HANDLE hFile = ::CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - return false; - } - - DWORD bytesRead; - bool ok = ::ReadFile(hFile, buffer, static_cast(count), &bytesRead, NULL) && - bytesRead == count; - - ::CloseHandle(hFile); - return ok; -} - -// Helper: Write memory to file (with safe temp file approach) -static bool WriteMemoryToFile(LPCWSTR filePath, unsigned char* buffer, unsigned int lengthBytes, - std::wstring& errorDetail) { - errorDetail.clear(); - - // Get ALL original file times (create, access, modify) - FILETIME ftCreate, ftAccess, ftModify; - bool restoreTime = false; - HANDLE hExisting = ::CreateFileW(filePath, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hExisting != INVALID_HANDLE_VALUE) { - restoreTime = ::GetFileTime(hExisting, &ftCreate, &ftAccess, &ftModify) != 0; - ::CloseHandle(hExisting); - } - - // Write to temp file first for safety - std::wstring tempPath = std::wstring(filePath) + L".tmp"; - HANDLE hFile = ::CreateFileW(tempPath.c_str(), GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) { - DWORD err = GetLastError(); - errorDetail = L"Cannot create temp file (error " + std::to_wstring(err) + L")"; - return false; - } - - DWORD bytesWritten; - bool ok = ::WriteFile(hFile, buffer, lengthBytes, &bytesWritten, NULL) && - bytesWritten == lengthBytes; - - // Restore ALL original timestamps (create, access, modify) - if (ok && restoreTime) { - ::SetFileTime(hFile, &ftCreate, &ftAccess, &ftModify); - } - - ::CloseHandle(hFile); - - if (!ok) { - ::DeleteFileW(tempPath.c_str()); - errorDetail = L"Failed to write temp file"; - return false; - } - - // Replace original with temp using MoveFileEx with REPLACE_EXISTING - // This is atomic on NTFS and handles file locking better - if (!::MoveFileExW(tempPath.c_str(), filePath, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH)) { - DWORD err = GetLastError(); - - // Try alternative: delete original first then move - if (::DeleteFileW(filePath)) { - if (::MoveFileW(tempPath.c_str(), filePath)) { - return true; // Success via fallback path - } - } - - // Failed - clean up temp file - ::DeleteFileW(tempPath.c_str()); - - switch (err) { - case ERROR_ACCESS_DENIED: - errorDetail = L"Access denied - file may be in use or read-only"; - break; - case ERROR_SHARING_VIOLATION: - errorDetail = L"File is locked by another process"; - break; - default: - errorDetail = L"Cannot replace file (error " + std::to_wstring(err) + L")"; - break; - } - return false; - } - - return true; -} - -// Helper: Convert TransformType to TurboJPEG operation code -static int TransformTypeToTJOp(TransformType type) { - switch (type) { - case TransformType::Rotate90CW: return TJXOP_ROT90; - case TransformType::Rotate90CCW: return TJXOP_ROT270; - case TransformType::Rotate180: return TJXOP_ROT180; - case TransformType::FlipHorizontal: return TJXOP_HFLIP; - case TransformType::FlipVertical: return TJXOP_VFLIP; - default: return TJXOP_NONE; - } -} - -bool CLosslessTransform::IsJPEG(LPCWSTR filePath) { - if (!filePath) return false; - - // Check file content magic bytes, not just extension - unsigned char magic[4] = { 0 }; - if (!ReadFileMagic(filePath, magic, 4)) { - return false; - } - - // JPEG starts with FF D8 FF - return (magic[0] == JPEG_MAGIC[0] && - magic[1] == JPEG_MAGIC[1] && - magic[2] == JPEG_MAGIC[2]); -} - -bool CLosslessTransform::IsJPEGByExtension(LPCWSTR filePath) { - if (!filePath) return false; - - std::wstring path(filePath); - size_t dotPos = path.rfind(L'.'); - if (dotPos == std::wstring::npos) return false; - - std::wstring ext = path.substr(dotPos); - // Convert to lowercase - for (auto& c : ext) c = towlower(c); - - return (ext == L".jpg" || ext == L".jpeg" || ext == L".jpe"); -} - -TransformResult CLosslessTransform::TransformJPEG( - LPCWSTR inputPath, - LPCWSTR outputPath, - TransformType type) { - - if (!inputPath || !outputPath) { - return TransformResult::Error(L"Invalid file path"); - } - - // Read input file - unsigned int inputSize; - unsigned char* inputData = ReadFileToMemory(inputPath, inputSize); - if (!inputData) { - return TransformResult::Error(L"Failed to read file"); - } - - // Verify it's actually a JPEG by checking magic bytes - if (inputSize < 3 || - inputData[0] != JPEG_MAGIC[0] || - inputData[1] != JPEG_MAGIC[1] || - inputData[2] != JPEG_MAGIC[2]) { - delete[] inputData; - - // Check if it's a PNG masquerading as JPEG - if (inputSize >= 4 && - inputData[0] == PNG_MAGIC[0] && - inputData[1] == PNG_MAGIC[1]) { - return TransformResult::Error(L"File is PNG (not JPEG) - using generic transform"); - } - - return TransformResult::Error(L"Not a valid JPEG file"); - } - - // Initialize TurboJPEG transformer - tjhandle tjHandle = tj3Init(TJINIT_TRANSFORM); - if (!tjHandle) { - delete[] inputData; - return TransformResult::Error(L"Failed to initialize JPEG transformer"); - } - - // Set up transformation - tjtransform transform = { 0 }; - transform.op = TransformTypeToTJOp(type); - - // First try PERFECT transformation (lossless) - transform.options = TJXOPT_PERFECT; - - // Perform transformation - unsigned char* outputData = nullptr; - size_t outputSize = 0; - - EditQuality quality = EditQuality::Lossless; - - int result = tj3Transform(tjHandle, inputData, inputSize, 1, - &outputData, &outputSize, &transform); - - // If perfect transform failed due to MCU alignment, try TRIM - if (result != 0) { - const char* errStr = tj3GetErrorStr(tjHandle); - // Check for "perfect" or "MCU" in error message - // libjpeg-turbo usually says "Transform is not perfect" - if (errStr && (strstr(errStr, "perfect") != nullptr || strstr(errStr, "MCU") != nullptr)) { - // Retry with TRIM - transform.options = TJXOPT_TRIM; - result = tj3Transform(tjHandle, inputData, inputSize, 1, - &outputData, &outputSize, &transform); - - if (result == 0) { - quality = EditQuality::EdgeAdapted; - } - } - } - - delete[] inputData; - - TransformResult transformResult; - - if (result == 0 && outputData) { - // Write output file - std::wstring writeError; - if (WriteMemoryToFile(outputPath, outputData, static_cast(outputSize), writeError)) { - transformResult = TransformResult::OK(quality); - } else { - transformResult = TransformResult::Error(writeError); - } - tj3Free(outputData); - } else { - std::wstring errMsg = L"JPEG transformation failed"; - const char* errStr = tj3GetErrorStr(tjHandle); - if (errStr) { - // Convert error string to wide - int len = MultiByteToWideChar(CP_UTF8, 0, errStr, -1, NULL, 0); - if (len > 0) { - std::wstring wideErr(len, 0); - MultiByteToWideChar(CP_UTF8, 0, errStr, -1, &wideErr[0], len); - errMsg += L": " + wideErr; - } - } - transformResult = TransformResult::Error(errMsg); - } - - tj3Destroy(tjHandle); - return transformResult; -} - -TransformResult CLosslessTransform::TransformGeneric( - LPCWSTR inputPath, - LPCWSTR outputPath, - TransformType type) { - - // For non-JPEG files, use WIC to decode, transform, and re-encode - // PNG/BMP/GIF are lossless formats - re-encoding preserves quality - // JPEG/WebP lossy would lose quality - - HRESULT hr = S_OK; - - // Read original file times first - FILETIME ftCreate, ftAccess, ftModify; - bool restoreTime = false; - HANDLE hTimeFile = ::CreateFileW(inputPath, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, 0, NULL); - if (hTimeFile != INVALID_HANDLE_VALUE) { - restoreTime = ::GetFileTime(hTimeFile, &ftCreate, &ftAccess, &ftModify) != 0; - ::CloseHandle(hTimeFile); - } - - ComPtr wicFactory; - hr = CoCreateInstance(CLSID_WICImagingFactory, nullptr, CLSCTX_INPROC_SERVER, - IID_PPV_ARGS(&wicFactory)); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to create WIC factory"); - } - - // Load image with cache on load to release file handle early - ComPtr decoder; - hr = wicFactory->CreateDecoderFromFilename(inputPath, nullptr, GENERIC_READ, - WICDecodeMetadataCacheOnLoad, &decoder); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to load image"); - } - - ComPtr frame; - hr = decoder->GetFrame(0, &frame); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to get image frame"); - } - - // Get original encoder CLSID before releasing decoder - GUID containerFormat; - hr = decoder->GetContainerFormat(&containerFormat); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to get image format"); - } - - // Determine format name for message - bool isLosslessFormat = (containerFormat == GUID_ContainerFormatPng || - containerFormat == GUID_ContainerFormatBmp || - containerFormat == GUID_ContainerFormatGif || - containerFormat == GUID_ContainerFormatTiff); - - // Cache the image in memory to release the file handle - ComPtr cachedBitmap; - hr = wicFactory->CreateBitmapFromSource(frame.Get(), WICBitmapCacheOnLoad, &cachedBitmap); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to cache image in memory"); - } - - // Release decoder and frame to free file handle - frame.Reset(); - decoder.Reset(); - - // Determine WIC rotation - WICBitmapTransformOptions wicTransform; - switch (type) { - case TransformType::Rotate90CW: wicTransform = WICBitmapTransformRotate90; break; - case TransformType::Rotate90CCW: wicTransform = WICBitmapTransformRotate270; break; - case TransformType::Rotate180: wicTransform = WICBitmapTransformRotate180; break; - case TransformType::FlipHorizontal: wicTransform = WICBitmapTransformFlipHorizontal; break; - case TransformType::FlipVertical: wicTransform = WICBitmapTransformFlipVertical; break; - default: wicTransform = WICBitmapTransformRotate0; break; - } - - // Apply rotation using WIC FlipRotator on the cached bitmap - ComPtr rotator; - hr = wicFactory->CreateBitmapFlipRotator(&rotator); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to create rotator"); - } - - hr = rotator->Initialize(cachedBitmap.Get(), wicTransform); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to apply rotation"); - } - - // For in-place transform, we need to use a temp file - std::wstring tempPath = std::wstring(outputPath) + L".wic.tmp"; - - // Create encoder - ComPtr encoder; - hr = wicFactory->CreateEncoder(containerFormat, nullptr, &encoder); - if (FAILED(hr)) { - // Fallback to PNG - hr = wicFactory->CreateEncoder(GUID_ContainerFormatPng, nullptr, &encoder); - isLosslessFormat = true; // PNG is lossless - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to create encoder"); - } - } - - // Create output stream - ComPtr stream; - hr = wicFactory->CreateStream(&stream); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to create output stream"); - } - - hr = stream->InitializeFromFilename(tempPath.c_str(), GENERIC_WRITE); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to open output file"); - } - - hr = encoder->Initialize(stream.Get(), WICBitmapEncoderNoCache); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to initialize encoder"); - } - - // Create frame - ComPtr frameEncode; - hr = encoder->CreateNewFrame(&frameEncode, nullptr); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to create output frame"); - } - - hr = frameEncode->Initialize(nullptr); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to initialize output frame"); - } - - // Write rotated image - UINT width, height; - rotator->GetSize(&width, &height); - hr = frameEncode->SetSize(width, height); - if (FAILED(hr)) { - return TransformResult::Error(L"Failed to set output size"); - } - - // Get pixel format - WICPixelFormatGUID pixelFormat; - rotator->GetPixelFormat(&pixelFormat); - hr = frameEncode->SetPixelFormat(&pixelFormat); - - hr = frameEncode->WriteSource(rotator.Get(), nullptr); - if (FAILED(hr)) { - ::DeleteFileW(tempPath.c_str()); - return TransformResult::Error(L"Failed to write output image"); - } - - hr = frameEncode->Commit(); - if (FAILED(hr)) { - ::DeleteFileW(tempPath.c_str()); - return TransformResult::Error(L"Failed to commit output frame"); - } - - hr = encoder->Commit(); - if (FAILED(hr)) { - ::DeleteFileW(tempPath.c_str()); - return TransformResult::Error(L"Failed to commit output file"); - } - - // Close the stream before moving - stream.Reset(); - encoder.Reset(); - frameEncode.Reset(); - - // Restore original timestamps on temp file before move - if (restoreTime) { - HANDLE hOutFile = ::CreateFileW(tempPath.c_str(), FILE_WRITE_ATTRIBUTES, 0, - NULL, OPEN_EXISTING, 0, NULL); - if (hOutFile != INVALID_HANDLE_VALUE) { - ::SetFileTime(hOutFile, &ftCreate, &ftAccess, &ftModify); - ::CloseHandle(hOutFile); - } - } - - // Move temp file to output - if (!::MoveFileExW(tempPath.c_str(), outputPath, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH)) { - DWORD err = GetLastError(); - ::DeleteFileW(tempPath.c_str()); - return TransformResult::Error(L"Failed to save file (error " + std::to_wstring(err) + L")"); - } - - // Return appropriate quality based on format - if (isLosslessFormat) { - return TransformResult::OK(EditQuality::LosslessReenc); - } else { - return TransformResult::OK(EditQuality::Lossy); - } -} - -const wchar_t* CLosslessTransform::GetTransformName(TransformType type) { - switch (type) { - case TransformType::Rotate90CW: return L"Rotate 90\x00B0 CW"; - case TransformType::Rotate90CCW: return L"Rotate 90\x00B0 CCW"; - case TransformType::Rotate180: return L"Rotate 180\x00B0"; - case TransformType::FlipHorizontal: return L"Flip Horizontal"; - case TransformType::FlipVertical: return L"Flip Vertical"; - default: return L"Unknown"; - } -} diff --git a/QuickView/LosslessTransform.h b/QuickView/LosslessTransform.h deleted file mode 100644 index b7847b8b..00000000 --- a/QuickView/LosslessTransform.h +++ /dev/null @@ -1,79 +0,0 @@ -#pragma once -#include "pch.h" - -/// -/// Lossless transformation types -/// -enum class TransformType { - Rotate90CW, // Clockwise 90 degrees - Rotate90CCW, // Counter-clockwise 90 degrees - Rotate180, // 180 degrees - FlipHorizontal, // Horizontal flip (mirror) - FlipVertical // Vertical flip -}; - -/// -/// Edit quality after rotation/flip -/// -enum class EditQuality { - Lossless, // Green - JPEG lossless - LosslessReenc, // Green - PNG/BMP re-encoded but lossless - EdgeAdapted, // Yellow - JPEG edge adapted (trimmed for MCU alignment) - Lossy // Red - Lossy re-encode (WebP, etc.) -}; - -/// -/// Result of a transformation operation -/// -struct TransformResult { - bool Success = false; - std::wstring ErrorMessage; - EditQuality Quality = EditQuality::Lossless; - - static TransformResult OK(EditQuality quality) { - return { true, L"", quality }; - } - - static TransformResult Error(const std::wstring& msg) { - return { false, msg, EditQuality::Lossless }; - } -}; - -/// -/// Lossless image transformation using libjpeg-turbo -/// Supports JPEG lossless rotation and flip operations -/// -class CLosslessTransform { -public: - /// - /// Check if file is JPEG format by reading magic bytes - /// - static bool IsJPEG(LPCWSTR filePath); - - /// - /// Check if file has JPEG extension (may not be actual JPEG) - /// - static bool IsJPEGByExtension(LPCWSTR filePath); - - /// - /// Perform lossless JPEG transformation - /// Input and output can be the same file (in-place transform) - /// - static TransformResult TransformJPEG( - LPCWSTR inputPath, - LPCWSTR outputPath, - TransformType type); - - /// - /// Perform transformation on any image format using WIC (lossy for non-JPEG) - /// - static TransformResult TransformGeneric( - LPCWSTR inputPath, - LPCWSTR outputPath, - TransformType type); - - /// - /// Get human-readable name for transform type - /// - static const wchar_t* GetTransformName(TransformType type); -}; diff --git a/QuickView/OSDState.h b/QuickView/OSDState.h deleted file mode 100644 index a8962d3b..00000000 --- a/QuickView/OSDState.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#include -#include -#include - -struct OSDState { - std::wstring Message; - DWORD StartTime = 0; - DWORD Duration = 2000; - bool IsError = false; - bool IsWarning = false; - D2D1_COLOR_F CustomColor = D2D1::ColorF(D2D1::ColorF::Black, 0.0f); - - void Show(HWND hwnd, const std::wstring& msg, bool error = false, bool warning = false, D2D1_COLOR_F color = D2D1::ColorF(D2D1::ColorF::Black, 0.0f)) { - Message = msg; - StartTime = GetTickCount(); - IsError = error; - IsWarning = warning; - CustomColor = color; - if (hwnd) { - SetTimer(hwnd, 999, 250, nullptr); - InvalidateRect(hwnd, nullptr, FALSE); - } - } - - bool IsVisible() const { - return !Message.empty() && (GetTickCount() - StartTime) < Duration; - } -}; diff --git a/QuickView/PreviewExtractor.cpp b/QuickView/PreviewExtractor.cpp deleted file mode 100644 index 2b359a6c..00000000 --- a/QuickView/PreviewExtractor.cpp +++ /dev/null @@ -1,244 +0,0 @@ -#include "pch.h" -#include "PreviewExtractor.h" -#include -#include - -// Helper Macros -#define U16LE(p) (*(const uint16_t*)(p)) -#define U32LE(p) (*(const uint32_t*)(p)) -#define U16BE(p) (uint16_t)((p)[0]<<8 | (p)[1]) -#define U32BE(p) (uint32_t)((p)[0]<<24 | (p)[1]<<16 | (p)[2]<<8 | (p)[3]) - -// --- RAW (TIFF-based) --- - -bool PreviewExtractor::ExtractFromRAW(const uint8_t* data, size_t size, ExtractedData& out) { - if (size < 1024) return false; - - // TIFF Header check - // II (49 49) = Little Endian - // MM (4D 4D) = Big Endian - bool isLE = false; - if (data[0] == 0x49 && data[1] == 0x49) isLE = true; - else if (data[0] == 0x4D && data[1] == 0x4D) isLE = false; - else return false; // Not TIFF - - uint16_t fortyTwo = isLE ? U16LE(data + 2) : U16BE(data + 2); - if (fortyTwo != 42 && fortyTwo != 0x55 && fortyTwo != 0x4F52) { // 42, Panasonic(85), Olympus(0x4F52) - // Check for CR3? CR3 is ISOBMFF, not TIFF. - // If CR3, this check fails, handled by HEIC parser (similar structure) or specific CR3 logic. - // But Canon CR2 is TIFF. - // Let's assume TIFF standard for now. - } - - uint32_t firstIFD = isLE ? U32LE(data + 4) : U32BE(data + 4); - if (firstIFD >= size) return false; - - uint64_t jpgOff = 0, jpgSz = 0; - - // Parse IFD0 - // IFD0 usually contains the tiny thumbnail (160x120). - // SubIFDs usually contain the full preview. - // Sony ARW: Preview in SubIFD. - // Canon CR2: Preview image tag in IFD0 or StripOffsets? - - // Strategy: Look for "JpgFromRawStart" (Tag 0x0201) or "PreviewImageStart" - // Also check SubIFDs (Tag 0x014A) - - if (ParseTiffIFD(data, size, firstIFD, isLE, jpgOff, jpgSz)) { - if (jpgOff > 0 && jpgSz > 1024 && jpgOff + jpgSz <= size) { - out.pData = data + jpgOff; - out.size = (size_t)jpgSz; - return true; - } - } - - return false; -} - -bool PreviewExtractor::ParseTiffIFD(const uint8_t* data, size_t size, size_t offset, bool isLE, uint64_t& jpegOffset, uint64_t& jpegSize) { - if (offset + 2 > size) return false; - - uint16_t count = isLE ? U16LE(data + offset) : U16BE(data + offset); - size_t entrySize = 12; - size_t current = offset + 2; - - if (current + count * entrySize > size) return false; - - uint64_t subIfdOffset = 0; - - for (int i = 0; i < count; i++) { - const uint8_t* ev = data + current + i * entrySize; - uint16_t tag = isLE ? U16LE(ev) : U16BE(ev); - uint16_t type = isLE ? U16LE(ev + 2) : U16BE(ev + 2); - uint32_t cnt = isLE ? U32LE(ev + 4) : U32BE(ev + 4); - uint32_t valOrOff = isLE ? U32LE(ev + 8) : U32BE(ev + 8); // Value if fits 4 bytes, else offset - - // JPEGInterchangeFormat (0x0201) - Common in EXIF/TIFF, points to SOI - if (tag == 0x0201) { - jpegOffset = valOrOff; - } - // JPEGInterchangeFormatLength (0x0202) - else if (tag == 0x0202) { - jpegSize = valOrOff; - } - // StripOffsets (0x0111) - Sometimes used for thumb - // StripByteCounts (0x0117) - // SubIFDs (0x014A) - VERY IMPORTANT for RAW - else if (tag == 0x014A) { - // SubIFDs usually points to a list of offsets. - // If type=4 (LONG), cnt=1, then valOrOff is offset. - // If cnt > 1, valOrOff is offset to array of offsets. - if (type == 4 || type == 3) { // LONG or SHORT - if (cnt == 1) subIfdOffset = valOrOff; - else subIfdOffset = valOrOff; // Offset to array - } - } - } - - // If found valid JPEG in this IFD, check if it's "large enough" (> 50KB?) - // Thumbnails are small. Previews are large. - if (jpegOffset > 0 && jpegSize > 50000) return true; - - // Recurse into SubIFDs if current wasn't good - if (jpegOffset == 0 && subIfdOffset > 0 && subIfdOffset < size) { - // Assume subIfdOffset points to first SubIFD or array - // For simplicity, just try to parse the offset itself as an IFD - // Correct logic is complex (array reading). - // Hack: Try to parse whatever is at subIfdOffset. - // Usually it's an array of LONGs. Read first one. - // If SubIFDS tag pointed to array, we need to read memory. - // Let's assume it points to valid IFD. - - // Actually for ARW/DNG, SubIFD is main image or preview. - // Let's implement full parsing later. - // For now, let's enable DNG/ARW basic detection. - } - - return (jpegOffset > 0 && jpegSize > 0); -} - - -// --- HEIC (ISOBMFF) --- -uint32_t PreviewExtractor::ReadU32BE(const uint8_t* p) { return U32BE(p); } - -bool PreviewExtractor::ExtractFromHEIC(const uint8_t* data, size_t size, ExtractedData& out) { - // Simplified ISOBMFF Parser - // Look for 'meta' box -> 'iloc' box -> item info - // HEIC usually stores thumb as a separate item, or main image (grid) - // Finding extracted JPEG (Exif thumb) inside 'meta' -> 'Exif' item? - // Often HEIC contains a small AVC/HEVC thumbnail track. - // BUT, we want JPEG. - // Many camera HEIC embed Exif. Exif has JPEG thumb. - - // Quick Scan for Exif Marker? - // Exif in ISOBMFF is wrapped in 'Exif' item. - // Scanning for "Exif\0\0" (Standard Exif header) might work. - - if (size < 1024) return false; - - const uint8_t exifSig[] = { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 }; - // Brute force scan for Exif header (fast enough for memory mapped file) - // Limit scan to first 1MB? - size_t scanLimit = std::min(size, (size_t)512 * 1024); - - for (size_t i = 0; i < scanLimit - 6; i++) { - if (std::memcmp(data + i, exifSig, 6) == 0) { - // Found Exif Block - // Parse Exif (TIFF format) - // Exif header usually follows 49 49 or 4D 4D within 6 bytes? - // Standard: Exif\0\0 + TIFF Header - size_t tiffStart = i + 6; - if (tiffStart + 8 > size) continue; - - uint64_t jpgOff = 0, jpgSz = 0; - bool isLE = (data[tiffStart] == 0x49); - - uint32_t ifd0 = isLE ? U32LE(data + tiffStart + 4) : U32BE(data + tiffStart + 4); - - if (ParseTiffIFD(data + tiffStart, size - tiffStart, ifd0, isLE, jpgOff, jpgSz)) { - if (jpgOff > 0 && jpgSz > 0) { - out.pData = data + tiffStart + jpgOff; - out.size = (size_t)jpgSz; - return true; - } - } - } - } - return false; -} - -// --- PSD --- - -bool PreviewExtractor::ExtractFromPSD(const uint8_t* data, size_t size, ExtractedData& out) { - if (size < 26) return false; - if (std::memcmp(data, "8BPS", 4) != 0) return false; - - // Header (26 bytes) - // Channels (2 bytes), Height (4), Width (4), Depth (2), Mode (2) - - // Color Mode Data Section - size_t offset = 26; - uint32_t colorModeLen = U32BE(data + offset); - offset += 4 + colorModeLen; - if (offset >= size) return false; - - // Image Resources Section - if (offset + 4 > size) return false; - uint32_t imgResLen = U32BE(data + offset); - size_t resEnd = offset + 4 + imgResLen; - offset += 4; - - if (resEnd > size) return false; - - // Parse Resources - while (offset < resEnd) { - if (offset + 6 > resEnd) break; - // Signature 8BIM - if (std::memcmp(data + offset, "8BIM", 4) != 0) break; - offset += 4; - - uint16_t id = U16BE(data + offset); - offset += 2; - - // Name (Pascal String, padded to even) - uint8_t nameLen = data[offset]; - offset += 1 + nameLen; - if (offset % 2 != 0) offset++; // Pad - - if (offset + 4 > resEnd) break; - uint32_t sizeData = U32BE(data + offset); - offset += 4; - - if (offset + sizeData > resEnd) break; - - // ID 1033 (Thumbnail resource 1) or 1036 (Thumbnail resource 2 - preferred) - if (id == 1036 || id == 1033) { - // Found thumbnail resource! - // Format: - // 4 bytes: Format (1 = kJpegRGB) - // 4 bytes: Width - // 4 bytes: Height - // 4 bytes: WidthBytes - // 4 bytes: TotalSize - // 4 bytes: SizeCompressed - // 2 bytes: BitsPerPixel - // 2 bytes: Planes - // Data... - - if (sizeData > 28) { - uint32_t format = U32BE(data + offset); - if (format == 1) { // JPEG - // JPEG data starts at offset + 28 - out.pData = data + offset + 28; - out.size = sizeData - 28; - return true; - } - } - } - - offset += sizeData; - if (offset % 2 != 0) offset++; // Pad - } - - return false; -} diff --git a/QuickView/PreviewExtractor.h b/QuickView/PreviewExtractor.h deleted file mode 100644 index 0b41192c..00000000 --- a/QuickView/PreviewExtractor.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -#include -#include -#include -#include - -// PreviewExtractor: Static helper to extract embedded thumbnails -class PreviewExtractor { -public: - struct ExtractedData { - const uint8_t* pData = nullptr; // Pointer to data within source buffer - size_t size = 0; - bool isCopy = false; // If true, caller owns pData (rare) - std::vector buffer; // Storage if copy needed - - bool IsValid() const { return pData != nullptr && size > 512; } // Min valid size - }; - - // RAW (ARW, CR2, NEF, DNG, RAF, ORF) - // All usually Tiff-based. - static bool ExtractFromRAW(const uint8_t* fileData, size_t fileSize, ExtractedData& out); - - // HEIC / HEIF / AVIF - // ISOBMFF based. - static bool ExtractFromHEIC(const uint8_t* fileData, size_t fileSize, ExtractedData& out); - - // PSD / PSB - // Resource block based. - static bool ExtractFromPSD(const uint8_t* fileData, size_t fileSize, ExtractedData& out); - -private: - // TIFF Parsing Helpers - static bool ParseTiffIFD(const uint8_t* start, size_t size, size_t offset, bool isLittleEndian, uint64_t& jpegOffset, uint64_t& jpegSize); - - // ISOBMFF Parsing Helpers - static uint32_t ReadU32BE(const uint8_t* p); - static uint64_t ReadU64BE(const uint8_t* p); -}; diff --git a/QuickView/QuickView.h b/QuickView/QuickView.h deleted file mode 100644 index e4b2411f..00000000 --- a/QuickView/QuickView.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#define MAX_LOADSTRING 100 diff --git a/QuickView/QuickView.rc b/QuickView/QuickView.rc deleted file mode 100644 index 01d7a692..00000000 --- a/QuickView/QuickView.rc +++ /dev/null @@ -1,8 +0,0 @@ -// QuickView.rc - Resource file -// Application Icon - -#include - -// Main Application Icon (ID = 1 for default) -// IDI_APPLICATION will be overridden by this -1 ICON "..\\QuickView.ico" diff --git a/QuickView/QuickView.vcxproj b/QuickView/QuickView.vcxproj deleted file mode 100644 index 7c03009f..00000000 --- a/QuickView/QuickView.vcxproj +++ /dev/null @@ -1,145 +0,0 @@ - - - - - Debug - x64 - - - Release - x64 - - - - 17.0 - {A1B2C3D4-E5F6-7890-ABCD-EF1234567890} - QuickView - 10.0 - x64-windows-static-opt - true - - - - Application - true - v145 - Unicode - false - - - Application - false - v145 - true - Unicode - false - - - - - - - - - - - - - - $(ProjectDir)bin\x64\Debug\ - $(ProjectDir)obj\x64\Debug\ - - - $(ProjectDir)bin\x64\Release\ - $(ProjectDir)obj\x64\Release\ - - - - Level4 - true - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - stdcpplatest - Use - pch.h - MultiThreadedDebug - %(AdditionalIncludeDirectories) - ProgramDatabase - - - Windows - true - %(AdditionalLibraryDirectories) - dwrite.lib;%(AdditionalDependencies) - - - - - Level4 - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - true - stdcpplatest - Use - pch.h - MultiThreaded - MaxSpeed - AdvancedVectorExtensions2 - Fast - %(AdditionalIncludeDirectories) - - - Windows - UseFastLinkTimeCodeGeneration - true - true - true - %(AdditionalLibraryDirectories) - dwrite.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - NotUsing - NotUsing - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/QuickView/RenderEngine.cpp b/QuickView/RenderEngine.cpp deleted file mode 100644 index 70c4b457..00000000 --- a/QuickView/RenderEngine.cpp +++ /dev/null @@ -1,399 +0,0 @@ -#include "pch.h" -#include "RenderEngine.h" - -CRenderEngine::~CRenderEngine() { - // ComPtr automatically releases resources -} - -HRESULT CRenderEngine::Initialize(HWND hwnd) { - m_hwnd = hwnd; - - HRESULT hr = S_OK; - - // 1. Create WIC factory - hr = CoCreateInstance( - CLSID_WICImagingFactory, - nullptr, - CLSCTX_INPROC_SERVER, - IID_PPV_ARGS(&m_wicFactory) - ); - if (FAILED(hr)) return hr; - - // 1.5 Create DWrite Factory - hr = DWriteCreateFactory( - DWRITE_FACTORY_TYPE_SHARED, - __uuidof(IDWriteFactory), - (IUnknown**)(&m_dwriteFactory) - ); - if (FAILED(hr)) return hr; - - // Create standard text format - hr = m_dwriteFactory->CreateTextFormat( - L"Segoe UI", - nullptr, - DWRITE_FONT_WEIGHT_SEMI_BOLD, - DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, - 24.0f, - L"en-us", - &m_textFormat - ); - if (FAILED(hr)) return hr; - - // Center alignment - actually LEADING is better for manual layout calculation - m_textFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_LEADING); - m_textFormat->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_NEAR); - - // 2. Create D3D11 device and D2D factory - hr = CreateDeviceResources(); - if (FAILED(hr)) return hr; - - // 3. Create SwapChain - hr = CreateSwapChain(hwnd); - if (FAILED(hr)) return hr; - - // 4. Create render target - hr = CreateRenderTarget(); - if (FAILED(hr)) return hr; - - return S_OK; -} - -HRESULT CRenderEngine::CreateDeviceResources() { - HRESULT hr = S_OK; - - // D3D11 device creation flags - UINT creationFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; -#ifdef _DEBUG - creationFlags |= D3D11_CREATE_DEVICE_DEBUG; -#endif - - // Feature levels - D3D_FEATURE_LEVEL featureLevels[] = { - D3D_FEATURE_LEVEL_11_1, - D3D_FEATURE_LEVEL_11_0, - D3D_FEATURE_LEVEL_10_1, - D3D_FEATURE_LEVEL_10_0, - }; - - D3D_FEATURE_LEVEL featureLevel; - - // Create D3D11 device - hr = D3D11CreateDevice( - nullptr, // Default adapter - D3D_DRIVER_TYPE_HARDWARE, // Hardware acceleration - nullptr, // Software rasterizer - creationFlags, - featureLevels, - ARRAYSIZE(featureLevels), - D3D11_SDK_VERSION, - &m_d3dDevice, - &featureLevel, - &m_d3dContext - ); - if (FAILED(hr)) return hr; - - // Get DXGI device - ComPtr dxgiDevice; - hr = m_d3dDevice.As(&dxgiDevice); - if (FAILED(hr)) return hr; - - // Create D2D factory - D2D1_FACTORY_OPTIONS options = {}; -#ifdef _DEBUG - options.debugLevel = D2D1_DEBUG_LEVEL_INFORMATION; -#endif - - hr = D2D1CreateFactory( - D2D1_FACTORY_TYPE_SINGLE_THREADED, - options, - m_d2dFactory.GetAddressOf() - ); - if (FAILED(hr)) return hr; - - // Create D2D device - hr = m_d2dFactory->CreateDevice(dxgiDevice.Get(), &m_d2dDevice); - if (FAILED(hr)) return hr; - - // Create D2D device context - hr = m_d2dDevice->CreateDeviceContext( - D2D1_DEVICE_CONTEXT_OPTIONS_NONE, - &m_d2dContext - ); - if (FAILED(hr)) return hr; - - return S_OK; -} - -HRESULT CRenderEngine::CreateSwapChain(HWND hwnd) { - HRESULT hr = S_OK; - - // Get DXGI factory - ComPtr dxgiDevice; - hr = m_d3dDevice.As(&dxgiDevice); - if (FAILED(hr)) return hr; - - ComPtr dxgiAdapter; - hr = dxgiDevice->GetAdapter(&dxgiAdapter); - if (FAILED(hr)) return hr; - - ComPtr dxgiFactory; - hr = dxgiAdapter->GetParent(IID_PPV_ARGS(&dxgiFactory)); - if (FAILED(hr)) return hr; - - // SwapChain description - Flip Model - DXGI_SWAP_CHAIN_DESC1 swapChainDesc = {}; - swapChainDesc.Width = 0; // Auto from HWND - swapChainDesc.Height = 0; - swapChainDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - swapChainDesc.Stereo = FALSE; - swapChainDesc.SampleDesc.Count = 1; - swapChainDesc.SampleDesc.Quality = 0; - swapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapChainDesc.BufferCount = 2; // Double buffering - swapChainDesc.Scaling = DXGI_SCALING_STRETCH; - swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; - swapChainDesc.AlphaMode = DXGI_ALPHA_MODE_IGNORE; - swapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT; - - // Create SwapChain (try with Waitable Object first) - ComPtr swapChain1; - hr = dxgiFactory->CreateSwapChainForHwnd( - m_d3dDevice.Get(), - hwnd, - &swapChainDesc, - nullptr, nullptr, - &swapChain1 - ); - - bool waitable = true; - if (FAILED(hr)) { - // Fallback: Try without Waitable Object - swapChainDesc.Flags = 0; - hr = dxgiFactory->CreateSwapChainForHwnd( - m_d3dDevice.Get(), - hwnd, - &swapChainDesc, - nullptr, nullptr, - &swapChain1 - ); - waitable = false; - } - if (FAILED(hr)) return hr; - - // Query IDXGISwapChain2 - hr = swapChain1.As(&m_swapChain); - if (FAILED(hr)) return hr; - - if (waitable) { - // Set Maximum Frame Latency to 1 (Min latency) - hr = m_swapChain->SetMaximumFrameLatency(1); - if (SUCCEEDED(hr)) { - m_frameLatencyWaitableObject = m_swapChain->GetFrameLatencyWaitableObject(); - } - } - - // Disable Alt+Enter fullscreen toggle - dxgiFactory->MakeWindowAssociation(hwnd, DXGI_MWA_NO_ALT_ENTER); - - return S_OK; -} - -HRESULT CRenderEngine::CreateRenderTarget() { - HRESULT hr = S_OK; - - // Get SwapChain back buffer - ComPtr dxgiBackBuffer; - hr = m_swapChain->GetBuffer(0, IID_PPV_ARGS(&dxgiBackBuffer)); - if (FAILED(hr)) return hr; - - // Create D2D bitmap properties - D2D1_BITMAP_PROPERTIES1 bitmapProperties = D2D1::BitmapProperties1( - D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW, - D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE) - ); - - // Create D2D bitmap from DXGI surface - hr = m_d2dContext->CreateBitmapFromDxgiSurface( - dxgiBackBuffer.Get(), - &bitmapProperties, - &m_targetBitmap - ); - if (FAILED(hr)) return hr; - - // Set render target - m_d2dContext->SetTarget(m_targetBitmap.Get()); - - return S_OK; -} - -HRESULT CRenderEngine::Resize(UINT width, UINT height) { - if (!m_swapChain) return E_FAIL; - if (width == 0 || height == 0) return S_OK; - - // Release old render target - m_d2dContext->SetTarget(nullptr); - m_targetBitmap.Reset(); - - // Resize SwapChain - HRESULT hr = m_swapChain->ResizeBuffers( - 0, // Keep buffer count - width, - height, - DXGI_FORMAT_UNKNOWN, // Keep format - m_frameLatencyWaitableObject ? DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT : 0 - ); - if (FAILED(hr)) return hr; - - // Reset Latency and Re-query Waitable Object (Required after ResizeBuffers IF waitable) - if (m_frameLatencyWaitableObject) { - m_swapChain->SetMaximumFrameLatency(1); - m_frameLatencyWaitableObject = m_swapChain->GetFrameLatencyWaitableObject(); - if (!m_frameLatencyWaitableObject) return E_FAIL; - } - - // Recreate render target - return CreateRenderTarget(); -} - -void CRenderEngine::WaitForGPU() { - if (m_frameLatencyWaitableObject) { - DWORD result = WaitForSingleObjectEx(m_frameLatencyWaitableObject, 100, true); // Reduced timeout: 100ms - if (result == WAIT_TIMEOUT) { - // Timeout occurred - GPU may be stuck, skip waiting - // This prevents hang when D2D/WIC enters error state - } - } -} - -void CRenderEngine::BeginDraw() { - WaitForGPU(); - m_d2dContext->BeginDraw(); -} - -void CRenderEngine::Clear(const D2D1_COLOR_F& color) { - m_d2dContext->Clear(color); -} - -void CRenderEngine::DrawBitmap(ID2D1Bitmap* bitmap, const D2D1_RECT_F& destRect) { - if (!bitmap) return; - - // Default to high quality - caller handles dynamic mode selection if needed - m_d2dContext->DrawBitmap( - bitmap, - destRect, - 1.0f, // Opacity - D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC - ); -} - -HRESULT CRenderEngine::EndDraw() { - return m_d2dContext->EndDraw(); -} - -HRESULT CRenderEngine::Present() { - // Check if SwapChain exists before presenting - if (!m_swapChain) return S_OK; - - // VSync on (1 = wait for 1 vertical sync) - return m_swapChain->Present(1, 0); -} - -void CRenderEngine::DrawOSD(const OSDState& state) { - if (!state.IsVisible() || !m_d2dContext || !m_dwriteFactory || !m_textFormat) return; - - // 1. Create Text Layout - ComPtr textLayout; - HRESULT hr = m_dwriteFactory->CreateTextLayout( - state.Message.c_str(), - (UINT32)state.Message.length(), - m_textFormat.Get(), - 2000.0f, // Max width (unconstrained mostly) - 100.0f, // Max height - &textLayout - ); - if (FAILED(hr)) return; - - // 2. Measure Text - DWRITE_TEXT_METRICS metrics; - textLayout->GetMetrics(&metrics); - - // 3. Calculate Toast Geometry - float paddingH = 30.0f; - float paddingV = 15.0f; - float toastW = metrics.width + paddingH * 2; - float toastH = metrics.height + paddingV * 2; - - D2D1_SIZE_F targetSize = m_d2dContext->GetSize(); - float x = (targetSize.width - toastW) / 2.0f; - float y = targetSize.height - toastH - 100.0f; // 100px from bottom - - D2D1_RECT_F toastRect = D2D1::RectF(x, y, x + toastW, y + toastH); - D2D1_ROUNDED_RECT roundedRect = D2D1::RoundedRect(toastRect, 8.0f, 8.0f); - - // 4. Create Brushes (On-the-fly for simplicity, cached is better but this is OSD) - ComPtr bgBrush; - ComPtr textBrush; - - // Use semi-transparent black for BG - m_d2dContext->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.7f), &bgBrush); - - // Resolve Text Color - D2D1_COLOR_F finalTextColor = state.CustomColor; - if (finalTextColor.a == 0.0f) { - // Default colors - if (state.IsError) finalTextColor = D2D1::ColorF(D2D1::ColorF::Red); - else if (state.IsWarning) finalTextColor = D2D1::ColorF(D2D1::ColorF::Yellow); - else finalTextColor = D2D1::ColorF(D2D1::ColorF::White); - } - m_d2dContext->CreateSolidColorBrush(finalTextColor, &textBrush); - - if (bgBrush && textBrush) { - // 5. Draw - // We can use PushLayer here for localized effects, but FillRoundedRect is sufficient for flat transparent overlay. - // Adhering to the plan: "Use PushLayer". - // PushLayer allows us to clip rendering to the rounded rect if we were drawing something complex inside. - // For a solid fill, strict PushLayer usage is overkill but I will use it to ensure I follow "layers" promise roughly - // OR I will just use FillRoundedRect because it IS a layer of paint. - // Actually, let's stick to FillRoundedRect for the background. It blends correctly. - - m_d2dContext->FillRoundedRectangle(roundedRect, bgBrush.Get()); - - // Draw Text - // Center text in the toast - // We already aligned text center in Format, but we need to place the layout box - // We created layout with 2000 width. We should probably Draw using the Origin - D2D1_POINT_2F textOrigin = D2D1::Point2F(x + paddingH, y + paddingV); - m_d2dContext->DrawTextLayout(textOrigin, textLayout.Get(), textBrush.Get()); - } -} - -HRESULT CRenderEngine::CreateBitmapFromWIC(IWICBitmapSource* wicBitmap, ID2D1Bitmap** d2dBitmap) { - if (!wicBitmap || !d2dBitmap) return E_INVALIDARG; - - HRESULT hr = S_OK; - - // Convert pixel format - ComPtr converter; - hr = m_wicFactory->CreateFormatConverter(&converter); - if (FAILED(hr)) return hr; - - hr = converter->Initialize( - wicBitmap, - GUID_WICPixelFormat32bppPBGRA, // Premultiplied alpha for D2D - WICBitmapDitherTypeNone, - nullptr, - 0.0f, - WICBitmapPaletteTypeCustom - ); - if (FAILED(hr)) return hr; - - // Create D2D bitmap from WIC - hr = m_d2dContext->CreateBitmapFromWicBitmap( - converter.Get(), - nullptr, - d2dBitmap - ); - - return hr; -} diff --git a/QuickView/RenderEngine.h b/QuickView/RenderEngine.h deleted file mode 100644 index 25ff94a0..00000000 --- a/QuickView/RenderEngine.h +++ /dev/null @@ -1,101 +0,0 @@ -#include "pch.h" -#include -#include -#include -#include "OSDState.h" -#pragma comment(lib, "dwrite.lib") - -/// -/// Direct2D Render Engine (Simplified) -/// Focuses on accurate image rendering without color adjustments -/// Manages D3D11 device, D2D context, DXGI SwapChain (Flip Model) -/// -class CRenderEngine { -public: - CRenderEngine() = default; - ~CRenderEngine(); - - /// - /// Initialize render engine - /// - HRESULT Initialize(HWND hwnd); - - /// - /// Resize SwapChain (call on window resize) - /// - HRESULT Resize(UINT width, UINT height); - - /// - /// Begin frame drawing - /// - void BeginDraw(); - - /// - /// Clear background color - /// - void Clear(const D2D1_COLOR_F& color); - - /// - /// Draw bitmap to specified rectangle with high quality interpolation - /// - void DrawBitmap(ID2D1Bitmap* bitmap, const D2D1_RECT_F& destRect); - - /// - /// End drawing and commit - /// - HRESULT EndDraw(); - - /// - /// Present frame (Flip Model zero-copy) - /// - HRESULT Present(); - - /// - /// Create D2D bitmap from WIC bitmap - /// - HRESULT CreateBitmapFromWIC(IWICBitmapSource* wicBitmap, ID2D1Bitmap** d2dBitmap); - - /// - /// Get D2D device context - /// - ID2D1DeviceContext* GetDeviceContext() const { return m_d2dContext.Get(); } - - /// - /// Get WIC factory - /// - IWICImagingFactory* GetWICFactory() const { return m_wicFactory.Get(); } - -private: - HRESULT CreateDeviceResources(); - HRESULT CreateSwapChain(HWND hwnd); - HRESULT CreateRenderTarget(); - - HWND m_hwnd = nullptr; - - // D3D11 resources - ComPtr m_d3dDevice; - ComPtr m_d3dContext; - - // DXGI resources - ComPtr m_swapChain; - HANDLE m_frameLatencyWaitableObject = nullptr; - -public: - void WaitForGPU(); - bool IsWaitable() const { return m_frameLatencyWaitableObject != nullptr; } - void DrawOSD(const OSDState& state); - - - // D2D resources - ComPtr m_d2dFactory; - ComPtr m_d2dDevice; - ComPtr m_d2dContext; - ComPtr m_targetBitmap; - - // DirectWrite resources - ComPtr m_dwriteFactory; - ComPtr m_textFormat; - - // WIC resources - ComPtr m_wicFactory; -}; diff --git a/QuickView/StbLoader.cpp b/QuickView/StbLoader.cpp deleted file mode 100644 index 8d7c762b..00000000 --- a/QuickView/StbLoader.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "pch.h" -#include "StbLoader.h" - -// Define implementation for stb_image -#define STB_IMAGE_IMPLEMENTATION -#define STBI_NO_JPEG // Use WIC or LibJPEG-Turbo -#define STBI_NO_PNG // Use Wuffs -#define STBI_NO_GIF // Use Wuffs -#define STBI_NO_BMP // Use Wuffs -#define STBI_NO_TGA // Use Wuffs (saves ~3KB) -// Keep PSD, HDR, PIC, PNM (stb handles these, Wuffs doesn't fully) - -#include "../third_party/stb/stb_image.h" -#include - -// ---------------------------------------------------------------------------- -// Zlib Shim for TinyEXR (using System Zlib / zlib-ng) -// ---------------------------------------------------------------------------- -extern "C" int stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen) { - uLongf destLen = (uLongf)olen; - int ret = uncompress((Bytef*)obuffer, &destLen, (const Bytef*)ibuffer, (uLong)ilen); - if (ret == Z_OK) return (int)destLen; - return -1; -} - -extern "C" unsigned char *stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality) { - uLongf destLen = compressBound(data_len); - unsigned char* dest = (unsigned char*)malloc(destLen); - if (!dest) return nullptr; - if (compress(dest, &destLen, data, data_len) != Z_OK) { - free(dest); - return nullptr; - } - if (out_len) *out_len = (int)destLen; - return dest; -} - -namespace StbLoader { - - bool LoadImage(const char* filename, - int* width, int* height, int* channels, - std::vector& outData, bool useFloat) { - - // stbi_load returns data that needs to be freed - // We want 4 channels (RGBA) forced for simplified handling - int w, h, c; - void* data = nullptr; - - if (useFloat) { - data = stbi_loadf(filename, &w, &h, &c, 4); - } else { - data = stbi_load(filename, &w, &h, &c, 4); - } - - if (!data) return false; - - *width = w; - *height = h; - *channels = 4; - - size_t pixelSize = useFloat ? sizeof(float) : sizeof(uint8_t); - size_t totalSize = w * h * 4 * pixelSize; - - outData.resize(totalSize); - memcpy(outData.data(), data, totalSize); - - stbi_image_free(data); - return true; - } - - bool LoadImageFromMemory(const uint8_t* inData, size_t size, - int* width, int* height, int* channels, - std::vector& outData, bool useFloat) { - - int w, h, c; - void* data = nullptr; - - if (useFloat) { - data = stbi_loadf_from_memory(inData, (int)size, &w, &h, &c, 4); // Force 4 channels - } else { - data = stbi_load_from_memory(inData, (int)size, &w, &h, &c, 4); // Force 4 channels - } - - if (!data) return false; - - *width = w; - *height = h; - *channels = 4; - - size_t pixelSize = useFloat ? sizeof(float) : sizeof(uint8_t); - size_t totalSize = w * h * 4 * pixelSize; - - outData.resize(totalSize); - memcpy(outData.data(), data, totalSize); - - stbi_image_free(data); - return true; - } - - int ZlibDecode(char* obuffer, int olen, const char* ibuffer, int ilen) { - // Use system zlib - uLongf destLen = (uLongf)olen; - int ret = uncompress((Bytef*)obuffer, &destLen, (const Bytef*)ibuffer, (uLong)ilen); - if (ret == Z_OK) return (int)destLen; - return -1; - } - - bool IsSupported(const char* filename) { - // stbi_info checks magic - int w, h, c; - return stbi_info(filename, &w, &h, &c) != 0; - } -} diff --git a/QuickView/StbLoader.h b/QuickView/StbLoader.h deleted file mode 100644 index d7d0106d..00000000 --- a/QuickView/StbLoader.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#include -#include -#include - -namespace StbLoader { - - /// - /// Load image using stb_image.h - /// Supports: PSD (Composite), HDR, PIC, PNM, TGA (Fallback) - /// - bool LoadImage(const char* filename, - int* width, int* height, int* channels, - std::vector& outData, bool useFloat); - - bool LoadImageFromMemory(const uint8_t* inData, size_t size, - int* width, int* height, int* channels, - std::vector& outData, bool useFloat); - - // Expose internal zlib decoder for TinyEXR - int ZlibDecode(char* obuffer, int olen, const char* ibuffer, int ilen); - - /// - /// Check if format is supported by checking file signature - /// - bool IsSupported(const char* filename); - -} diff --git a/QuickView/ThumbnailManager.cpp b/QuickView/ThumbnailManager.cpp deleted file mode 100644 index 7f6ea6b8..00000000 --- a/QuickView/ThumbnailManager.cpp +++ /dev/null @@ -1,332 +0,0 @@ -#include "pch.h" -#include "ThumbnailManager.h" -#include -#include - -ThumbnailManager::ThumbnailManager() {} - -ThumbnailManager::~ThumbnailManager() { - Shutdown(); -} - -void ThumbnailManager::Initialize(HWND hwnd, CImageLoader* pLoader) { - m_hwnd = hwnd; - m_pLoader = pLoader; - m_running = true; - m_workerThreadFast = std::thread(&ThumbnailManager::WorkerLoopFast, this); - m_workerThreadSlow = std::thread(&ThumbnailManager::WorkerLoopSlow, this); -} - -void ThumbnailManager::Shutdown() { - m_running = false; - m_cvFast.notify_all(); - m_cvSlow.notify_all(); - if (m_workerThreadFast.joinable()) m_workerThreadFast.join(); - if (m_workerThreadSlow.joinable()) m_workerThreadSlow.join(); - ClearCache(); -} - -void ThumbnailManager::ClearCache() { - std::lock_guard lock(m_cacheMutex); - m_l1Cache.clear(); - m_l2Cache.clear(); - m_lruList.clear(); - m_lruMap.clear(); - m_currentCacheSize = 0; - - // Also clear queue? - std::lock_guard queueLock(m_queueMutex); - m_pendingTasks.clear(); - m_fastQueue = std::priority_queue, std::greater>(); - m_slowQueue = std::priority_queue, std::greater>(); -} - -ComPtr ThumbnailManager::GetThumbnail(int fileIndex, LPCWSTR filePath, ID2D1RenderTarget* pRT) { - std::lock_guard lock(m_cacheMutex); - - // 1. Check L2 Cache (GPU Bitmap) - auto itL2 = m_l2Cache.find(fileIndex); - if (itL2 != m_l2Cache.end()) { - TouchLRU(fileIndex); - return itL2->second; - } - - // 2. Check L1 Cache (Raw Data) - Promote to L2 - auto itL1 = m_l1Cache.find(fileIndex); - if (itL1 != m_l1Cache.end()) { - // Upload to GPU - ComPtr bmp; - if (pRT && !itL1->second.pixels.empty()) { - D2D1_BITMAP_PROPERTIES props = D2D1::BitmapProperties( - D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED) - ); - D2D1_SIZE_U size = D2D1::SizeU(itL1->second.width, itL1->second.height); - - pRT->CreateBitmap(size, itL1->second.pixels.data(), itL1->second.stride, &props, &bmp); - - if (bmp) { - // Determine size for LRU (approx VRAM usage) - size_t sizeBytes = itL1->second.pixels.size(); - - // Store in L2 - m_l2Cache[fileIndex] = bmp; - - // Remove from L1 (Save RAM, assuming we don't need to rebuild often without reloading) - // Actually user said: "Keep L1 Cache... allows rebuilding texture quickly". - // If we keep L1, we double memory usage (RAM + VRAM). - // But user explicitly requested "Dual-Layer Cache" and "L1 Cache... allows rebuilding...". - // So we KEEP it in L1? - // "L1 Cache (RAM): ... Stores raw decoded pixels." - // "L2 Cache (VRAM): ... Stores uploaded GPU textures." - // "Cache structure: ... L1 Cache ... L2 Cache." - // "Retain L1 instructions? -> Yes, retain L1 for device lost recovery." - // Okay, we keep BOTH. - // sizeBytes is already accounted for when added to L1. - - // L2 addition doesn't change RAM usage (managed by driver usually), but we track VRAM loosely? - // Strict LRU limit says 200MB. Is that RAM or VRAM? - // Usually RAM. L1 is RAM. L2 is VRAM. - // Let's count L1 size towards limit. - } - } - TouchLRU(fileIndex); - return bmp; - } - - // 3. Not in Cache - Queue it (if not already) - // We don't queue here directly to avoid spamming lock. - // Usually Overlay calls UpdateOptimizedPriority to manage queue. - // But if we just need one specific file (e.g. current center), we could force queue it? - // Let's rely on UpdateOptimizedPriority for batch queuing. - // Return null for now. - return nullptr; -} - -void ThumbnailManager::UpdateOptimizedPriority(int startIdx, int endIdx, int priorityCenter) { - std::lock_guard lock(m_queueMutex); - - // Strategy: Clear queue to remove old far-away tasks? - // User requested: "Cancellation: If user scrolls fast... discard previous tasks". - // So yes, clearing is good. - // But don't clear tasks that are *inside* the new range? - // Just clear everything and re-add the new range. The overlap is fine to re-add (deduplication via m_pendingTasks needs check). - - // Note: clearing m_taskQueue is hard (no clear()). Assign new. - m_fastQueue = std::priority_queue, std::greater>(); - m_slowQueue = std::priority_queue, std::greater>(); - - // Also clear pending flags? - // If we clear queue, those tasks are gone. So we should clear pending flags for them. - // But we don't know which ones were in queue. - // Simpler: Clear m_pendingTasks map too. - // But wait, what if Worker is currently processing index X? - // Worker holds no lock during decode. - // If we clear pending map, and add X again, we might double process X. - // That's acceptable (waste of one decode) for simplicity. - m_pendingTasks.clear(); - - // Add new detailed range - // Expand a bit? Start-5 to End+5 ? - int range = 10; - int realStart = std::max(0, startIdx - range); - int realEnd = endIdx + range; // Need max count check? Caller usually handles indices? - // We don't know Max count here unless passed. Assuming caller passes valid indices or we check inside loop? - // We'll trust caller (GalleryOverlay) to pass reasonable indices or we check against FileNavigator if we had access. - // We bind path in Task, so we need Path access. - // Wait, GetThumbnail passed Path. But UpdateOptimizedPriority doesn't. - // We need access to FileNavigator to get Path by Index! - // We don't have FileNavigator here directly. - // Solution: GetThumbnail calls are driven by Overlay iterating FileNavigator. - // But `UpdateOptimizedPriority` is the "Bulk Queue" function. - // We should pass a callback or have reference to FileNavigator? - // Or `GetThumbnail` queues it if missing? - - // Revised Plan Logic: - // GalleryOverlay calculates range. - // GalleryOverlay iterates range, calls `ThumbnailManager::EnsureQueued(index, path, priority)`. - // Creating `EnsureQueued` helper. -} - -// Helper (Internal or Public?) - Let's make it Public for Overlay to use iteratively -// Actually, let's change UpdateOptimizedPriority to accept a list of needed thumbs? -// Or just let Overlay loop and call "QueueIfNotCached". -// Let's add `QueueRequest(int index, LPCWSTR path, int priority)` to public API. -// And `ClearQueue()` for the "Fast Scroll" cancellation. - -void ThumbnailManager::EvictLRU() { - // Must be called with m_cacheMutex locked - while (m_currentCacheSize > MAX_CACHE_SIZE || m_l1Cache.size() > MAX_CACHE_COUNT) { - if (m_lruList.empty()) break; - - int idxToRemove = m_lruList.back(); - - // Remove from maps - auto itL1 = m_l1Cache.find(idxToRemove); - if (itL1 != m_l1Cache.end()) { - m_currentCacheSize -= itL1->second.pixels.size(); - m_l1Cache.erase(itL1); - } - m_l2Cache.erase(idxToRemove); - - // Remove from LRU - m_lruMap.erase(idxToRemove); - m_lruList.pop_back(); - } -} - -void ThumbnailManager::AddToLRU(int index, size_t size) { - // Remove if exists (re-add to front) - if (m_lruMap.count(index)) { - m_lruList.erase(m_lruMap[index]); - m_currentCacheSize -= size; // Size might satisfy if unchanged? Simpler to re-add. - // Actually size is stored in entry. - } - - m_lruList.push_front(index); - m_lruMap[index] = m_lruList.begin(); - m_currentCacheSize += size; - - EvictLRU(); -} - -void ThumbnailManager::TouchLRU(int index) { - if (m_lruMap.count(index)) { - m_lruList.splice(m_lruList.begin(), m_lruList, m_lruMap[index]); - m_lruMap[index] = m_lruList.begin(); - } -} - -void ThumbnailManager::WorkerLoopFast() { - while (m_running) { - Task task; - { - std::unique_lock lock(m_queueMutex); - m_cvFast.wait(lock, [this] { return !m_fastQueue.empty() || !m_running; }); - - if (!m_running) break; - - // Double check empty in case of spurious wake or stolen task (unlikely with one consumer per queue, but safe) - if (m_fastQueue.empty()) continue; - - task = m_fastQueue.top(); - m_fastQueue.pop(); - - auto it = m_pendingTasks.find(task.index); - if (it != m_pendingTasks.end()) m_pendingTasks.erase(it); - } - - int targetSize = 300; - CImageLoader::ThumbData data; - if (SUCCEEDED(m_pLoader->LoadThumbnail(task.path.c_str(), targetSize, &data)) && data.isValid) { - { - std::lock_guard lock(m_cacheMutex); - size_t size = data.pixels.size(); - m_l1Cache[task.index] = std::move(data); - AddToLRU(task.index, size); - } - PostMessage(m_hwnd, WM_THUMB_KEY_READY, (WPARAM)task.index, 0); - } - } -} - -void ThumbnailManager::WorkerLoopSlow() { - while (m_running) { - Task task; - { - std::unique_lock lock(m_queueMutex); - m_cvSlow.wait(lock, [this] { return !m_slowQueue.empty() || !m_running; }); - - if (!m_running) break; - - if (m_slowQueue.empty()) continue; - - task = m_slowQueue.top(); - m_slowQueue.pop(); - - auto it = m_pendingTasks.find(task.index); - if (it != m_pendingTasks.end()) m_pendingTasks.erase(it); - } - - int targetSize = 300; - CImageLoader::ThumbData data; - if (SUCCEEDED(m_pLoader->LoadThumbnail(task.path.c_str(), targetSize, &data)) && data.isValid) { - { - std::lock_guard lock(m_cacheMutex); - size_t size = data.pixels.size(); - m_l1Cache[task.index] = std::move(data); - AddToLRU(task.index, size); - } - PostMessage(m_hwnd, WM_THUMB_KEY_READY, (WPARAM)task.index, 0); - } - } -} - -// Added to match planned API changes -void ThumbnailManager::QueueRequest(int index, LPCWSTR path, int priority) { - std::lock_guard lock(m_queueMutex); - - if (m_pendingTasks.count(index)) return; // Already queued - - // Check if in Cache? (Avoid queuing if already cached) - // Accessing m_cacheMutex here might deadlock if called from UI thread which holds cacheMutex? - // Caller (UI) usually checks GetThumbnail (which locks Cache) -> returns null -> calls QueueRequest. - // So Cache is unlocked when QueueRequest is called. Safe. - // But we should double check L1 existence? - // Assuming UI checked GetThumbnail first. - - Task t; - t.index = index; - t.path = path; - t.priorityDistance = priority; - - // Detect format for Lane Selection - std::wstring ext = path; - size_t dot = ext.find_last_of(L'.'); - bool isFast = false; - if (dot != std::wstring::npos) { - std::wstring e = ext.substr(dot); - std::transform(e.begin(), e.end(), e.begin(), ::towlower); - // Fast Lane: JPEG (Optimized) + RAW/HEIC/PSD (Embedded Preview) + WebP (Scaled) - if (e == L".jpg" || e == L".jpeg" || e == L".jpe" || e == L".jfif" || - e == L".arw" || e == L".cr2" || e == L".nef" || e == L".dng" || e == L".orf" || e == L".rw2" || e == L".raf" || - e == L".heic" || e == L".heif" || e == L".avif" || - e == L".psd" || e == L".psb" || - e == L".webp") { // Debug Stats (Removed) - isFast = true; - } - } - t.isFastLane = isFast; - - if (isFast) { - m_fastQueue.push(t); - m_cvFast.notify_one(); - } else { - m_slowQueue.push(t); - m_cvSlow.notify_one(); - } - - m_pendingTasks[index] = true; -} - -void ThumbnailManager::ClearQueue() { - std::lock_guard lock(m_queueMutex); - m_fastQueue = std::priority_queue, std::greater>(); - m_slowQueue = std::priority_queue, std::greater>(); - m_pendingTasks.clear(); -} - - - -ThumbnailManager::ImageInfo ThumbnailManager::GetImageInfo(int index) { - std::lock_guard lock(m_cacheMutex); - auto it = m_l1Cache.find(index); - if (it != m_l1Cache.end()) { - ImageInfo info; - info.origWidth = it->second.origWidth; - info.origHeight = it->second.origHeight; - info.fileSize = it->second.fileSize; - info.isValid = true; - return info; - } - return { 0, 0, 0, false }; -} diff --git a/QuickView/ThumbnailManager.h b/QuickView/ThumbnailManager.h deleted file mode 100644 index 0ad19dfc..00000000 --- a/QuickView/ThumbnailManager.h +++ /dev/null @@ -1,121 +0,0 @@ -#pragma once -#include "pch.h" -#include "ImageLoader.h" -#include -#include -#include -#include -#include -#include -#include - -#define WM_THUMB_KEY_READY (WM_USER + 101) - -class ThumbnailManager { -public: - ThumbnailManager(); - ~ThumbnailManager(); - - // Singleton-like access if needed, or passed as dependency. - // For now, let's assume it's a member of MainWindow. - - // Debug Stats (Removed) - - - struct ImageInfo { - int origWidth; - int origHeight; - uint64_t fileSize; - bool isValid; - }; - ImageInfo GetImageInfo(int index); - - void Initialize(HWND hwnd, CImageLoader* pLoader); - void Shutdown(); - - // The main API called by UI (GalleryOverlay) - // Returns the bitmap if ready (L2 Cache). - // If not ready, queues a request and returns nullptr. - // If L1 Cache hit (Raw Data), immediately creates Bitmap (L2) and returns it. - ComPtr GetThumbnail(int fileIndex, LPCWSTR filePath, ID2D1RenderTarget* pRT); - - // Call this when file list changes completely - void ClearCache(); - - // Preload range (Virtualization hints) - // priorityCenter: index that viewer is looking at - void UpdateOptimizedPriority(int startIdx, int endIdx, int priorityCenter); - - // Dynamic queue management - void QueueRequest(int index, LPCWSTR path, int priority); - void ClearQueue(); - -private: - struct CacheEntry { - CImageLoader::ThumbData rawData; // L1 - ComPtr bitmap; // L2 - size_t sizeBytes = 0; - }; - - HWND m_hwnd = nullptr; - CImageLoader* m_pLoader = nullptr; - - // --- Cache Storage --- - // Combined L1+L2 entry for simplicity, but strictly managed thread access - // L1 part accessed by Worker (Write) and UI (Read/Consume) - // L2 part accessed by UI only - // Wait, separate maps might be cleaner for locking? - // Or just one map protected by mutex? - // User requested L1/L2 distinction. - // L1: Raw DataMap. L2: BitmapMap. - // Index -> RawData - // Index -> Bitmap - // Actually, locking individual entries is complex. - // Let's use a single mutex for the cache structure. - - std::mutex m_cacheMutex; - std::unordered_map m_l1Cache; // Worker writes, UI reads - std::unordered_map> m_l2Cache; // UI only (but we track size here) - - // LRU Tracking - std::list m_lruList; - std::unordered_map::iterator> m_lruMap; - size_t m_currentCacheSize = 0; - - // Constants - const size_t MAX_CACHE_SIZE = 200 * 1024 * 1024; // 200MB - const size_t MAX_CACHE_COUNT = 1000; - - // --- Worker Thread --- - // --- Worker Threads --- - struct Task { - int index; - std::wstring path; - int priorityDistance; // 0 = highest (center) - bool isFastLane; // Tag to verify lane if needed - - bool operator>(const Task& other) const { - return priorityDistance > other.priorityDistance; // Min-heap - } - }; - - std::thread m_workerThreadFast; - std::thread m_workerThreadSlow; - - std::mutex m_queueMutex; // Protects BOTH queues and pending map - std::condition_variable m_cvFast; - std::condition_variable m_cvSlow; - - std::priority_queue, std::greater> m_fastQueue; - std::priority_queue, std::greater> m_slowQueue; - - std::unordered_map m_pendingTasks; - std::atomic m_running = false; - - void WorkerLoopFast(); - void WorkerLoopSlow(); - - void EvictLRU(); - void AddToLRU(int index, size_t size); - void TouchLRU(int index); -}; diff --git a/QuickView/TinyExrLoader.cpp b/QuickView/TinyExrLoader.cpp deleted file mode 100644 index ee5b11ce..00000000 --- a/QuickView/TinyExrLoader.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "pch.h" -#include "TinyExrLoader.h" -#include -#include "StbLoader.h" // For ZlibDecode - -// Define implementation -// Define implementation -// Use system zlib (zlib-ng) for performance -#define TINYEXR_USE_MINIZ 0 -#undef TINYEXR_USE_STB_ZLIB -#define TINYEXR_USE_STB_ZLIB 1 -#include - -// Wrappers moved to StbLoader.cpp to solve linkage -// Forward decl if needed, but TinyEXR header declares it. - -#define TINYEXR_IMPLEMENTATION -#include "../third_party/tinyexr/tinyexr.h" - -namespace TinyExrLoader { - - bool LoadEXR(const char* filename, - int* width, int* height, - std::vector& outData) { - - float* out = nullptr; // width * height * RGBA - int w = 0, h = 0; - const char* err = nullptr; - - int ret = ::LoadEXR(&out, &w, &h, filename, &err); - - if (ret != TINYEXR_SUCCESS) { - if (err) { - // Log? - ::FreeEXRErrorMessage(err); // Must free err - } - return false; - } - - *width = w; - *height = h; - - // Copy to vector - size_t size = (size_t)w * h * 4; - outData.resize(size); - // tinyexr outputs float per component. - memcpy(outData.data(), out, size * sizeof(float)); - - free(out); // tinyexr uses free - return true; - } - - bool LoadEXRFromMemory(const uint8_t* inData, size_t size, - int* width, int* height, - std::vector& outData) { - float* out = nullptr; - int w = 0, h = 0; - const char* err = nullptr; - - // Use global LoadEXRFromMemory - int ret = ::LoadEXRFromMemory(&out, &w, &h, inData, size, &err); - - if (ret != TINYEXR_SUCCESS) { - if (err) { - OutputDebugStringA("TinyEXR Error: "); - OutputDebugStringA(err); - OutputDebugStringA("\n"); - MessageBoxA(nullptr, err, "TinyEXR Error", MB_OK | MB_ICONERROR); - ::FreeEXRErrorMessage(err); - } else { - OutputDebugStringA("TinyEXR Error: Unknown error (ret code check needed)\n"); - } - return false; - } - - *width = w; - *height = h; - - size_t pixelSize = (size_t)w * h * 4; - outData.resize(pixelSize); - memcpy(outData.data(), out, pixelSize * sizeof(float)); - - free(out); - return true; - } -} diff --git a/QuickView/TinyExrLoader.h b/QuickView/TinyExrLoader.h deleted file mode 100644 index 934918cc..00000000 --- a/QuickView/TinyExrLoader.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include -#include - -namespace TinyExrLoader { - - /// - /// Load EXR image - /// Returns RGBA float data - /// - bool LoadEXR(const char* filename, - int* width, int* height, - std::vector& outData); - - bool LoadEXRFromMemory(const uint8_t* inData, size_t size, - int* width, int* height, - std::vector& outData); -} diff --git a/QuickView/Toolbar.cpp b/QuickView/Toolbar.cpp deleted file mode 100644 index 17e2b6bf..00000000 --- a/QuickView/Toolbar.cpp +++ /dev/null @@ -1,332 +0,0 @@ -#include "pch.h" -#include "Toolbar.h" - -// Icon Codes (Segoe Fluent Icons) -#define ICON_PREV L"\uE76B" -#define ICON_NEXT L"\uE76C" -#define ICON_ROTATE_L L"\uE7AD" -#define ICON_ROTATE_R L"\uE7AD" -#define ICON_FLIP L"\uE8AB" // Mirror -#define ICON_LOCK L"\uE9A6" // Lock icon (same for both states, color changes) -#define ICON_UNLOCK L"\uE9A6" -#define ICON_GALLERY L"\uE80A" -#define ICON_INFO L"\uE946" -#define ICON_RAW L"\uE722" // RAW icon (same for both states, color changes) -#define ICON_WARNING L"\uE7BA" -#define ICON_PIN L"\uE718" -#define ICON_UNPIN L"\uE77A" - -Toolbar::Toolbar() { - // Define Buttons - m_buttons = { - { ToolbarButtonID::Prev, ICON_PREV[0], L"Previous (Left)", {}, true }, - { ToolbarButtonID::Next, ICON_NEXT[0], L"Next (Right)", {}, true }, - // Spacer? Just gap. - { ToolbarButtonID::RotateL, ICON_ROTATE_L[0], L"Rotate Left (Shift+R)", {}, true }, - { ToolbarButtonID::RotateR, ICON_ROTATE_R[0], L"Rotate Right (R)", {}, true }, - { ToolbarButtonID::FlipH, ICON_FLIP[0], L"Flip Horizontal (H)", {}, true }, - - { ToolbarButtonID::LockSize, ICON_LOCK[0], L"Lock Window Size", {}, true, false }, - { ToolbarButtonID::Gallery, ICON_GALLERY[0], L"Gallery (T)", {}, true }, - - { ToolbarButtonID::Exif, ICON_INFO[0], L"Info Panel", {}, true, false }, - { ToolbarButtonID::RawToggle, ICON_RAW[0], L"RAW Preview (Fast)", {}, false, false }, // Hidden/Disabled if not RAW - { ToolbarButtonID::FixExtension, ICON_WARNING[0], L"Extension Mismatch (Fix)", {}, false, false, true }, // Hidden if no mismatch - - { ToolbarButtonID::Pin, ICON_PIN[0], L"Pin Toolbar", {}, true, false } - }; -} - -Toolbar::~Toolbar() {} - -void Toolbar::CreateResources(ID2D1RenderTarget* pRT) { - if (!m_brushBg) { - pRT->CreateSolidColorBrush(D2D1::ColorF(0.1f, 0.1f, 0.1f, 0.85f), &m_brushBg); // Dark background - pRT->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f, 1.0f), &m_brushIcon); - pRT->CreateSolidColorBrush(D2D1::ColorF(0.4f, 0.6f, 1.0f, 1.0f), &m_brushIconActive); // Blue for active - pRT->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f, 0.3f), &m_brushIconDisabled); - pRT->CreateSolidColorBrush(D2D1::ColorF(1.0f, 0.3f, 0.3f, 1.0f), &m_brushWarning); // Red for warning - pRT->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f, 0.1f), &m_brushHover); // Hover highlight - - // Font - DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast(m_dwriteFactory.GetAddressOf())); - if (m_dwriteFactory) { - m_dwriteFactory->CreateTextFormat( - L"Segoe Fluent Icons", - NULL, - DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, - 20.0f, // Icon Size - L"en-us", - &m_textFormatIcon - ); - // Fallback for Win10? "Segoe MDL2 Assets" - // If Segoe Fluent Icons not found, it shows box. - // We can try to detect or just use MDL2 if simpler? - // Users requested Fluent. Keep Fluent. - if (m_textFormatIcon) { - m_textFormatIcon->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER); - m_textFormatIcon->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER); - } - } - } -} - -void Toolbar::Init(ID2D1RenderTarget* pRT) { - CreateResources(pRT); -} - -void Toolbar::UpdateLayout(float winW, float winH) { - - // Simpler: Count visible buttons - int visibleCount = 0; - for (const auto& btn : m_buttons) { - bool visible = true; - if (btn.id == ToolbarButtonID::RawToggle && !btn.isEnabled) visible = false; - if (btn.id == ToolbarButtonID::FixExtension && !btn.isWarning) visible = false; - if (visible) visibleCount++; - } - - // Calculate total width: padding + buttons + gaps between buttons - float totalW = PADDING_X * 2 + (visibleCount * BUTTON_SIZE); - if (visibleCount > 1) totalW += (visibleCount - 1) * GAP; - - float startX = (winW - totalW) / 2.0f; - float startY = winH - BOTTOM_MARGIN - BUTTON_SIZE - PADDING_Y * 2; - - m_bgRect = D2D1::RoundedRect( - D2D1::RectF(startX, startY, startX + totalW, startY + BUTTON_SIZE + PADDING_Y * 2), - 20.0f, 20.0f // Capsule radius - ); - - // Layout Buttons - float cx = startX + PADDING_X; - float cy = startY + PADDING_Y; - - for (auto& btn : m_buttons) { - bool visible = true; - if (btn.id == ToolbarButtonID::RawToggle && !btn.isEnabled) visible = false; - if (btn.id == ToolbarButtonID::FixExtension && !btn.isWarning) visible = false; - - // Sync Pin State - if (btn.id == ToolbarButtonID::Pin) { - btn.isToggled = m_isPinned; - btn.iconChar = m_isPinned ? ICON_UNPIN[0] : ICON_PIN[0]; - btn.tooltip = m_isPinned ? L"Unpin Toolbar" : L"Pin Toolbar"; - } - - if (visible) { - btn.rect = D2D1::RectF(cx, cy, cx + BUTTON_SIZE, cy + BUTTON_SIZE); - cx += BUTTON_SIZE + GAP; - } else { - btn.rect = D2D1::RectF(0,0,0,0); // Hide - } - } -} - -void Toolbar::Render(ID2D1RenderTarget* pRT) { - if (m_opacity <= 0.0f) return; - - CreateResources(pRT); // Ensure resources - - // Set global opacity - // Cannot set on RenderTarget easily without Layer. - // Use Layer or set Brush opacity. - // Layer is cleaner for semi-transparent group. - - ComPtr layer; - if (SUCCEEDED(pRT->CreateLayer(&layer))) { - D2D1_LAYER_PARAMETERS params = D2D1::LayerParameters(); - params.contentBounds = m_bgRect.rect; - params.opacity = m_opacity; - - pRT->PushLayer(params, layer.Get()); - - // Background - m_brushBg->SetOpacity(0.85f); // Base opacity - pRT->FillRoundedRectangle(m_bgRect, m_brushBg.Get()); - - // Buttons - for (const auto& btn : m_buttons) { - if (btn.rect.right == 0) continue; // Hidden - - // Hover effect with rounded corners - if (btn.isHovered) { - D2D1_ROUNDED_RECT hoverRect = D2D1::RoundedRect(btn.rect, 6.0f, 6.0f); - pRT->FillRoundedRectangle(hoverRect, m_brushHover.Get()); - } - - // Icon Brush - ID2D1SolidColorBrush* pBrush = m_brushIcon.Get(); - if (btn.isToggled) pBrush = m_brushIconActive.Get(); - if (btn.isWarning) pBrush = m_brushWarning.Get(); - if (btn.id == ToolbarButtonID::LockSize && btn.isToggled) pBrush = m_brushIconActive.Get(); - if (btn.id == ToolbarButtonID::Pin && btn.isToggled) pBrush = m_brushIconActive.Get(); - - // Specific Icon Logic - wchar_t icon = btn.iconChar; - - // Rotate Mirroring check - if (btn.id == ToolbarButtonID::RotateL) { - // Manual mirror? Or just render. Rotate icon usually implies CW. - // For CCW, we can flip using matrix or just accept it. - // Let's use matrix to flip horizontally for RotateL if needed. - // Center of button - // D2D1::Matrix3x2F::Scale(-1.0f, 1.0f, center) - float cx = (btn.rect.left + btn.rect.right)/2; - float cy = (btn.rect.top + btn.rect.bottom)/2; - pRT->SetTransform(D2D1::Matrix3x2F::Scale(-1.0f, 1.0f, D2D1::Point2F(cx, cy))); - pRT->DrawText(&icon, 1, m_textFormatIcon.Get(), btn.rect, pBrush); - pRT->SetTransform(D2D1::Matrix3x2F::Identity()); - continue; - } - - pRT->DrawText(&icon, 1, m_textFormatIcon.Get(), btn.rect, pBrush); - } - - pRT->PopLayer(); - } - - // Tooltip for hovered button (rendered OUTSIDE layer for full opacity) - for (const auto& btn : m_buttons) { - if (btn.isHovered && !btn.tooltip.empty()) { - static ComPtr tooltipFormat; - if (!tooltipFormat && m_dwriteFactory) { - m_dwriteFactory->CreateTextFormat( - L"Segoe UI", NULL, - DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, - 12.0f, L"en-us", &tooltipFormat); - if (tooltipFormat) { - tooltipFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER); - tooltipFormat->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER); - } - } - - if (tooltipFormat) { - float tipWidth = btn.tooltip.length() * 7.0f + 16.0f; - float tipHeight = 22.0f; - float tipX = (btn.rect.left + btn.rect.right) / 2 - tipWidth / 2; - float tipY = m_bgRect.rect.top - tipHeight - 8.0f; - if (tipX < 5) tipX = 5; - - D2D1_RECT_F tipRect = D2D1::RectF(tipX, tipY, tipX + tipWidth, tipY + tipHeight); - - ComPtr tipBg; - pRT->CreateSolidColorBrush(D2D1::ColorF(0.15f, 0.15f, 0.15f, 0.95f), &tipBg); - pRT->FillRoundedRectangle(D2D1::RoundedRect(tipRect, 4.0f, 4.0f), tipBg.Get()); - pRT->DrawText(btn.tooltip.c_str(), (UINT32)btn.tooltip.length(), tooltipFormat.Get(), tipRect, m_brushIcon.Get()); - } - break; - } - } -} - -void Toolbar::OnMouseMove(float x, float y) { - // Check if near bottom - // We don't have window height here unless passed or stored. - // UpdateLayout stores rect. - // Trigger zone is usually managed by MainWindow, calling SetVisible. - // But button hover needs x/y. - - bool changed = false; - for (auto& btn : m_buttons) { - bool wasHovered = btn.isHovered; - btn.isHovered = false; - if (btn.rect.right > 0) { // Visible - if (x >= btn.rect.left && x < btn.rect.right && y >= btn.rect.top && y < btn.rect.bottom) { - btn.isHovered = true; - } - } - if (btn.isHovered != wasHovered) changed = true; - } - // Return changed? -} - -bool Toolbar::OnClick(float x, float y, ToolbarButtonID& outId) { - if (!IsVisible()) return false; - - // Check background hit - if (HitTest(x, y)) { - - // Check buttons - for (auto& btn : m_buttons) { - if (btn.rect.right > 0) { - if (x >= btn.rect.left && x < btn.rect.right && y >= btn.rect.top && y < btn.rect.bottom) { - outId = btn.id; - return true; - } - } - } - return true; // Consumed click on toolbar background - } - return false; -} - -bool Toolbar::HitTest(float x, float y) { - if (!IsVisible()) return false; - return (x >= m_bgRect.rect.left && x <= m_bgRect.rect.right && - y >= m_bgRect.rect.top && y <= m_bgRect.rect.bottom); -} - -void Toolbar::SetVisible(bool visible) { - m_targetVisible = visible; -} - -bool Toolbar::UpdateAnimation() { - float speed = 0.1f; - if (m_targetVisible) { - if (m_opacity < 1.0f) { - m_opacity += speed; - if (m_opacity > 1.0f) m_opacity = 1.0f; - return true; - } - } else { - if (m_opacity > 0.0f) { - m_opacity -= speed; - if (m_opacity < 0.0f) m_opacity = 0.0f; - return true; - } - } - return false; -} - -void Toolbar::SetLockState(bool locked) { - for (auto& btn : m_buttons) { - if (btn.id == ToolbarButtonID::LockSize) { - btn.isToggled = locked; - // Icon stays the same (E9A6), only color changes via isToggled - btn.tooltip = locked ? L"Unlock Window Size" : L"Lock Window Size"; - } - } -} - -void Toolbar::SetExifState(bool open) { - for (auto& btn : m_buttons) { - if (btn.id == ToolbarButtonID::Exif) { - btn.isToggled = open; - } - } -} - -void Toolbar::SetRawState(bool isRaw, bool isFullDecode) { - for (auto& btn : m_buttons) { - if (btn.id == ToolbarButtonID::RawToggle) { - btn.isEnabled = isRaw; - if (isRaw) { - btn.isToggled = isFullDecode; - // Icon stays the same (E722), only color changes via isToggled - btn.tooltip = isFullDecode ? L"RAW: Full Decode (Click for Preview)" : L"RAW: Preview (Click for Full)"; - } - } - } -} - -void Toolbar::SetExtensionWarning(bool hasMismatch) { - for (auto& btn : m_buttons) { - if (btn.id == ToolbarButtonID::FixExtension) { - btn.isWarning = hasMismatch; // Only visible if warning? - // UpdateLayout should handle visibility based on isWarning flag logic I wrote above. - } - } -} diff --git a/QuickView/Toolbar.h b/QuickView/Toolbar.h deleted file mode 100644 index 29fcd88b..00000000 --- a/QuickView/Toolbar.h +++ /dev/null @@ -1,85 +0,0 @@ -#pragma once -#include "pch.h" -#include -#include - -// IDs for button actions -enum class ToolbarButtonID { - None, - Prev, Next, - RotateL, RotateR, FlipH, - LockSize, Gallery, - Exif, RawToggle, FixExtension, - Pin // New Pin Button -}; - -struct ToolbarButton { - ToolbarButtonID id; - wchar_t iconChar; // Unicode point for Segoe Fluent Icon - std::wstring tooltip; - D2D1_RECT_F rect; // Runtime layout rect - bool isEnabled = true; - bool isToggled = false; // For Lock/Exif/Raw - bool isWarning = false; // For FixExtension - bool isHovered = false; -}; - -class Toolbar { -public: - Toolbar(); - ~Toolbar(); - - void Init(ID2D1RenderTarget* pRT); - void UpdateLayout(float winW, float winH); - void Render(ID2D1RenderTarget* pRT); - - // Interaction - void OnMouseMove(float x, float y); - bool OnClick(float x, float y, ToolbarButtonID& outId); - bool HitTest(float x, float y); // New method to check if point is on toolbar - - bool IsVisible() const { return m_opacity > 0.0f; } - void SetVisible(bool visible); // Triggers animation logic external to this class? - // actually, we can just set a target state and let UpdateAnimation be called by Timer. - bool IsPinned() const { return m_isPinned; } - void TogglePin() { m_isPinned = !m_isPinned; } - - // Animation Step (returns true if still animating) - bool UpdateAnimation(); - - // State Setters - void SetLockState(bool locked); - void SetExifState(bool open); - void SetRawState(bool isRaw, bool isFullDecode); - void SetExtensionWarning(bool hasMismatch); - -private: - // Layout Constants - const float BUTTON_SIZE = 40.0f; - const float GAP = 8.0f; - const float PADDING_X = 12.0f; - const float PADDING_Y = 6.0f; - const float BOTTOM_MARGIN = 30.0f; // Gap from window bottom - - // Animation - float m_opacity = 0.0f; - - bool m_targetVisible = false; - bool m_isPinned = false; - - D2D1_ROUNDED_RECT m_bgRect = {}; - std::vector m_buttons; - - // Resources - ComPtr m_brushBg; - ComPtr m_brushIcon; - ComPtr m_brushIconActive; - ComPtr m_brushIconDisabled; - ComPtr m_brushWarning; - ComPtr m_brushHover; - - ComPtr m_textFormatIcon; - ComPtr m_dwriteFactory; // Need factory to create format - - void CreateResources(ID2D1RenderTarget* pRT); -}; diff --git a/QuickView/WuffsImpl.cpp b/QuickView/WuffsImpl.cpp deleted file mode 100644 index 0a65dfe0..00000000 --- a/QuickView/WuffsImpl.cpp +++ /dev/null @@ -1,383 +0,0 @@ -// ============================================================ -// WuffsImpl.cpp - Wuffs Library Implementation (Optimized Build) -// ============================================================ -// This file is the ONLY place that includes wuffs-v0.4.c -// It controls which modules are compiled to minimize binary size. - -// ============================================================ -// 1. Wuffs Module Configuration -// ============================================================ -// Tell Wuffs: I want manual control, don't give me the full buffet -#define WUFFS_CONFIG__MODULES - -// ------------------------------------------------------------ -// [Required] Base Dependencies -// ------------------------------------------------------------ -#define WUFFS_CONFIG__MODULE__BASE -#define WUFFS_CONFIG__MODULE__CRC32 -#define WUFFS_CONFIG__MODULE__ADLER32 -#define WUFFS_CONFIG__MODULE__DEFLATE -#define WUFFS_CONFIG__MODULE__ZLIB - -// ------------------------------------------------------------ -// [Core] Image Format Switches -// ------------------------------------------------------------ -#define WUFFS_CONFIG__MODULE__PNG -#define WUFFS_CONFIG__MODULE__GIF -#define WUFFS_CONFIG__MODULE__LZW // GIF depends on LZW -#define WUFFS_CONFIG__MODULE__BMP -#define WUFFS_CONFIG__MODULE__TARGA // Use TARGA for TGA -#define WUFFS_CONFIG__MODULE__WBMP -#define WUFFS_CONFIG__MODULE__NETPBM // PGM, PPM Binary -#define WUFFS_CONFIG__MODULE__QOI // Quite OK Image (New format) - -// ------------------------------------------------------------ -// [Optimization] Static Functions -// ------------------------------------------------------------ -#define WUFFS_CONFIG__STATIC_FUNCTIONS - -// ============================================================ -// 2. Include Wuffs Implementation (ONLY HERE) -// ============================================================ -#define WUFFS_IMPLEMENTATION -#include "../third_party/wuffs/release/c/wuffs-v0.4.c" - -// ============================================================ -// 3. Wrapper Functions for QuickView -// ============================================================ -#include "WuffsLoader.h" -#include -#include - -namespace WuffsLoader { - -// ------------------------------------------------------------ -// PNG Decoder -// ------------------------------------------------------------ -bool DecodePNG(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_png__decoder dec; - wuffs_base__status status = wuffs_png__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_png__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_png__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_png__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_png__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// GIF Decoder -// ------------------------------------------------------------ -bool DecodeGIF(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_gif__decoder dec; - wuffs_base__status status = wuffs_gif__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_gif__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_gif__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// BMP Decoder -// ------------------------------------------------------------ -bool DecodeBMP(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_bmp__decoder dec; - wuffs_base__status status = wuffs_bmp__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_bmp__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_bmp__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_bmp__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_bmp__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// TGA Decoder (Note the usage of wuffs_targa namespace) -// ------------------------------------------------------------ -bool DecodeTGA(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_targa__decoder dec; - wuffs_base__status status = wuffs_targa__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_targa__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_targa__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_targa__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_targa__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// WBMP Decoder -// ------------------------------------------------------------ -bool DecodeWBMP(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_wbmp__decoder dec; - wuffs_base__status status = wuffs_wbmp__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_wbmp__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_wbmp__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_wbmp__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_wbmp__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// NetPBM Decoder (PAM, PBM, PGM, PPM) -// ------------------------------------------------------------ -bool DecodeNetpbm(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_netpbm__decoder dec; - wuffs_base__status status = wuffs_netpbm__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_netpbm__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_netpbm__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_netpbm__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_netpbm__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -// ------------------------------------------------------------ -// QOI Decoder (Quite OK Image) -// ------------------------------------------------------------ -bool DecodeQOI(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels) { - wuffs_qoi__decoder dec; - wuffs_base__status status = wuffs_qoi__decoder__initialize( - &dec, sizeof(dec), WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED); - if (!wuffs_base__status__is_ok(&status)) return false; - - wuffs_base__io_buffer src = wuffs_base__ptr_u8__reader(const_cast(data), size, true); - - wuffs_base__image_config ic = {0}; - status = wuffs_qoi__decoder__decode_image_config(&dec, &ic, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint32_t width = wuffs_base__pixel_config__width(&ic.pixcfg); - uint32_t height = wuffs_base__pixel_config__height(&ic.pixcfg); - if (width == 0 || height == 0) return false; - - wuffs_base__pixel_config__set(&ic.pixcfg, WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL, WUFFS_BASE__PIXEL_SUBSAMPLING__NONE, width, height); - - size_t stride = width * 4; - size_t pixelSize = stride * height; - outPixels.resize(pixelSize); - - wuffs_base__pixel_buffer pb; - status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg, wuffs_base__make_slice_u8(outPixels.data(), pixelSize)); - if (!wuffs_base__status__is_ok(&status)) return false; - - uint64_t workbuf_len = wuffs_qoi__decoder__workbuf_len(&dec).max_incl; - std::vector workbuf(workbuf_len); - - wuffs_base__frame_config fc = {0}; - status = wuffs_qoi__decoder__decode_frame_config(&dec, &fc, &src); - if (!wuffs_base__status__is_ok(&status)) return false; - - status = wuffs_qoi__decoder__decode_frame(&dec, &pb, &src, WUFFS_BASE__PIXEL_BLEND__SRC, wuffs_base__make_slice_u8(workbuf.data(), workbuf.size()), nullptr); - if (!wuffs_base__status__is_ok(&status)) return false; - - *outWidth = width; - *outHeight = height; - return true; -} - -} // namespace WuffsLoader diff --git a/QuickView/WuffsLoader.h b/QuickView/WuffsLoader.h deleted file mode 100644 index cac44cbc..00000000 --- a/QuickView/WuffsLoader.h +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once -// ============================================================ -// WuffsLoader.h - Wuffs Wrapper API for QuickView -// ============================================================ -// This header exposes clean C++ functions for PNG/GIF decoding. -// The actual Wuffs implementation is hidden in WuffsImpl.cpp. - -#include -#include - -namespace WuffsLoader { - -/// -/// Decode PNG image to BGRA pixels -/// -/// PNG file data -/// Data size in bytes -/// Output: image width -/// Output: image height -/// Output: BGRA pixel data (stride = width * 4) -/// true on success -bool DecodePNG(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode GIF image (first frame) to BGRA pixels -/// -/// GIF file data -/// Data size in bytes -/// Output: image width -/// Output: image height -/// Output: BGRA pixel data (stride = width * 4) -/// true on success -bool DecodeGIF(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode BMP image to BGRA pixels -/// -bool DecodeBMP(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode TGA (Targa) image to BGRA pixels -/// -bool DecodeTGA(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode WBMP image to BGRA pixels -/// -bool DecodeWBMP(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode NetPBM (PAM, PBM, PGM, PPM) image to BGRA pixels -/// -bool DecodeNetpbm(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -/// -/// Decode QOI (Quite OK Image) to BGRA pixels -/// -bool DecodeQOI(const uint8_t* data, size_t size, - uint32_t* outWidth, uint32_t* outHeight, - std::vector& outPixels); - -} // namespace WuffsLoader diff --git a/QuickView/build_error.txt b/QuickView/build_error.txt deleted file mode 100644 index a10a2e8e..00000000 --- a/QuickView/build_error.txt +++ /dev/null @@ -1,13 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework - -D:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Microsoft\VC\v180\Microsoft.CppBuild.targets(548,5): warning MSB8028: The intermediate directory (E:\Personal\Coding\QuickView\QuickView\obj\x64\Release\) contains files shared from another project (QuickView2026.vcxproj). This can lead to incorrect clean and rebuild behavior. [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] - main.cpp -E:\Personal\Coding\QuickView\QuickView\FileNavigator.h(62,64): warning C4267: “=”: 从“size_t”转换到“int”，可能丢失数据 [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] - (compiling source file '/main.cpp') - -E:\Personal\Coding\QuickView\QuickView\main.cpp(293,58): warning C4100: 'clientRect': 未引用的参数 [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] - (compiling source file '/main.cpp') - -E:\Personal\Coding\QuickView\QuickView\main.cpp(519,38): error C2065: “FW_SEMI_BOLD”: 未声明的标识符 [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] - (compiling source file '/main.cpp') - diff --git a/QuickView/build_error_log.txt b/QuickView/build_error_log.txt deleted file mode 100644 index 4e5cbb1a..00000000 --- a/QuickView/build_error_log.txt +++ /dev/null @@ -1,44 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework -Build started 2025/12/21 12:30:48. - - 1>Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" on node 1 (Build target(s)). - 1>PrepareForBuild: - Structured output is enabled. The formatting of compiler diagnostics will reflect the error hierarchy. See https://aka.ms/cpp/structured-output for more details. - InitializeBuildStatus: - Touching "E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.tlog\unsuccessfulbuild". - ComputeStdModulesCompileInputs: - Reading library manifest file 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\modules.json' which provides data for library 'microsoft/STL'. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.ixx' from library 'microsoft/STL' to be built with this project. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.compat.ixx' from library 'microsoft/STL' to be built with this project. - VcpkgTripletSelection: - Using triplet "x64-windows-static-opt" from "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\" - Using normalized configuration "Release" - ClCompile: - All outputs are up-to-date. - All outputs are up-to-date. - All outputs are up-to-date. - Link: - D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\bin\HostX86\x64\link.exe /ERRORREPORT:QUEUE /OUT:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe" /NOLOGO /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib" /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\manual-link" dwrite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG:incremental /LTCGOUT:"E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.iobj" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib" /MACHINE:X64 E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\pch.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\RenderEngine.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\ImageLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\LosslessTransform.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\StbLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\TinyExrLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\WuffsImpl.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\main.obj - ڴ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib Ͷ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exp - 1>StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_buffer [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>Done Building Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target(s)) -- FAILED. - -Build FAILED. - - "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target) (1) -> - (Link target) -> - StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_buffer [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - - 0 Warning(s) - 2 Error(s) - -Time Elapsed 00:00:01.26 diff --git a/QuickView/build_fail_2.txt b/QuickView/build_fail_2.txt deleted file mode 100644 index 0f65982f..00000000 --- a/QuickView/build_fail_2.txt +++ /dev/null @@ -1,10 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework - -D:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Microsoft\VC\v180\Microsoft.CppBuild.targets(548,5): warning MSB8028: The intermediate directory (E:\Personal\Coding\QuickView\QuickView\obj\x64\Release\) contains files shared from another project (QuickView2026.vcxproj). This can lead to incorrect clean and rebuild behavior. [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] - 正在创建库 E:\Personal\Coding\QuickView\QuickView\bin\x64\Release\QuickView.lib 和对象 E:\Personal\Coding\QuickView\QuickView\bin\x64\Release\QuickView.exp - 正在生成代码 - 9 of 24783 functions (<0.1%) were compiled, the rest were copied from previous compilation. - 0 functions were new in current compilation - 434 functions had inline decision re-evaluated but remain unchanged - 已完成代码的生成 - QuickView.vcxproj -> E:\Personal\Coding\QuickView\QuickView\bin\x64\Release\QuickView.exe diff --git a/QuickView/build_fail_round.txt b/QuickView/build_fail_round.txt deleted file mode 100644 index 84df1a06..00000000 --- a/QuickView/build_fail_round.txt +++ /dev/null @@ -1,4 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework - -D:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Microsoft\VC\v180\Microsoft.CppBuild.targets(548,5): warning MSB8028: The intermediate directory (E:\Personal\Coding\QuickView\QuickView\obj\x64\Release\) contains files shared from another project (QuickView2026.vcxproj). This can lead to incorrect clean and rebuild behavior. [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] -LINK : fatal error LNK1104: 无法打开文件“E:\Personal\Coding\QuickView\QuickView\bin\x64\Release\QuickView.exe” [E:\Personal\Coding\QuickView\QuickView\QuickView.vcxproj] diff --git a/QuickView/build_output.txt b/QuickView/build_output.txt deleted file mode 100644 index cce7fd65..00000000 --- a/QuickView/build_output.txt +++ /dev/null @@ -1,29 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework - - pch.cpp - RenderEngine.cpp - ImageLoader.cpp - LosslessTransform.cpp - main.cpp -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(145,55): warning C4100: 'clientRect': δõIJ [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(232,58): warning C4100: 'clientRect': δõIJ [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(630,9): error C2065: argc: δıʶ [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(631,30): error C2065: argv: δıʶ [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(631,9): error C2660: LoadImageAsync: 1 [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(98,15): - μLoadImageAsync - e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(631,9): - ƥб(HWND)ʱ - -e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\main.cpp(633,15): error C2065: argv: δıʶ [e:\Personal\Coding\QuickView\QuickView_VS2026_X64\src\QuickView2026\QuickView2026.vcxproj] - (compiling source file '/main.cpp') - diff --git a/QuickView/framework.h b/QuickView/framework.h deleted file mode 100644 index 8651b8ba..00000000 --- a/QuickView/framework.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "targetver.h" -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define NOMINMAX -// Windows Header Files -#include -// C RunTime Header Files -#include -#include -#include -#include -#include "CoroutineTypes.h" diff --git a/QuickView/main.cpp b/QuickView/main.cpp deleted file mode 100644 index cb8acc10..00000000 --- a/QuickView/main.cpp +++ /dev/null @@ -1,3357 +0,0 @@ -#include "pch.h" -#include "framework.h" -#include "QuickView.h" -#include "RenderEngine.h" -#include "ImageLoader.h" -#include "LosslessTransform.h" -#include "EditState.h" -#include "AppStrings.h" -#include "ContextMenu.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "OSDState.h" - -#pragma comment(lib, "d2d1.lib") -#pragma comment(lib, "d3d11.lib") -#pragma comment(lib, "dxgi.lib") -#pragma comment(lib, "windowscodecs.lib") -#pragma comment(lib, "dwrite.lib") -#include - -using namespace Microsoft::WRL; - -#include -#include -#include -#include // For IDesktopWallpaper -#include -#include -#include -#include -#include -#include -#pragma comment(lib, "dwmapi.lib") -#pragma comment(lib, "Shcore.lib") -#pragma comment(lib, "winspool.lib") -#pragma comment(lib, "comctl32.lib") - -#pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"") - -// --- Dialog & OSD Definitions --- - -enum class DialogResult { None, Yes, No, Cancel, Custom1 }; - -struct DialogButton { - DialogResult Result; - std::wstring Text; - bool IsDefault; - DialogButton(DialogResult r, const wchar_t* t, bool d = false) : Result(r), Text(t), IsDefault(d) {} - DialogButton(const DialogButton&) = default; - DialogButton(DialogButton&&) = default; - DialogButton& operator=(const DialogButton&) = default; - DialogButton& operator=(DialogButton&&) = default; -}; - -struct DialogLayout { - D2D1_RECT_F Box; - D2D1_RECT_F Checkbox; - std::vector Buttons; -}; - -struct DialogState { - bool IsVisible = false; - std::wstring Title; - std::wstring Message; - std::wstring QualityText; // New field for quality info - D2D1_COLOR_F AccentColor = D2D1::ColorF(D2D1::ColorF::DodgerBlue); - std::vector Buttons; - int SelectedButtonIndex = 0; - bool HasCheckbox = false; - std::wstring CheckboxText; - bool IsChecked = false; - DialogResult FinalResult = DialogResult::None; -}; - -// struct OSDState moved to OSDState.h - -struct ViewState { - float Zoom = 1.0f; - float PanX = 0.0f; - float PanY = 0.0f; - bool IsDragging = false; - bool IsInteracting = false; // True during drag/zoom/resize for dynamic interpolation - POINT LastMousePos = { 0, 0 }; - POINT DragStartPos = { 0, 0 }; // For click vs drag detection - DWORD DragStartTime = 0; // For click vs drag detection - - void Reset() { Zoom = 1.0f; PanX = 0.0f; PanY = 0.0f; IsDragging = false; IsInteracting = false; } -}; - -#include "FileNavigator.h" -#include "GalleryOverlay.h" -#include "Toolbar.h" - -// --- Globals --- - -static const wchar_t* g_szClassName = L"QuickViewClass"; -static const wchar_t* g_szWindowTitle = L"QuickView 2026"; -static std::unique_ptr g_renderEngine; -static std::unique_ptr g_imageLoader; -static ComPtr g_currentBitmap; -static std::wstring g_imagePath; -OSDState g_osd; // Removed static, explicitly Global -DWORD g_toolbarHideTime = 0; // For auto-hide delay -static DialogState g_dialog; -static EditState g_editState; -static AppConfig g_config; -static ViewState g_viewState; -static FileNavigator g_navigator; // New Navigator -static ThumbnailManager g_thumbMgr; -static GalleryOverlay g_gallery; -static Toolbar g_toolbar; -static CImageLoader::ImageMetadata g_currentMetadata; -static ComPtr g_prefetchedBitmap; -static std::wstring g_prefetchedPath; -static ComPtr g_pPanelTextFormat; -static D2D1_RECT_F g_gpsLinkRect = {}; -static D2D1_RECT_F g_gpsCoordRect = {}; // GPS Coordinates click area -static D2D1_RECT_F g_filenameRect = {}; // Filename click area -static D2D1_RECT_F g_panelToggleRect = {}; // Expand/Collapse Button Rect -static D2D1_RECT_F g_panelCloseRect = {}; // Close Button Rect - -// Helper: Copy text to clipboard -static bool CopyToClipboard(HWND hwnd, const std::wstring& text) { - if (!OpenClipboard(hwnd)) return false; - EmptyClipboard(); - size_t size = (text.length() + 1) * sizeof(wchar_t); - HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, size); - if (hMem) { - memcpy(GlobalLock(hMem), text.c_str(), size); - GlobalUnlock(hMem); - SetClipboardData(CF_UNICODETEXT, hMem); - } - CloseClipboard(); - return hMem != nullptr; -} - -// Helper: Format bytes with thousand separators (e.g., 1,138,997 B) -static std::wstring FormatBytesWithCommas(UINT64 bytes) { - std::wstring num = std::to_wstring(bytes); - int insertPos = (int)num.length() - 3; - while (insertPos > 0) { - num.insert(insertPos, L","); - insertPos -= 3; - } - return num + L" B"; -} - -// ============================================================================ -// UI Grid System - Data-Driven Info Panel -// ============================================================================ - -enum class TruncateMode { - None, // No truncation - EndEllipsis, // End truncation: "Canon EF 24-70mm..." - MiddleEllipsis, // Middle truncation: "Project_A...Final.psd" -}; - -struct InfoRow { - std::wstring icon; // Emoji icon (e.g., "📄") - std::wstring label; // Label (e.g., "文件") - std::wstring valueMain; // Main value (e.g., "f/1.6") - std::wstring valueSub; // Secondary value in gray (e.g., "(1,138,997 B)") - std::wstring fullText; // Full text for tooltip - - TruncateMode mode = TruncateMode::EndEllipsis; - bool isClickable = false; - - // Runtime (calculated during layout) - D2D1_RECT_F hitRect = {}; - std::wstring displayText; // Truncated display text - bool isTruncated = false; -}; - -// Grid state -static std::vector g_infoGrid; -static int g_hoverRowIndex = -1; // -1 = no hover -static POINT g_lastMousePos = {}; - -// Grid layout constants -static const float GRID_ICON_WIDTH = 20.0f; -static const float GRID_LABEL_WIDTH = 55.0f; -static const float GRID_ROW_HEIGHT = 18.0f; -static const float GRID_PADDING = 8.0f; - -static float MeasureTextWidth(const std::wstring& text, IDWriteTextFormat* format); - -// Smart truncation: measure text width and truncate accordingly -static std::wstring MakeMiddleEllipsis(IDWriteTextFormat* format, float maxWidth, const std::wstring& text) { - if (text.empty() || !format || !g_renderEngine) return text; - - float fullWidth = MeasureTextWidth(text, format); - if (fullWidth <= maxWidth) return text; - - // Binary search for optimal truncation - float ellipsisWidth = MeasureTextWidth(L"...", format); - float availWidth = maxWidth - ellipsisWidth; - if (availWidth <= 0) return L"..."; - - // Approximate: keep 1/3 at start, 2/3 at end - size_t total = text.length(); - size_t keepStart = total / 3; - size_t keepEnd = total / 2; - - // Refine by measuring - for (int i = 0; i < 5; i++) { // Max 5 iterations - std::wstring candidate = text.substr(0, keepStart) + L"..." + text.substr(total - keepEnd); - float width = MeasureTextWidth(candidate, format); - if (width <= maxWidth) { - return candidate; - } - keepStart = keepStart * 9 / 10; - keepEnd = keepEnd * 9 / 10; - if (keepStart < 3 || keepEnd < 3) break; - } - - // Fallback: very short - if (total > 10) { - return text.substr(0, 4) + L"..." + text.substr(total - 4); - } - return text.substr(0, 3) + L"..."; -} - -static std::wstring MakeEndEllipsis(IDWriteTextFormat* format, float maxWidth, const std::wstring& text) { - if (text.empty() || !format || !g_renderEngine) return text; - - float fullWidth = MeasureTextWidth(text, format); - if (fullWidth <= maxWidth) return text; - - float ellipsisWidth = MeasureTextWidth(L"...", format); - float availWidth = maxWidth - ellipsisWidth; - if (availWidth <= 0) return L"..."; - - // Binary search - size_t lo = 0, hi = text.length(); - while (lo < hi) { - size_t mid = (lo + hi + 1) / 2; - float w = MeasureTextWidth(text.substr(0, mid), format); - if (w <= availWidth) lo = mid; - else hi = mid - 1; - } - - if (lo > 0) return text.substr(0, lo) + L"..."; - return L"..."; -} - - - -static float MeasureTextWidth(const std::wstring& text, IDWriteTextFormat* format) { - if (text.empty() || !format) return 0.0f; - ComPtr layout; - g_renderEngine->m_dwriteFactory->CreateTextLayout( - text.c_str(), (UINT32)text.length(), format, - 5000.0f, 5000.0f, // Large max width/height - &layout - ); - if (!layout) return 0.0f; - DWRITE_TEXT_METRICS metrics; - layout->GetMetrics(&metrics); - return metrics.width; -} - - -// --- Forward Declarations --- -LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -void OnPaint(HWND hwnd); -void OnResize(HWND hwnd, UINT width, UINT height); -FireAndForget LoadImageAsync(HWND hwnd, std::wstring path); -FireAndForget UpdateHistogramAsync(HWND hwnd, std::wstring path); -void ReloadCurrentImage(HWND hwnd); -void Navigate(HWND hwnd, int direction); -void ReleaseImageResources(); -void DiscardChanges(); -std::wstring ShowRenameDialog(HWND hParent, const std::wstring& oldName); - -// Helper: Check if panning makes sense (image exceeds window OR window exceeds screen) -bool CanPan(HWND hwnd) { - if (!g_currentBitmap) return false; - - RECT rc; GetClientRect(hwnd, &rc); - float windowW = (float)(rc.right - rc.left); - float windowH = (float)(rc.bottom - rc.top); - - D2D1_SIZE_F imgSize = g_currentBitmap->GetSize(); - float fitScale = std::min(windowW / imgSize.width, windowH / imgSize.height); - float scaledW = imgSize.width * fitScale * g_viewState.Zoom; - float scaledH = imgSize.height * fitScale * g_viewState.Zoom; - - // Condition 0: Always allow pan if zoomed in - if (g_viewState.Zoom > 1.01f) return true; - - // Condition 1: Image exceeds window bounds - if (scaledW > windowW + 1.0f || scaledH > windowH + 1.0f) { - return true; - } - - // Condition 2: Window exceeds screen bounds (locked window mode or zoomed beyond screen) - // Get screen work area (excludes taskbar) - HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - MONITORINFO mi = { sizeof(mi) }; - if (GetMonitorInfo(hMon, &mi)) { - RECT windowRect; GetWindowRect(hwnd, &windowRect); - int winW = windowRect.right - windowRect.left; - int winH = windowRect.bottom - windowRect.top; - int screenW = mi.rcWork.right - mi.rcWork.left; - int screenH = mi.rcWork.bottom - mi.rcWork.top; - - // If window is larger than screen work area in either dimension - if (winW > screenW || winH > screenH) { - return true; - } - } - - return false; -} - -// --- Helper Functions --- - -bool FileExists(LPCWSTR path) { - DWORD dwAttrib = GetFileAttributesW(path); - return (dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY)); -} - -bool IsRawFile(const std::wstring& path) { - size_t dot = path.find_last_of(L'.'); - if (dot == std::wstring::npos) return false; - std::wstring ext = path.substr(dot); - std::transform(ext.begin(), ext.end(), ext.begin(), ::towlower); - - static const wchar_t* rawExts[] = { - L".arw", L".cr2", L".cr3", L".dng", L".nef", L".orf", L".raf", L".rw2", L".srw", L".pef", - L".erf", L".mef", L".mos", L".mrw", L".nrw", L".raw", L".rwl", L".sr2", L".x3f", L".iiq", L".3fr" - }; - for (const auto* e : rawExts) { - if (ext == e) return true; - } - return false; -} - -void ReleaseImageResources() { - g_currentBitmap.Reset(); - Sleep(50); -} - -DialogLayout CalculateDialogLayout(D2D1_SIZE_F size) { - DialogLayout layout; - float dlgW = 420.0f; - - // Calculate required height based on content - // Title line: ~30px, Message lines: estimate based on length, Buttons: 50px, Padding: 40px - float titleHeight = 35.0f; - float messageHeight = 25.0f; - - // Estimate title wrapping (assume ~25 chars per line at this width) - int titleLines = (int)(g_dialog.Title.length() / 22) + 1; - if (titleLines > 3) titleLines = 3; // Max 3 lines - - // Message usually single line - int msgLines = 1; - - float contentHeight = (titleLines * titleHeight) + (msgLines * messageHeight); - float qualityHeight = !g_dialog.QualityText.empty() ? 30.0f : 0.0f; // Add space for quality text - float checkboxHeight = g_dialog.HasCheckbox ? 45.0f : 0.0f; - float buttonsHeight = 55.0f; - float padding = 45.0f; // Increased padding - - float dlgH = padding + contentHeight + qualityHeight + checkboxHeight + buttonsHeight + 30.0f; // More buffer - if (dlgH < 200.0f) dlgH = 200.0f; // Increased minimum height - if (dlgH > 400.0f) dlgH = 400.0f; // Increased maximum height - - float left = (size.width - dlgW) / 2.0f; - float top = (size.height - dlgH) / 2.0f; - layout.Box = D2D1::RectF(left, top, left + dlgW, top + dlgH); - - // Checkbox area (only used if HasCheckbox) - float checkY = top + dlgH - 95; - layout.Checkbox = D2D1::RectF(left + 25, checkY, left + 45, checkY + 20); - - // Buttons area - float btnW = 95.0f; - float btnH = 30.0f; - float btnGap = 12.0f; - float totalBtnWidth = (g_dialog.Buttons.size() * btnW) + ((g_dialog.Buttons.size() - 1) * btnGap); - float startX = left + dlgW - 20 - totalBtnWidth; - if (startX < left + 20) startX = left + 20; // Safety clamp - - float btnY = top + dlgH - 45; - - for (size_t i = 0; i < g_dialog.Buttons.size(); ++i) { - layout.Buttons.push_back(D2D1::RectF(startX + i * (btnW + btnGap), btnY, startX + i * (btnW + btnGap) + btnW, btnY + btnH)); - } - return layout; -} - -// --- Draw Functions --- - -// DrawOSD moved to RenderEngine - -// --- Window Controls --- -enum class WindowHit { None, Pin, Min, Max, Close }; -struct WindowControls { - D2D1_RECT_F PinRect; // Pin (Always on Top) button - leftmost - D2D1_RECT_F MinRect; - D2D1_RECT_F MaxRect; - D2D1_RECT_F CloseRect; - WindowHit HoverState = WindowHit::None; -}; -static WindowControls g_winControls; - -void CalculateWindowControls(D2D1_SIZE_F size) { - float btnW = 46.0f; - float btnH = 32.0f; - g_winControls.CloseRect = D2D1::RectF(size.width - btnW, 0, size.width, btnH); - g_winControls.MaxRect = D2D1::RectF(size.width - btnW * 2, 0, size.width - btnW, btnH); - g_winControls.MinRect = D2D1::RectF(size.width - btnW * 3, 0, size.width - btnW * 2, btnH); - g_winControls.PinRect = D2D1::RectF(size.width - btnW * 4, 0, size.width - btnW * 3, btnH); -} - -static bool g_showControls = false; - -// --- REFACTOR: DrawWindowControls with Segoe Fluent Icons --- -// --- REFACTOR: DrawWindowControls with Segoe Fluent Icons --- -void DrawWindowControls(HWND hwnd, ID2D1DeviceContext* context) { - if (g_config.AutoHideWindowControls && !g_showControls && g_winControls.HoverState == WindowHit::None) return; - - // Backgrounds - if (g_winControls.HoverState == WindowHit::Close) { - ComPtr pRed; - context->CreateSolidColorBrush(D2D1::ColorF(0.9f, 0.1f, 0.1f), &pRed); - context->FillRectangle(g_winControls.CloseRect, pRed.Get()); - } else if (g_winControls.HoverState != WindowHit::None) { - ComPtr pGray; - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f, 0.1f), &pGray); - if (g_winControls.HoverState == WindowHit::Max) context->FillRectangle(g_winControls.MaxRect, pGray.Get()); - if (g_winControls.HoverState == WindowHit::Min) context->FillRectangle(g_winControls.MinRect, pGray.Get()); - if (g_winControls.HoverState == WindowHit::Pin) context->FillRectangle(g_winControls.PinRect, pGray.Get()); - } - - // Brushes - ComPtr pWhite, pOutline, pPinActive; - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f), &pWhite); - context->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.5f), &pOutline); - context->CreateSolidColorBrush(D2D1::ColorF(0.2f, 0.6f, 1.0f), &pPinActive); // Blue when active - - // Create text format for Segoe Fluent Icons - static ComPtr pDW; - static ComPtr iconFormat; - if (!pDW) DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast(pDW.GetAddressOf())); - if (pDW && !iconFormat) { - pDW->CreateTextFormat(L"Segoe Fluent Icons", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &iconFormat); - if (iconFormat) { - iconFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER); - iconFormat->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER); - } - } - - if (iconFormat) { - // Draw Icon Helper - auto DrawIcon = [&](wchar_t icon, D2D1_RECT_F r, ID2D1SolidColorBrush* brush) { - // Outline (Offsets) - float offsets[] = { -1.0f, 1.0f }; - for (float ox : offsets) { - for (float oy : offsets) { - D2D1_RECT_F rOut = D2D1::RectF(r.left + ox, r.top + oy, r.right + ox, r.bottom + oy); - context->DrawText(&icon, 1, iconFormat.Get(), rOut, pOutline.Get()); - } - } - context->DrawText(&icon, 1, iconFormat.Get(), r, brush); - }; - - // Pin - wchar_t pinIcon = g_config.AlwaysOnTop ? L'\uE77A' : L'\uE718'; - DrawIcon(pinIcon, g_winControls.PinRect, g_config.AlwaysOnTop ? pPinActive.Get() : pWhite.Get()); - - // Min - DrawIcon(L'\uE921', g_winControls.MinRect, pWhite.Get()); - - // Max / Restore - // Max / Restore - // HWND is passed in - // Check IsZoomed using passed HWND - wchar_t maxIcon = IsZoomed(hwnd) ? L'\uE923' : L'\uE922'; // Restore : Maximize - DrawIcon(maxIcon, g_winControls.MaxRect, pWhite.Get()); - - // Close - DrawIcon(L'\uE8BB', g_winControls.CloseRect, pWhite.Get()); - } - - - // Tooltip for Pin button - if (g_winControls.HoverState == WindowHit::Pin) { - std::wstring tip = g_config.AlwaysOnTop ? L"Unpin (Ctrl+T)" : L"Always on Top (Ctrl+T)"; - - static ComPtr tipFormat; - if (!tipFormat && pDW) { - pDW->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 12.0f, L"en-us", &tipFormat); - } - - if (tipFormat && pDW) { - ComPtr layout; - pDW->CreateTextLayout(tip.c_str(), (UINT32)tip.length(), tipFormat.Get(), 200.0f, 50.0f, &layout); - - if (layout) { - DWRITE_TEXT_METRICS metrics; - layout->GetMetrics(&metrics); - - float tipW = metrics.width + 12.0f; - float tipH = metrics.height + 8.0f; - - // Position below the button - D2D1_RECT_F btnRect = g_winControls.PinRect; - float tipX = btnRect.left + (btnRect.right - btnRect.left - tipW) / 2.0f; - float tipY = btnRect.bottom + 5.0f; - - // Tooltip Background - D2D1_RECT_F tipRect = D2D1::RectF(tipX, tipY, tipX + tipW, tipY + tipH); - ComPtr bgBrush, textBrush, borderBrush; - context->CreateSolidColorBrush(D2D1::ColorF(0.15f, 0.15f, 0.15f), &bgBrush); - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f), &textBrush); - context->CreateSolidColorBrush(D2D1::ColorF(0.4f, 0.4f, 0.4f), &borderBrush); - - context->FillRoundedRectangle(D2D1::RoundedRect(tipRect, 4.0f, 4.0f), bgBrush.Get()); - context->DrawRoundedRectangle(D2D1::RoundedRect(tipRect, 4.0f, 4.0f), borderBrush.Get(), 1.0f); - - context->DrawTextLayout(D2D1::Point2F(tipX + 6.0f, tipY + 4.0f), layout.Get(), textBrush.Get()); - } - } - } -} - -void DrawDialog(ID2D1DeviceContext* context, const RECT& clientRect) { - if (!g_dialog.IsVisible || !context) return; - - D2D1_SIZE_F size = context->GetSize(); - DialogLayout layout = CalculateDialogLayout(size); - - // Overlay (background dimming) - ComPtr pOverlayBrush; - context->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.6f), &pOverlayBrush); // Slightly clearer overlay - context->FillRectangle(D2D1::RectF(0, 0, size.width, size.height), pOverlayBrush.Get()); - - // Box Background (with configurable alpha) - ComPtr pBgBrush; - context->CreateSolidColorBrush(D2D1::ColorF(0.18f, 0.18f, 0.18f, g_config.DialogAlpha), &pBgBrush); - context->FillRoundedRectangle(D2D1::RoundedRect(layout.Box, 10.0f, 10.0f), pBgBrush.Get()); - - // Border - ComPtr pBorderBrush; - context->CreateSolidColorBrush(g_dialog.AccentColor, &pBorderBrush); - context->DrawRoundedRectangle(D2D1::RoundedRect(layout.Box, 10.0f, 10.0f), pBorderBrush.Get(), 2.0f); - - // Fonts - static ComPtr pDW; - static ComPtr fmtTitle; - static ComPtr fmtBody; - static ComPtr fmtBtn; - static ComPtr fmtBtnCenter; // New centered format - - if (!pDW) DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory), reinterpret_cast(pDW.GetAddressOf())); - if (pDW) { - if (!fmtTitle) { - pDW->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 22.0f, L"en-us", &fmtTitle); - if (fmtTitle) fmtTitle->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP); - } - if (!fmtBody) pDW->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 18.0f, L"en-us", &fmtBody); - if (!fmtBtn) pDW->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_SEMI_BOLD, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 16.0f, L"en-us", &fmtBtn); - if (!fmtBtnCenter) { - pDW->CreateTextFormat(L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_SEMI_BOLD, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 16.0f, L"en-us", &fmtBtnCenter); - if (fmtBtnCenter) fmtBtnCenter->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_CENTER); - if (fmtBtnCenter) fmtBtnCenter->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_CENTER); - } - } - - ComPtr pWhite; - context->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &pWhite); - - // Title (truncate to show end of filename with extension, single line) - std::wstring displayTitle = g_dialog.Title; - const size_t maxLen = 30; - if (displayTitle.length() > maxLen) { - displayTitle = L"..." + displayTitle.substr(displayTitle.length() - (maxLen - 3)); - } - float titleTop = layout.Box.top + 18; - float titleBottom = layout.Box.top + 48; - context->DrawText(displayTitle.c_str(), (UINT32)displayTitle.length(), fmtTitle.Get(), - D2D1::RectF(layout.Box.left + 25, titleTop, layout.Box.right - 25, titleBottom), pWhite.Get(), D2D1_DRAW_TEXT_OPTIONS_NONE); - - // Message (below title with proper spacing) - float msgTop = titleBottom + 8; - // Message ends 25px above QualityText - float msgBottom = layout.Checkbox.top - 55.0f; - context->DrawText(g_dialog.Message.c_str(), (UINT32)g_dialog.Message.length(), fmtBody.Get(), - D2D1::RectF(layout.Box.left + 25, msgTop, layout.Box.right - 25, msgBottom), pWhite.Get(), D2D1_DRAW_TEXT_OPTIONS_NONE); - - // Quality Info (Colored) - positioned with more space above checkbox - if (!g_dialog.QualityText.empty()) { - float qualityY = layout.Checkbox.top - 45.0f; // 45px above checkbox - context->DrawText(g_dialog.QualityText.c_str(), (UINT32)g_dialog.QualityText.length(), fmtBody.Get(), - D2D1::RectF(layout.Box.left + 30, qualityY, layout.Box.right - 30, qualityY + 25), pBorderBrush.Get(), D2D1_DRAW_TEXT_OPTIONS_NONE); - } - - // Checkbox - if (g_dialog.HasCheckbox) { - context->DrawRectangle(layout.Checkbox, pWhite.Get(), 1.0f); - if (g_dialog.IsChecked) { - context->FillRectangle(D2D1::RectF(layout.Checkbox.left+4, layout.Checkbox.top+4, layout.Checkbox.right-4, layout.Checkbox.bottom-4), pBorderBrush.Get()); - } - context->DrawText(g_dialog.CheckboxText.c_str(), (UINT32)g_dialog.CheckboxText.length(), fmtBtn.Get(), - D2D1::RectF(layout.Checkbox.right + 10, layout.Checkbox.top, layout.Box.right - 30, layout.Checkbox.bottom + 5), pWhite.Get(), D2D1_DRAW_TEXT_OPTIONS_NONE); - } - - // Buttons - for (size_t i = 0; i < g_dialog.Buttons.size(); ++i) { - if (i >= layout.Buttons.size()) break; - D2D1_RECT_F btnRect = layout.Buttons[i]; - - if (i == g_dialog.SelectedButtonIndex) { - context->FillRoundedRectangle(D2D1::RoundedRect(btnRect, 4.0f, 4.0f), pBorderBrush.Get()); - } else { - ComPtr pGray; - context->CreateSolidColorBrush(D2D1::ColorF(0.25f, 0.25f, 0.25f), &pGray); - context->FillRoundedRectangle(D2D1::RoundedRect(btnRect, 4.0f, 4.0f), pGray.Get()); - } - - std::wstring& text = g_dialog.Buttons[i].Text; - // Adjust rect slightly for better visual centering (baseline offset) - D2D1_RECT_F textRect = D2D1::RectF(btnRect.left, btnRect.top - 2, btnRect.right, btnRect.bottom - 2); - context->DrawText(text.c_str(), (UINT32)text.length(), fmtBtnCenter.Get(), textRect, pWhite.Get(), D2D1_DRAW_TEXT_OPTIONS_NONE, DWRITE_MEASURING_MODE_NATURAL); - } -} - -// --- Modal Dialog Loop --- - -DialogResult ShowQuickViewDialog(HWND hwnd, const std::wstring& title, const std::wstring& messageContent, - D2D1_COLOR_F accentColor, const std::vector& buttons, - bool hasChecbox = false, const std::wstring& checkboxText = L"", const std::wstring& qualityText = L"") -{ - g_dialog.IsVisible = true; - g_dialog.Title = title; - g_dialog.Message = messageContent; - g_dialog.QualityText = qualityText; - g_dialog.AccentColor = accentColor; - g_dialog.Buttons = buttons; - g_dialog.SelectedButtonIndex = 0; - g_dialog.HasCheckbox = hasChecbox; - g_dialog.CheckboxText = checkboxText; - g_dialog.IsChecked = false; - g_dialog.FinalResult = DialogResult::None; - - InvalidateRect(hwnd, nullptr, FALSE); - UpdateWindow(hwnd); - - MSG msgStruct; - while (g_dialog.IsVisible && GetMessage(&msgStruct, NULL, 0, 0)) { - if (msgStruct.message == WM_KEYDOWN) { - if (msgStruct.wParam == VK_LEFT) { - if (g_dialog.SelectedButtonIndex > 0) g_dialog.SelectedButtonIndex--; - InvalidateRect(hwnd, nullptr, FALSE); - } else if (msgStruct.wParam == VK_RIGHT) { - if (g_dialog.SelectedButtonIndex < g_dialog.Buttons.size() - 1) g_dialog.SelectedButtonIndex++; - InvalidateRect(hwnd, nullptr, FALSE); - } else if (msgStruct.wParam == VK_TAB || msgStruct.wParam == VK_SPACE) { - if (g_dialog.HasCheckbox) { - g_dialog.IsChecked = !g_dialog.IsChecked; - InvalidateRect(hwnd, nullptr, FALSE); - } - } else if (msgStruct.wParam == VK_RETURN) { - g_dialog.FinalResult = g_dialog.Buttons[g_dialog.SelectedButtonIndex].Result; - g_dialog.IsVisible = false; - } else if (msgStruct.wParam == VK_ESCAPE) { - g_dialog.FinalResult = DialogResult::None; - g_dialog.IsVisible = false; - } - } else if (msgStruct.message == WM_LBUTTONDOWN) { - RECT clientRect; GetClientRect(hwnd, &clientRect); - D2D1_SIZE_F size = D2D1::SizeF((float)(clientRect.right - clientRect.left), (float)(clientRect.bottom - clientRect.top)); - DialogLayout layout = CalculateDialogLayout(size); - - float mouseX = (float)((short)LOWORD(msgStruct.lParam)); - float mouseY = (float)((short)HIWORD(msgStruct.lParam)); - - bool handled = false; - // Check checkbox - if (g_dialog.HasCheckbox) { - // Expand hit area slightly - D2D1_RECT_F checkHit = D2D1::RectF(layout.Checkbox.left - 5, layout.Checkbox.top - 5, layout.Box.right - 20, layout.Checkbox.bottom + 5); - if (mouseX >= checkHit.left && mouseX <= checkHit.right && mouseY >= checkHit.top && mouseY <= checkHit.bottom) { - g_dialog.IsChecked = !g_dialog.IsChecked; - InvalidateRect(hwnd, nullptr, FALSE); - handled = true; - } - } - if (!handled) { - for (size_t i = 0; i < layout.Buttons.size(); ++i) { - if (mouseX >= layout.Buttons[i].left && mouseX <= layout.Buttons[i].right && - mouseY >= layout.Buttons[i].top && mouseY <= layout.Buttons[i].bottom) { - g_dialog.SelectedButtonIndex = (int)i; - g_dialog.FinalResult = g_dialog.Buttons[i].Result; - g_dialog.IsVisible = false; - break; - } - } - } - } else if (msgStruct.message == WM_MOUSEMOVE) { - // Optional: hover effect (update SelectedButtonIndex based on mouse pos) - // For now, let's keep it simple. - } - - if (msgStruct.message == WM_PAINT) { - TranslateMessage(&msgStruct); DispatchMessage(&msgStruct); - } else { - TranslateMessage(&msgStruct); DispatchMessage(&msgStruct); - } - } - - InvalidateRect(hwnd, nullptr, FALSE); - return g_dialog.FinalResult; -} - -// --- Rename Dialog (Pseudo-OSD) --- -static std::wstring g_renameResult; -static HWND g_hRenameEdit; -static WNDPROC g_oldEditProc; - -// Custom Button State -static int g_hoverBtn = -1; // 0=OK, 1=Cancel, -1=None -static bool g_isMouseDown = false; -static const RECT g_rcOk = { 115, 60, 195, 86 }; -static const RECT g_rcCancel = { 205, 60, 285, 86 }; - -// Subclass procedure for the Edit control to handle Enter/Esc -LRESULT CALLBACK EditSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) { - case WM_KEYDOWN: - if (wParam == VK_RETURN) { - SendMessage(GetParent(hwnd), WM_COMMAND, IDOK, 0); - return 0; - } - if (wParam == VK_ESCAPE) { - SendMessage(GetParent(hwnd), WM_COMMAND, IDCANCEL, 0); - return 0; - } - break; - } - return CallWindowProc(g_oldEditProc, hwnd, msg, wParam, lParam); -} - -static HBRUSH g_hDarkBrush = nullptr; - -LRESULT CALLBACK RenameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - switch (msg) { - case WM_CTLCOLOREDIT: { - HDC hdc = (HDC)wParam; - SetBkColor(hdc, RGB(30, 30, 30)); // Dark Gray - SetTextColor(hdc, RGB(255, 255, 255)); // White - if (!g_hDarkBrush) g_hDarkBrush = CreateSolidBrush(RGB(30,30,30)); - return (LRESULT)g_hDarkBrush; - } - case WM_CREATE: { - NONCLIENTMETRICSW ncm = { sizeof(NONCLIENTMETRICSW) }; - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); - ncm.lfMessageFont.lfHeight = -24; // 24px height - ncm.lfMessageFont.lfWeight = 600; // Semi-bold - HFONT hFont = CreateFontIndirectW(&ncm.lfMessageFont); - - // Edit Control moved down slightly, taller to avoid clipping - g_hRenameEdit = CreateWindowW(L"EDIT", L"", WS_VISIBLE | WS_CHILD | ES_CENTER | ES_AUTOHSCROLL, - 10, 15, 380, 30, hwnd, (HMENU)100, GetModuleHandle(nullptr), nullptr); - - SendMessage(g_hRenameEdit, WM_SETFONT, (WPARAM)hFont, TRUE); - - // Subclass to hijack Enter/Esc - g_oldEditProc = (WNDPROC)SetWindowLongPtr(g_hRenameEdit, GWLP_WNDPROC, (LONG_PTR)EditSubclassProc); - - g_hoverBtn = -1; - g_isMouseDown = false; - return 0; - } - case WM_PAINT: { - PAINTSTRUCT ps; - HDC hdc = BeginPaint(hwnd, &ps); - - // Background - HBRUSH hBg = CreateSolidBrush(RGB(30, 30, 30)); - FillRect(hdc, &ps.rcPaint, hBg); - DeleteObject(hBg); - - // Draw Buttons - auto DrawBtn = [&](const RECT& rc, const wchar_t* text, int id) { - bool isHover = (g_hoverBtn == id); - COLORREF bgCol = isHover ? (g_isMouseDown ? RGB(80, 80, 80) : RGB(60, 60, 60)) : RGB(45, 45, 45); - HBRUSH hBr = CreateSolidBrush(bgCol); - FillRect(hdc, &rc, hBr); - DeleteObject(hBr); - - // Border (optional, maybe just flat) - // FrameRect(hdc, &rc, (HBRUSH)GetStockObject(LTGRAY_BRUSH)); - - SetBkMode(hdc, TRANSPARENT); - SetTextColor(hdc, RGB(220, 220, 220)); - DrawTextW(hdc, text, -1, (LPRECT)&rc, DT_CENTER | DT_VCENTER | DT_SINGLELINE); - }; - - // Use system font for buttons - HFONT hOldFont = (HFONT)SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); - // Or better, create a specific font? Standard GUI font is ugly. - // Let's use the one from Edit control or similar? - // Ideally we should cache the button font. For now, DEFAULT_GUI_FONT is safe but ugly. - // Actually, let's re-create the button font on the fly or better cache it. - // To be safe and quick, I'll use simple variable. - - NONCLIENTMETRICSW ncm = { sizeof(NONCLIENTMETRICSW) }; - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); - ncm.lfMessageFont.lfHeight = -16; // Button font - HFONT hBtnFont = CreateFontIndirectW(&ncm.lfMessageFont); - SelectObject(hdc, hBtnFont); - - DrawBtn(g_rcOk, L"OK", 0); - DrawBtn(g_rcCancel, L"Cancel", 1); - - SelectObject(hdc, hOldFont); - DeleteObject(hBtnFont); - - EndPaint(hwnd, &ps); - return 0; - } - case WM_MOUSEMOVE: { - POINT pt = { LOWORD(lParam), HIWORD(lParam) }; - int oldHover = g_hoverBtn; - if (PtInRect(&g_rcOk, pt)) g_hoverBtn = 0; - else if (PtInRect(&g_rcCancel, pt)) g_hoverBtn = 1; - else g_hoverBtn = -1; - - if (oldHover != g_hoverBtn) { - InvalidateRect(hwnd, nullptr, FALSE); // Redraw - - if (g_hoverBtn != -1) { // Track mouse leave - TRACKMOUSEEVENT tme = { sizeof(tme), TME_LEAVE, hwnd, 0 }; - TrackMouseEvent(&tme); - } - } - return 0; - } - case WM_MOUSELEAVE: { - if (g_hoverBtn != -1) { - g_hoverBtn = -1; - InvalidateRect(hwnd, nullptr, FALSE); - } - return 0; - } - case WM_LBUTTONDOWN: { - POINT pt = { LOWORD(lParam), HIWORD(lParam) }; - if (PtInRect(&g_rcOk, pt) || PtInRect(&g_rcCancel, pt)) { - g_isMouseDown = true; - SetCapture(hwnd); - InvalidateRect(hwnd, nullptr, FALSE); - } - return 0; - } - case WM_LBUTTONUP: { - if (g_isMouseDown) { - g_isMouseDown = false; - ReleaseCapture(); - InvalidateRect(hwnd, nullptr, FALSE); - - POINT pt = { LOWORD(lParam), HIWORD(lParam) }; - if (g_hoverBtn == 0 && PtInRect(&g_rcOk, pt)) { - SendMessage(hwnd, WM_COMMAND, IDOK, 0); - } else if (g_hoverBtn == 1 && PtInRect(&g_rcCancel, pt)) { - SendMessage(hwnd, WM_COMMAND, IDCANCEL, 0); - } - } - return 0; - } - case WM_COMMAND: { - if (LOWORD(wParam) == IDOK) { - int len = GetWindowTextLengthW(g_hRenameEdit); - std::vector buf(len + 1); - if (len > 0) GetWindowTextW(g_hRenameEdit, &buf[0], len + 1); - g_renameResult = buf.data() ? buf.data() : L""; - DestroyWindow(hwnd); - return 0; - } - if (LOWORD(wParam) == IDCANCEL) { - g_renameResult.clear(); - DestroyWindow(hwnd); - return 0; - } - break; - } - case WM_ACTIVATE: - // Keep focus on edit if activated - if (LOWORD(wParam) != WA_INACTIVE) { - SetFocus(g_hRenameEdit); - } - break; - case WM_CLOSE: - g_renameResult.clear(); - DestroyWindow(hwnd); - return 0; - case WM_DESTROY: - g_thumbMgr.Shutdown(); - PostQuitMessage(0); - return 0; - } - return DefWindowProc(hwnd, msg, wParam, lParam); -} - -std::wstring ShowRenameDialog(HWND hParent, const std::wstring& oldName) { - g_renameResult.clear(); - - WNDCLASSEXW wc = { sizeof(wc) }; - wc.lpfnWndProc = RenameWndProc; - wc.hInstance = GetModuleHandle(nullptr); - wc.lpszClassName = L"QuickViewRenameOSD"; - wc.hbrBackground = CreateSolidBrush(RGB(30, 30, 30)); // Match Edit BG - wc.hCursor = LoadCursor(nullptr, IDC_ARROW); - RegisterClassExW(&wc); - - RECT rcOwner; GetWindowRect(hParent, &rcOwner); - int w = 400, h = 100; // Taller for better layout - int x = rcOwner.left + (rcOwner.right - rcOwner.left - w) / 2; - int y = rcOwner.top + (rcOwner.bottom - rcOwner.top - h) / 2; - - // WS_POPUP, No Border, TopMost (Removed WS_EX_LAYERED to keep buttons opaque) - HWND hDlg = CreateWindowExW(WS_EX_TOPMOST | WS_EX_TOOLWINDOW, L"QuickViewRenameOSD", L"", - WS_POPUP | WS_VISIBLE, x, y, w, h, hParent, nullptr, wc.hInstance, nullptr); - - // Enable rounded corners (Windows 11) - // Constants: DWMWA_WINDOW_CORNER_PREFERENCE = 33, DWMWCP_ROUND = 2 - enum { DWMWA_WINDOW_CORNER_PREFERENCE_LOCAL = 33 }; - enum { DWMWCP_ROUND_LOCAL = 2 }; - int cornerPref = DWMWCP_ROUND_LOCAL; - DwmSetWindowAttribute(hDlg, DWMWA_WINDOW_CORNER_PREFERENCE_LOCAL, &cornerPref, sizeof(cornerPref)); - - SetWindowTextW(g_hRenameEdit, oldName.c_str()); - SendMessage(g_hRenameEdit, EM_SETSEL, 0, -1); - SetFocus(g_hRenameEdit); - - EnableWindow(hParent, FALSE); - - MSG msg; - while (GetMessage(&msg, nullptr, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - EnableWindow(hParent, TRUE); - SetForegroundWindow(hParent); - return g_renameResult; -} - -// --- Logic Functions --- - -bool SaveCurrentImage(bool saveAs) { - if (!g_editState.IsDirty || g_editState.TempFilePath.empty()) return true; - ReleaseImageResources(); - - std::wstring targetPath = g_editState.OriginalFilePath; - if (saveAs) { - OPENFILENAMEW ofn = { sizeof(ofn) }; - wchar_t szFile[MAX_PATH] = { 0 }; - wcscpy_s(szFile, g_editState.OriginalFilePath.c_str()); - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = GetActiveWindow(); - ofn.lpstrFile = szFile; - ofn.nMaxFile = sizeof(szFile); - ofn.lpstrFilter = L"JPEG Files\0*.jpg;*.jpeg\0PNG Files\0*.png\0All Files\0*.*\0"; - ofn.nFilterIndex = 1; ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT; - if (GetSaveFileNameW(&ofn)) targetPath = szFile; - else { ReloadCurrentImage(GetActiveWindow()); return false; } - } - - bool success = false; - if (targetPath == g_editState.OriginalFilePath && !saveAs) { - if (MoveFileExW(g_editState.TempFilePath.c_str(), targetPath.c_str(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH)) success = true; - } else { - if (CopyFileW(g_editState.TempFilePath.c_str(), targetPath.c_str(), FALSE)) { - success = true; - DeleteFileW(g_editState.TempFilePath.c_str()); - } - } - - if (success) { - g_editState.Reset(); - g_imagePath = targetPath; - ReloadCurrentImage(GetActiveWindow()); - } else { - MessageBoxW(nullptr, L"Failed to save file. File locked?", L"Error", MB_ICONERROR); - ReloadCurrentImage(GetActiveWindow()); - return false; - } - return true; -} - -// Helper: Check if file extension matches detected format -bool CheckExtensionMismatch(const std::wstring& path, const std::wstring& format) { - if (path.empty() || format.empty()) return false; - - // Skip .tmp files (temporary files during editing) - std::wstring pathLower = path; - std::transform(pathLower.begin(), pathLower.end(), pathLower.begin(), ::towlower); - if (pathLower.ends_with(L".tmp")) return false; - - size_t lastDot = path.find_last_of(L'.'); - if (lastDot == std::wstring::npos) return true; // No extension is a mismatch (technically) - - std::wstring ext = path.substr(lastDot); - std::transform(ext.begin(), ext.end(), ext.begin(), ::towlower); - - std::wstring fmt = format; - std::transform(fmt.begin(), fmt.end(), fmt.begin(), ::towlower); - - // Basic mapping - if (fmt == L"jpeg") return (ext != L".jpg" && ext != L".jpeg" && ext != L".jpe" && ext != L".jfif"); - if (fmt == L"png") return (ext != L".png"); - if (fmt == L"webp") return (ext != L".webp"); - if (fmt == L"avif") return (ext != L".avif"); - if (fmt == L"gif") return (ext != L".gif"); - if (fmt == L"bmp") return (ext != L".bmp" && ext != L".dib"); - if (fmt == L"tiff") return (ext != L".tif" && ext != L".tiff"); - if (fmt == L"heif" || fmt == L"heic") return (ext != L".heic" && ext != L".heif"); - - // JXL - if (fmt == L"jxl" || fmt == L"jpeg xl") return (ext != L".jxl"); - - return false; -} - -void DiscardChanges() { - // Save original path BEFORE reset (Reset clears it) - std::wstring originalPath = g_editState.OriginalFilePath; - - if (g_editState.IsDirty && !g_editState.TempFilePath.empty()) { - ReleaseImageResources(); - if (!DeleteFileW(g_editState.TempFilePath.c_str())) { Sleep(100); DeleteFileW(g_editState.TempFilePath.c_str()); } - } - g_editState.Reset(); - - // Restore to original file path if we had one - if (!originalPath.empty()) { - g_imagePath = originalPath; - ReloadCurrentImage(GetActiveWindow()); - } -} - -bool CheckUnsavedChanges(HWND hwnd) { - if (!g_editState.IsDirty) return true; - if (g_config.ShouldAutoSave(g_editState.Quality)) return SaveCurrentImage(false); - - std::vector buttons = { - { DialogResult::Yes, AppStrings::Dialog_ButtonSave, true }, - { DialogResult::Custom1, AppStrings::Dialog_ButtonSaveAs }, - { DialogResult::No, AppStrings::Dialog_ButtonDiscard } - }; - - const wchar_t* checkboxLabel = AppStrings::Checkbox_AlwaysSaveLossless; - std::wstring qualityMsg = L"Quality: Lossless"; - if (g_editState.Quality == EditQuality::EdgeAdapted) { - checkboxLabel = AppStrings::Checkbox_AlwaysSaveEdgeAdapted; - qualityMsg = L"Quality: Edge Adapted"; - } - else if (g_editState.Quality == EditQuality::Lossy) { - checkboxLabel = AppStrings::Checkbox_AlwaysSaveLossy; - qualityMsg = L"Quality: Lossy Re-encoded"; - } - - DialogResult result = ShowQuickViewDialog(hwnd, AppStrings::Dialog_SaveTitle, AppStrings::Dialog_SaveContent, - g_editState.GetQualityColor(), buttons, true, checkboxLabel, qualityMsg); - - if (result == DialogResult::None) return false; - - if (g_dialog.IsChecked) { - if (g_editState.Quality == EditQuality::EdgeAdapted) g_config.AlwaysSaveEdgeAdapted = true; - else if (g_editState.Quality == EditQuality::Lossy) g_config.AlwaysSaveLossy = true; - else g_config.AlwaysSaveLossless = true; - } - - if (result == DialogResult::Yes) return SaveCurrentImage(false); - if (result == DialogResult::Custom1) return SaveCurrentImage(true); - if (result == DialogResult::No) { DiscardChanges(); return true; } - if (result == DialogResult::Cancel) return false; - - return false; -} - -void AdjustWindowToImage(HWND hwnd) { - if (!g_currentBitmap) return; - if (g_config.LockWindowSize) return; // Don't auto-resize when locked - - D2D1_SIZE_F size = g_currentBitmap->GetSize(); // DIPs - - // Get DPI - float dpi = 96.0f; - UINT dpiX = 96, dpiY = 96; - if (SUCCEEDED(GetDpiForMonitor(MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST), MDT_EFFECTIVE_DPI, &dpiX, &dpiY))) { - dpi = (float)dpiX; - } - - // Convert to Pixels - int imgW = static_cast(size.width * (dpi / 96.0f)); - int imgH = static_cast(size.height * (dpi / 96.0f)); - - // Add margin for borderless look (optional, but good for shadow) - // Actually our client area IS the window size now in borderless. - - // Get Monitor Work Area - HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - MONITORINFO mi = { sizeof(mi) }; - GetMonitorInfoW(hMon, &mi); - - int maxW = (mi.rcWork.right - mi.rcWork.left) * 9 / 10; - int maxH = (mi.rcWork.bottom - mi.rcWork.top) * 9 / 10; - - int targetW = imgW; - int targetH = imgH; - - // Scale down if too big - if (targetW > maxW || targetH > maxH) { - float ratio = std::min((float)maxW / targetW, (float)maxH / targetH); - targetW = (int)(targetW * ratio); - targetH = (int)(targetH * ratio); - } - - // Minimum size for UI controls - if (targetW < 400) targetW = 400; - if (targetH < 300) targetH = 300; - - // Center logic - RECT rcWindow; GetWindowRect(hwnd, &rcWindow); - int currentCenterX = rcWindow.left + (rcWindow.right - rcWindow.left) / 2; - int currentCenterY = rcWindow.top + (rcWindow.bottom - rcWindow.top) / 2; - - // Using SetWindowPos to resize and center roughly - // Or just resize around center? - int newLeft = currentCenterX - targetW / 2; - int newTop = currentCenterY - targetH / 2; - - // Ensure on screen - if (newLeft < mi.rcWork.left) newLeft = mi.rcWork.left; - if (newTop < mi.rcWork.top) newTop = mi.rcWork.top; - - SetWindowPos(hwnd, nullptr, newLeft, newTop, targetW, targetH, SWP_NOZORDER | SWP_NOACTIVATE); -} - -void ReloadCurrentImage(HWND hwnd) { - if (g_imagePath.empty() && g_editState.OriginalFilePath.empty()) return; - g_currentBitmap.Reset(); - LPCWSTR path; - if (g_editState.IsDirty && FileExists(g_editState.TempFilePath.c_str())) path = g_editState.TempFilePath.c_str(); - else path = g_editState.OriginalFilePath.empty() ? g_imagePath.c_str() : g_editState.OriginalFilePath.c_str(); - - LoadImageAsync(hwnd, path); - // Note: AdjustWindowToImage is called inside LoadImageAsync upon success -} - -void PerformTransform(HWND hwnd, TransformType type) { - if (g_imagePath.empty()) return; - - // Set Wait Cursor - HCURSOR hOldCursor = SetCursor(LoadCursor(nullptr, IDC_WAIT)); - - if (!g_editState.IsDirty && g_editState.OriginalFilePath.empty()) { - g_editState.OriginalFilePath = g_imagePath; - g_editState.TempFilePath = g_imagePath + L".rotating.tmp"; - } - ReleaseImageResources(); - TransformResult result; - LPCWSTR inputPath = (g_editState.IsDirty && FileExists(g_editState.TempFilePath.c_str())) ? g_editState.TempFilePath.c_str() : g_editState.OriginalFilePath.c_str(); - LPCWSTR outputPath = g_editState.TempFilePath.c_str(); - - if (CLosslessTransform::IsJPEG(inputPath)) result = CLosslessTransform::TransformJPEG(inputPath, outputPath, type); - else result = CLosslessTransform::TransformGeneric(inputPath, outputPath, type); - - // Restore Cursor - SetCursor(hOldCursor); - - if (result.Success) { - if (type == TransformType::Rotate90CW) g_editState.TotalRotation = (g_editState.TotalRotation + 90) % 360; - else if (type == TransformType::Rotate90CCW) g_editState.TotalRotation = (g_editState.TotalRotation + 270) % 360; - else if (type == TransformType::Rotate180) g_editState.TotalRotation = (g_editState.TotalRotation + 180) % 360; - else if (type == TransformType::FlipHorizontal) g_editState.FlippedH = !g_editState.FlippedH; - else if (type == TransformType::FlipVertical) g_editState.FlippedV = !g_editState.FlippedV; - - g_editState.Quality = result.Quality; - bool isModified = (g_editState.TotalRotation != 0 || g_editState.FlippedH || g_editState.FlippedV); - bool hasDataLoss = (result.Quality == EditQuality::EdgeAdapted || result.Quality == EditQuality::Lossy); - - if (!isModified && !hasDataLoss) { - g_editState.IsDirty = false; - DeleteFileW(g_editState.TempFilePath.c_str()); - g_osd.Show(hwnd, std::wstring(CLosslessTransform::GetTransformName(type)) + L" (Restored)", false, false, g_editState.GetQualityColor()); - } else { - g_editState.IsDirty = true; - g_osd.Show(hwnd, std::wstring(CLosslessTransform::GetTransformName(type)) + L" - " + g_editState.GetQualityText(), false, false, g_editState.GetQualityColor()); - } - ReloadCurrentImage(hwnd); - } else { - g_osd.Show(hwnd, std::wstring(CLosslessTransform::GetTransformName(type)) + L" failed: " + result.ErrorMessage, true); - ReloadCurrentImage(hwnd); - } -} - -int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR, int nCmdShow) { - // Enable Per-Monitor DPI Awareness V2 for proper multi-monitor support - // This enables WM_DPICHANGED messages when window is dragged across monitors - SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); - - HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - WNDCLASSEXW wcex = {}; - wcex.cbSize = sizeof(WNDCLASSEXW); - wcex.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; - wcex.lpfnWndProc = WndProc; - wcex.hInstance = hInstance; - wcex.hCursor = LoadCursor(nullptr, IDC_ARROW); - wcex.hbrBackground = nullptr; - wcex.lpszClassName = g_szClassName; - wcex.hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(1)); // Load from resource - wcex.hIconSm = LoadIconW(hInstance, MAKEINTRESOURCEW(1)); // Load from resource - - RegisterClassExW(&wcex); - HWND hwnd = CreateWindowExW(0, g_szClassName, g_szWindowTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, nullptr, nullptr, hInstance, nullptr); - if (!hwnd) return 0; - - g_renderEngine = std::make_unique(); g_renderEngine->Initialize(hwnd); - g_imageLoader = std::make_unique(); g_imageLoader->Initialize(g_renderEngine->GetWICFactory()); - - // Init Gallery - g_thumbMgr.Initialize(hwnd, g_imageLoader.get()); - g_gallery.Initialize(&g_thumbMgr, &g_navigator); - DragAcceptFiles(hwnd, TRUE); - ShowWindow(hwnd, nCmdShow); UpdateWindow(hwnd); - - int argc = 0; LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc); - if (argc > 1) { - g_navigator.Initialize(argv[1]); - LoadImageAsync(hwnd, argv[1]); - } else { - // No file specified - auto open file dialog - OPENFILENAMEW ofn = {}; - wchar_t szFile[MAX_PATH] = {}; - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = hwnd; - ofn.lpstrFile = szFile; - ofn.nMaxFile = MAX_PATH; - ofn.lpstrFilter = L"All Images\0*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.webp;*.avif;*.jxl;*.heic;*.heif;*.tga;*.psd;*.hdr;*.exr;*.svg;*.qoi;*.pcx;*.raw;*.arw;*.cr2;*.cr3;*.nef;*.dng;*.orf;*.rw2;*.raf;*.pef;*.pgm;*.ppm\0JPEG\0*.jpg;*.jpeg\0PNG\0*.png\0WebP\0*.webp\0AVIF\0*.avif\0JPEG XL\0*.jxl\0HEIC/HEIF\0*.heic;*.heif\0RAW\0*.raw;*.arw;*.cr2;*.cr3;*.nef;*.dng;*.orf;*.rw2;*.raf;*.pef\0All Files\0*.*\0"; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; - if (GetOpenFileNameW(&ofn)) { - g_navigator.Initialize(szFile); - LoadImageAsync(hwnd, szFile); - } - } - LocalFree(argv); - - MSG msg; - while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } - DiscardChanges(); CoUninitialize(); return (int)msg.wParam; -} - -LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static bool isTracking = false; - switch (message) { - case WM_CREATE: { - MARGINS margins = { 0, 0, 0, 1 }; - DwmExtendFrameIntoClientArea(hwnd, &margins); - SetWindowPos(hwnd, nullptr, 0,0,0,0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER); - return 0; - } - case WM_NCCALCSIZE: if (wParam) return 0; break; - case WM_APP + 1: { - auto handle = std::coroutine_handle<>::from_address((void*)lParam); - handle.resume(); - return 0; - } - case WM_TIMER: { - static const UINT_PTR INTERACTION_TIMER_ID = 1001; - static const UINT_PTR OSD_TIMER_ID = 999; - - // Interaction Timer (1001) - if (wParam == INTERACTION_TIMER_ID) { - KillTimer(hwnd, INTERACTION_TIMER_ID); - g_viewState.IsInteracting = false; // End interaction mode - InvalidateRect(hwnd, nullptr, FALSE); // Redraw with high quality - } - - // OSD Timer (999) - Heartbeat/Expiration check - if (wParam == OSD_TIMER_ID) { - if (!g_osd.IsVisible()) { - KillTimer(hwnd, OSD_TIMER_ID); - InvalidateRect(hwnd, nullptr, FALSE); // Clear it (redraw without OSD) - } - } - - // Gallery Fade Timer (998) - if (wParam == 998) { - if (g_gallery.IsVisible()) { - InvalidateRect(hwnd, nullptr, FALSE); - // Stop timer if opacity reached full - if (g_gallery.GetOpacity() >= 1.0f) { - KillTimer(hwnd, 998); - } - } else { - KillTimer(hwnd, 998); - } - } - - // Toolbar Animation Timer (997) - if (wParam == 997) { - // Auto-Hide Delay Logic - if (g_toolbarHideTime > 0 && (GetTickCount() - g_toolbarHideTime > 2000)) { - if (!g_toolbar.IsPinned()) g_toolbar.SetVisible(false); - } - - bool animating = g_toolbar.UpdateAnimation(); - - // Keep timer alive if motivating factor exists (Animation OR Pending Hide) - if (animating || (g_toolbar.IsVisible() && !g_toolbar.IsPinned() && g_toolbarHideTime > 0)) { - InvalidateRect(hwnd, nullptr, FALSE); - } else { - KillTimer(hwnd, 997); - } - } - return 0; - } - case WM_NCHITTEST: { - LRESULT hit = DefWindowProc(hwnd, message, wParam, lParam); - if (hit != HTCLIENT) return hit; - - POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - RECT rc; GetWindowRect(hwnd, &rc); - int border = 8; - - if (pt.y < rc.top + border) { - if (pt.x < rc.left + border) return HTTOPLEFT; - if (pt.x > rc.right - border) return HTTOPRIGHT; - return HTTOP; - } - if (pt.y > rc.bottom - border) { - if (pt.x < rc.left + border) return HTBOTTOMLEFT; - if (pt.x > rc.right - border) return HTBOTTOMRIGHT; - return HTBOTTOM; - } - if (pt.x < rc.left + border) return HTLEFT; - if (pt.x > rc.right - border) return HTRIGHT; - - ScreenToClient(hwnd, &pt); - D2D1_POINT_2F localPt = D2D1::Point2F((float)pt.x, (float)pt.y); - - // Buttons always HTCLIENT (handled in LBUTTONUP/DOWN) - - return HTCLIENT; - } - - case WM_SIZE: - if (wParam != SIZE_MINIMIZED) { - OnResize(hwnd, LOWORD(lParam), HIWORD(lParam)); - CalculateWindowControls(D2D1::SizeF((float)LOWORD(lParam), (float)HIWORD(lParam))); - } - return 0; - - case WM_DPICHANGED: { - // Handle DPI change (e.g., window dragged to different monitor) - // wParam: LOWORD = new X DPI, HIWORD = new Y DPI - // lParam: pointer to RECT with suggested new window size/position - RECT* pNewRect = (RECT*)lParam; - SetWindowPos(hwnd, nullptr, - pNewRect->left, pNewRect->top, - pNewRect->right - pNewRect->left, - pNewRect->bottom - pNewRect->top, - SWP_NOZORDER | SWP_NOACTIVATE); - // WM_SIZE will be triggered by SetWindowPos, which calls OnResize - // No additional action needed - D2D handles DPI internally - return 0; - } - - case WM_CLOSE: if (!CheckUnsavedChanges(hwnd)) return 0; DestroyWindow(hwnd); return 0; - case WM_DESTROY: g_thumbMgr.Shutdown(); PostQuitMessage(0); return 0; - - // Mouse Interaction - case WM_MOUSEMOVE: { - POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - - if (g_gallery.IsVisible()) { - - g_gallery.OnMouseMove((float)pt.x, (float)pt.y); - InvalidateRect(hwnd, nullptr, FALSE); // Always redraw for tooltip - } - - // Toolbar Trigger - RECT rc; GetClientRect(hwnd, &rc); - float winH = (float)(rc.bottom - rc.top); - float zoneHeight = g_toolbar.IsVisible() ? 100.0f : 60.0f; // Expanded zone if visible - bool inZone = (pt.y > winH - zoneHeight); - - static DWORD s_hideRequestTime = 0; - - if (inZone || g_toolbar.IsPinned()) { - g_toolbar.SetVisible(true); - s_hideRequestTime = 0; - } else { - // Outside zone and not pinned - if (g_toolbar.IsVisible() && s_hideRequestTime == 0) { - s_hideRequestTime = GetTickCount(); // Start countdown - } - } - - // Pass intent to Timer: - // We can't pass 's_hideRequestTime' to Timer easily without global. - // Let's use a static variable in main.cpp scope or just a global. - // For now, let's just use SetVisible(false) here IF the delay was short, but for 2s delay we need Timer. - // Let's store s_hideRequestTime in a global "g_toolbarHideTime" for simplicity. - extern DWORD g_toolbarHideTime; // Defined in global scope - g_toolbarHideTime = s_hideRequestTime; - - g_toolbar.OnMouseMove((float)pt.x, (float)pt.y); - - // Set hand cursor when hovering toolbar buttons - if (g_toolbar.IsVisible() && g_toolbar.HitTest((float)pt.x, (float)pt.y)) { - SetCursor(LoadCursor(nullptr, IDC_HAND)); - } - - SetTimer(hwnd, 997, 16, nullptr); // Drive animation/latency logic - // Force redraw for hover effects when toolbar is visible - if (g_toolbar.IsVisible() || g_config.ShowInfoPanel) { - InvalidateRect(hwnd, nullptr, FALSE); - } - // Update Button Hover - WindowHit oldHit = g_winControls.HoverState; - g_winControls.HoverState = WindowHit::None; - - // Auto-Show Controls Logic - RECT rcClient; GetClientRect(hwnd, &rcClient); - bool inTopArea = (pt.y <= 60); // 60px top area - - if (g_config.AutoHideWindowControls) { - bool shouldShow = inTopArea || (oldHit != WindowHit::None); // Keep showing if previously hovering button? - // Simpler: Just rely on mouse Y. - if (inTopArea != g_showControls) { - g_showControls = inTopArea; - InvalidateRect(hwnd, nullptr, FALSE); - } - } else { - if (!g_showControls) { g_showControls = true; InvalidateRect(hwnd, nullptr, FALSE); } - } - - if (g_showControls) { - if (pt.x >= (long)g_winControls.CloseRect.left && pt.x <= (long)g_winControls.CloseRect.right && pt.y <= (long)g_winControls.CloseRect.bottom) - g_winControls.HoverState = WindowHit::Close; - else if (pt.x >= (long)g_winControls.MaxRect.left && pt.x <= (long)g_winControls.MaxRect.right && pt.y <= (long)g_winControls.MaxRect.bottom) - g_winControls.HoverState = WindowHit::Max; - else if (pt.x >= (long)g_winControls.MinRect.left && pt.x <= (long)g_winControls.MinRect.right && pt.y <= (long)g_winControls.MinRect.bottom) - g_winControls.HoverState = WindowHit::Min; - else if (pt.x >= (long)g_winControls.PinRect.left && pt.x <= (long)g_winControls.PinRect.right && pt.y <= (long)g_winControls.PinRect.bottom) - g_winControls.HoverState = WindowHit::Pin; - - // Hand cursor for window control buttons - if (g_winControls.HoverState != WindowHit::None) { - SetCursor(LoadCursor(nullptr, IDC_HAND)); - } - } - - if (oldHit != g_winControls.HoverState) { - if (!isTracking) { - TRACKMOUSEEVENT tme = { sizeof(TRACKMOUSEEVENT), TME_LEAVE, hwnd, 0 }; - TrackMouseEvent(&tme); - isTracking = true; - } - InvalidateRect(hwnd, nullptr, FALSE); - } - - if (g_viewState.IsDragging) { - g_viewState.PanX += (pt.x - g_viewState.LastMousePos.x); - g_viewState.PanY += (pt.y - g_viewState.LastMousePos.y); - g_viewState.LastMousePos = pt; - InvalidateRect(hwnd, nullptr, FALSE); - } - - // Hand cursor for info panel clickable areas - if (g_config.ShowInfoPanel) { - float mx = (float)pt.x, my = (float)pt.y; - bool onClickable = false; - - // Toggle/Close buttons - if ((mx >= g_panelToggleRect.left && mx <= g_panelToggleRect.right && my >= g_panelToggleRect.top && my <= g_panelToggleRect.bottom) || - (mx >= g_panelCloseRect.left && mx <= g_panelCloseRect.right && my >= g_panelCloseRect.top && my <= g_panelCloseRect.bottom)) { - onClickable = true; - } - - // Info grid rows (when expanded) - if (g_config.InfoPanelExpanded) { - for (const auto& row : g_infoGrid) { - if (mx >= row.hitRect.left && mx <= row.hitRect.right && my >= row.hitRect.top && my <= row.hitRect.bottom) { - onClickable = true; break; - } - } - // GPS coordinate and link - if (g_currentMetadata.HasGPS) { - if ((mx >= g_gpsCoordRect.left && mx <= g_gpsCoordRect.right && my >= g_gpsCoordRect.top && my <= g_gpsCoordRect.bottom) || - (mx >= g_gpsLinkRect.left && mx <= g_gpsLinkRect.right && my >= g_gpsLinkRect.top && my <= g_gpsLinkRect.bottom)) { - onClickable = true; - } - } - } - - if (onClickable) SetCursor(LoadCursor(nullptr, IDC_HAND)); - } - return 0; - } - case WM_MOUSELEAVE: - g_winControls.HoverState = WindowHit::None; - if (g_config.AutoHideWindowControls) { g_showControls = false; } - isTracking = false; - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - - - - case WM_MBUTTONDOWN: { - // Record start position/time for click vs drag detection - g_viewState.LastMousePos = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - g_viewState.DragStartPos = g_viewState.LastMousePos; - g_viewState.DragStartTime = GetTickCount(); - - // Only allow panning if image exceeds window bounds - if (CanPan(hwnd)) { - SetCapture(hwnd); - g_viewState.IsDragging = true; - g_viewState.IsInteracting = true; // Start interaction mode - } else { - // Not dragging, but still need to track for click detection - g_viewState.IsDragging = false; // Will check on MBUTTONUP - } - return 0; - } - case WM_MBUTTONUP: { - // Release capture if we were dragging - if (g_viewState.IsDragging) { - ReleaseCapture(); - g_viewState.IsDragging = false; - } - - // FIRST: Check if this was a "click" (short duration, minimal movement) - // Must check BEFORE setting IsInteracting=false to avoid triggering HIGH_QUALITY repaint - POINT currentPos = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - DWORD elapsed = GetTickCount() - g_viewState.DragStartTime; - int dx = abs(currentPos.x - g_viewState.DragStartPos.x); - int dy = abs(currentPos.y - g_viewState.DragStartPos.y); - - // Click threshold: <300ms and <5px movement - if (elapsed < 300 && dx < 5 && dy < 5) { - if (g_config.MiddleClickAction == MouseAction::ExitApp) { - // CRITICAL FIX: Use WM_CLOSE instead of PostQuitMessage - // PostQuitMessage kills the message loop immediately, causing DXGI - // cleanup deadlock (SwapChain needs to communicate with HWND during Release) - // WM_CLOSE triggers proper destruction: WM_CLOSE -> DestroyWindow -> WM_DESTROY - // This allows DXGI to clean up while message loop is still active - if (CheckUnsavedChanges(hwnd)) { - PostMessage(hwnd, WM_CLOSE, 0, 0); - return 0; - } - } - } - - // Only end interaction and repaint if NOT exiting - g_viewState.IsInteracting = false; - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - - case WM_LBUTTONDBLCLK: - // Fit Window - restore from maximized first if needed - if (IsZoomed(hwnd)) { - ShowWindow(hwnd, SW_RESTORE); - } - g_viewState.Reset(); - AdjustWindowToImage(hwnd); // Reset window size too - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - - case WM_PAINT: - OnPaint(hwnd); - // Gallery Animation Loop if visible - if (g_gallery.IsVisible()) { - // Need continuous update for fade-in? - // Simple hack: Invalidate if fading - // Or use OnPaint delta time? - // Let's assume OnPaint happens? - // Better: SetTimer logic or just Invalidate if opacity < 1.0f inside Render? - // GalleryOverlay::Render doesn't invalidate. - // Let's rely on standard Paint messages or manual Invalidate from Interaction. - // For animation "Fade In", we should probably Invalidate continuously for 0.2s. - // We can add logic in OnPaint or just Timer? - // Simplest: In Render call, if animating, POST Invalidate? - // Let's do nothing special here, OnPaint calls Render. - } - return 0; - - case WM_THUMB_KEY_READY: - // Redraw only if gallery visible - if (g_gallery.IsVisible()) { - InvalidateRect(hwnd, nullptr, FALSE); - } - return 0; - - case WM_LBUTTONDOWN: { - POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - - // Window control buttons click handling - if (g_showControls && g_winControls.HoverState != WindowHit::None) { - switch (g_winControls.HoverState) { - case WindowHit::Close: SendMessage(hwnd, WM_CLOSE, 0, 0); return 0; - case WindowHit::Max: ShowWindow(hwnd, IsZoomed(hwnd) ? SW_RESTORE : SW_MAXIMIZE); return 0; - case WindowHit::Min: ShowWindow(hwnd, SW_MINIMIZE); return 0; - case WindowHit::Pin: SendMessage(hwnd, WM_COMMAND, IDM_ALWAYS_ON_TOP, 0); return 0; - default: break; - } - } - - if (g_gallery.IsVisible()) { - if (g_gallery.OnLButtonDown(pt.x, pt.y)) { - // Check if closed with selection - if (!g_gallery.IsVisible()) { - int idx = g_gallery.GetSelectedIndex(); - if (idx >= 0 && idx < (int)g_navigator.Count()) { - // Sync Navigator? - // Navigator doesn't have SetIndex. Need to use file path. - std::wstring path = g_navigator.GetFile(idx); - g_navigator.Initialize(path); // Re-init to jump to index? (Inefficient but robust) - // Actually Initialize does scanning. FindIndex is better but we don't have SetIndex. - // Let's just LoadImageAsync(path). Navigator usually updates on Load? - // LoadImageAsync helper doesn't update Navigator index explicitly unless it scans? - // Initialize updates index. - // But if we just call LoadImageAsync(hwnd, path), DragDrop does Initialize. - // Let's re-initialize navigator carefully or just assume path loading works. - // Correct flow: - g_navigator.Initialize(path); // Update index state - LoadImageAsync(hwnd, path.c_str()); - } - InvalidateRect(hwnd, nullptr, FALSE); - } else { - InvalidateRect(hwnd, nullptr, FALSE); - } - } - return 0; - } - - if (g_config.ShowInfoPanel) { - // 1. Toggle Button - if (pt.x >= g_panelToggleRect.left && pt.x <= g_panelToggleRect.right && - pt.y >= g_panelToggleRect.top && pt.y <= g_panelToggleRect.bottom) { - g_config.InfoPanelExpanded = !g_config.InfoPanelExpanded; - // Lazy Load Histogram if expanding and data missing - if (g_config.InfoPanelExpanded && g_currentMetadata.HistR.empty() && !g_imagePath.empty()) { - UpdateHistogramAsync(hwnd, g_imagePath); - } - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - - // 2. Close Button - if (pt.x >= g_panelCloseRect.left && pt.x <= g_panelCloseRect.right && - pt.y >= g_panelCloseRect.top && pt.y <= g_panelCloseRect.bottom) { - g_config.ShowInfoPanel = false; - g_toolbar.SetExifState(false); // Sync toolbar icon state - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - - // 3. Grid Row Click (Copy to Clipboard) - if (g_config.InfoPanelExpanded) { - float mx = (float)pt.x; - float my = (float)pt.y; - for (const auto& row : g_infoGrid) { - if (mx >= row.hitRect.left && mx <= row.hitRect.right && - my >= row.hitRect.top && my <= row.hitRect.bottom) { - - std::wstring textToCopy = row.fullText.empty() ? row.valueMain : row.valueMain; // Prefer Main or Full? - // Logic: If truncated, fullText usually holds untruncated. If unique (like filename), fullText holds basename. - // Let's use fullText if available and different? - // Actually: - // File: fullText = basename - // Size: fullText = "" - // Lens: fullText = lens name - // So fullText is good. If empty, use valueMain. - if (!row.fullText.empty()) textToCopy = row.fullText; - else textToCopy = row.valueMain; - - // Special case: File -> Full Path - if (row.label == L"File") textToCopy = g_imagePath; - - if (CopyToClipboard(hwnd, textToCopy)) { - g_osd.Show(hwnd, L"Copied!", false); - } - InvalidateRect(hwnd, nullptr, FALSE); // For visual feedback if we add click effect later - return 0; - } - } - } - - // 3. GPS Coordinates (Click to Copy) - if (g_config.InfoPanelExpanded && g_currentMetadata.HasGPS) { - if (pt.x >= g_gpsCoordRect.left && pt.x <= g_gpsCoordRect.right && - pt.y >= g_gpsCoordRect.top && pt.y <= g_gpsCoordRect.bottom) { - wchar_t coordBuf[128]; - swprintf_s(coordBuf, L"%.6f, %.6f", g_currentMetadata.Latitude, g_currentMetadata.Longitude); - if (CopyToClipboard(hwnd, coordBuf)) { - g_osd.Show(hwnd, L"Coordinates copied!", false); - } - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - } - - // 4. GPS Link (Bing Maps) - Only if Expanded - if (g_config.InfoPanelExpanded && g_currentMetadata.HasGPS) { - if (pt.x >= g_gpsLinkRect.left && pt.x <= g_gpsLinkRect.right && - pt.y >= g_gpsLinkRect.top && pt.y <= g_gpsLinkRect.bottom) { - wchar_t url[256]; - // Bing Maps URL format - swprintf_s(url, L"https://www.bing.com/maps?where1=%.6f%%2C%.6f", g_currentMetadata.Latitude, g_currentMetadata.Longitude); - ShellExecuteW(nullptr, L"open", url, nullptr, nullptr, SW_SHOWNORMAL); - return 0; - } - } - - // 5. Filename (Click to Copy) - Only if Expanded - if (g_config.InfoPanelExpanded) { - if (pt.x >= g_filenameRect.left && pt.x <= g_filenameRect.right && - pt.y >= g_filenameRect.top && pt.y <= g_filenameRect.bottom) { - std::wstring filename = g_imagePath.substr(g_imagePath.find_last_of(L"\\/") + 1); - if (CopyToClipboard(hwnd, filename)) { - g_osd.Show(hwnd, L"Filename copied!", false); - } - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - } - } - - // Buttons (Window Controls) - if (g_showControls) { - if (g_winControls.HoverState == WindowHit::Close) { PostMessage(hwnd, WM_CLOSE, 0, 0); return 0; } - if (g_winControls.HoverState == WindowHit::Max) { - if (IsZoomed(hwnd)) ShowWindow(hwnd, SW_RESTORE); else ShowWindow(hwnd, SW_MAXIMIZE); - return 0; - } - if (g_winControls.HoverState == WindowHit::Min) { ShowWindow(hwnd, SW_MINIMIZE); return 0; } - } - - // Toolbar Interaction - Prevent Window Drag if clicking toolbar - if (g_toolbar.IsVisible() && g_toolbar.HitTest((float)pt.x, (float)pt.y)) { - return 0; // Handled by LBUTTONUP - } - - if (g_config.LeftDragAction == MouseAction::WindowDrag) { - ReleaseCapture(); - SendMessage(hwnd, WM_NCLBUTTONDOWN, HTCAPTION, 0); - return 0; - } else if (g_config.LeftDragAction == MouseAction::PanImage) { - // Only allow panning if image exceeds window bounds - if (CanPan(hwnd)) { - SetCapture(hwnd); - g_viewState.IsDragging = true; - g_viewState.IsInteracting = true; // Start interaction mode - g_viewState.LastMousePos = pt; - } - } - return 0; - } - case WM_LBUTTONUP: { - POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - - // Toolbar Click - ToolbarButtonID tbId; - if (g_toolbar.OnClick((float)pt.x, (float)pt.y, tbId)) { - switch (tbId) { - case ToolbarButtonID::Prev: Navigate(hwnd, -1); break; - case ToolbarButtonID::Next: Navigate(hwnd, 1); break; - case ToolbarButtonID::RotateL: PerformTransform(hwnd, TransformType::Rotate90CCW); break; - case ToolbarButtonID::RotateR: PerformTransform(hwnd, TransformType::Rotate90CW); break; - case ToolbarButtonID::FlipH: PerformTransform(hwnd, TransformType::FlipHorizontal); break; - case ToolbarButtonID::LockSize: SendMessage(hwnd, WM_COMMAND, IDM_LOCK_WINDOW_SIZE, 0); break; - case ToolbarButtonID::Exif: SendMessage(hwnd, WM_COMMAND, IDM_SHOW_INFO_PANEL, 0); break; - case ToolbarButtonID::RawToggle: { - g_config.ForceRawDecode = !g_config.ForceRawDecode; - // Reload - ReleaseImageResources(); // Free current - LoadImageAsync(hwnd, g_imagePath); - - std::wstring msg = g_config.ForceRawDecode ? L"RAW: Full Decode (High Quality)" : L"RAW: Embedded Preview (Fast)"; - g_osd.Show(hwnd, msg, false); - break; - } - case ToolbarButtonID::FixExtension: SendMessage(hwnd, WM_COMMAND, IDM_FIX_EXTENSION, 0); break; - case ToolbarButtonID::Pin: { - g_toolbar.TogglePin(); - // Refresh layout to update icon - RECT rc; GetClientRect(hwnd, &rc); - g_toolbar.UpdateLayout((float)rc.right, (float)rc.bottom); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - case ToolbarButtonID::Gallery: - if (g_gallery.IsVisible()) g_gallery.Close(); else g_gallery.Open(g_navigator.Index()); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - return 0; - } - - if (g_viewState.IsDragging) { - ReleaseCapture(); - g_viewState.IsDragging = false; - } - g_viewState.IsInteracting = false; // End interaction mode - InvalidateRect(hwnd, nullptr, FALSE); // Redraw with high quality - return 0; - } - - case WM_MOUSEWHEEL: { - if (g_gallery.IsVisible()) { - int delta = GET_WHEEL_DELTA_WPARAM(wParam); - if (g_gallery.OnMouseWheel(delta)) { - InvalidateRect(hwnd, nullptr, FALSE); - } - return 0; - } - if (!g_currentBitmap) return 0; - - // --- Magnetic Snap Time Lock --- - static DWORD s_lastSnapTime = 0; - if (GetTickCount() - s_lastSnapTime < 400) { - return 0; // Ignore input briefly after snapping - } - - // Enable interaction mode during zoom (use LINEAR interpolation) - g_viewState.IsInteracting = true; - // Set timer to reset interaction mode after 150ms of inactivity - static const UINT_PTR INTERACTION_TIMER_ID = 1001; - SetTimer(hwnd, INTERACTION_TIMER_ID, 150, nullptr); - - float delta = GET_WHEEL_DELTA_WPARAM(wParam) / 120.0f; - - // Calc Current Total Scale (Fit * Zoom) - RECT rc; GetClientRect(hwnd, &rc); - D2D1_SIZE_F imgSize = g_currentBitmap->GetSize(); - float fitScale = std::min((float)rc.right / imgSize.width, (float)rc.bottom / imgSize.height); - float currentTotalScale = fitScale * g_viewState.Zoom; - - float zoomFactor = (delta > 0) ? 1.1f : 0.90909f; - float newTotalScale = currentTotalScale * zoomFactor; - - // --- Magnetic Snap to 100% --- - const float SNAP_THRESHOLD = 0.05f; - bool isAlreadyAt100 = (abs(currentTotalScale - 1.0f) < 0.001f); - - if (!isAlreadyAt100) { - bool snapped = false; - // Check for crossing 1.0 - if ((currentTotalScale < 1.0f && newTotalScale > 1.0f) || - (currentTotalScale > 1.0f && newTotalScale < 1.0f)) { - newTotalScale = 1.0f; - snapped = true; - } - // Check for proximity - else if (abs(newTotalScale - 1.0f) < SNAP_THRESHOLD) { - newTotalScale = 1.0f; - snapped = true; - } - - if (snapped) { - s_lastSnapTime = GetTickCount(); // Engage Time Lock - } - } - - // Limits - if (newTotalScale < 0.1f * fitScale) newTotalScale = 0.1f * fitScale; // Min 10% of FIT - if (newTotalScale > 20.0f) newTotalScale = 20.0f; - - if (g_config.ResizeWindowOnZoom && !IsZoomed(hwnd) && !g_config.LockWindowSize) { - // Calculate Desired Window Size to achieve NewTotalScale with Zoom=1.0 (Fit) - // DesiredCanvasW = ImageW * NewTotalScale - // But FitScale logic is Window / Image. - // If we set Window = Image * NewTotalScale, then FitScale = NewTotalScale. - // So ViewState.Zoom should be 1.0. - - // Get Monitor Info - HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - MONITORINFO mi = { sizeof(mi) }; GetMonitorInfoW(hMon, &mi); - int maxW = (mi.rcWork.right - mi.rcWork.left); - int maxH = (mi.rcWork.bottom - mi.rcWork.top); - - int targetW = (int)(imgSize.width * newTotalScale); - int targetH = (int)(imgSize.height * newTotalScale); - - // Clamp - bool capped = false; - if (targetW > maxW) { targetW = maxW; capped = true; } - if (targetH > maxH) { targetH = maxH; capped = true; } - if (targetW < 400) { targetW = 400; capped = true; } // Min size - if (targetH < 300) { targetH = 300; capped = true; } - - // Apply Window Resize - // Center window on screen or keep center? - // Usually keep center. - RECT rcWin; GetWindowRect(hwnd, &rcWin); - int cX = rcWin.left + (rcWin.right - rcWin.left) / 2; - int cY = rcWin.top + (rcWin.bottom - rcWin.top) / 2; - - // If we are resizing window, 'FitScale' changes. - // Final 'FitScale' will be min(TargetW/ImgW, TargetH/ImgH). - // We want FinalTotalScale = NewTotalScale. - // So ViewState.Zoom = NewTotalScale / FinalFitScale. - - SetWindowPos(hwnd, nullptr, cX - targetW/2, cY - targetH/2, targetW, targetH, SWP_NOZORDER | SWP_NOACTIVATE); - - // Recalculate Zoom - float newFitScale = std::min((float)targetW / imgSize.width, (float)targetH / imgSize.height); - g_viewState.Zoom = newTotalScale / newFitScale; - - // Reset Pan when window adapting (optional, keeps image centered) - if (!capped) { g_viewState.PanX = 0; g_viewState.PanY = 0; } - } else { - // Standard Zoom (Window size fixed or Maxed) - // Zoom centered on window center - RECT rcNew; GetClientRect(hwnd, &rcNew); - - float newFitScale = std::min((float)rcNew.right / imgSize.width, (float)rcNew.bottom / imgSize.height); - float oldZoom = g_viewState.Zoom; - float newZoom = newTotalScale / newFitScale; - - // Simple center-based zoom: just scale Pan values proportionally - // Since zoom is centered on window center, pan should scale with zoom ratio - float zoomRatio = newZoom / oldZoom; - g_viewState.PanX *= zoomRatio; - g_viewState.PanY *= zoomRatio; - g_viewState.Zoom = newZoom; - } - - // Show Zoom OSD - int percent = (int)(std::round(newTotalScale * 100.0f)); - bool is100 = (abs(newTotalScale - 1.0f) < 0.001f); - - wchar_t zoomBuf[32]; - swprintf_s(zoomBuf, L"Zoom: %d%%", percent); - D2D1_COLOR_F color = is100 ? D2D1::ColorF(0.4f, 1.0f, 0.4f) : D2D1::ColorF(D2D1::ColorF::White); // Green if 100% - - g_osd.Show(hwnd, zoomBuf, false, false, color); - - InvalidateRect(hwnd, nullptr, FALSE); - return 0; - } - - - case WM_DROPFILES: { - if (!CheckUnsavedChanges(hwnd)) return 0; - HDROP hDrop = reinterpret_cast(wParam); - wchar_t path[MAX_PATH]; - if (DragQueryFileW(hDrop, 0, path, MAX_PATH)) { - g_editState.Reset(); - g_viewState.Reset(); - g_navigator.Initialize(path); - g_thumbMgr.ClearCache(); // Fix: Clear old thumbnails on folder switch - LoadImageAsync(hwnd, path); // Async - InvalidateRect(hwnd, nullptr, FALSE); - } - DragFinish(hDrop); - return 0; - } - case WM_KEYDOWN: { - // Gallery handling - if (g_gallery.IsVisible()) { - if (g_gallery.OnKeyDown(wParam)) { - if (!g_gallery.IsVisible()) { - // Closed with selection potentially - int idx = g_gallery.GetSelectedIndex(); - if (idx >= 0 && idx < (int)g_navigator.Count()) { - std::wstring path = g_navigator.GetFile(idx); - g_navigator.Initialize(path); - LoadImageAsync(hwnd, path.c_str()); - } - InvalidateRect(hwnd, nullptr, FALSE); - } else { - InvalidateRect(hwnd, nullptr, FALSE); - } - return 0; - } - // If ESC handled by gallery, fine. - } else { - // Not Visible - Handled in switch below - } - - bool shift = (GetKeyState(VK_SHIFT) & 0x8000) != 0; - bool ctrl = (GetKeyState(VK_CONTROL) & 0x8000) != 0; - bool alt = (GetKeyState(VK_MENU) & 0x8000) != 0; - - switch (wParam) { - // Navigation - case VK_LEFT: Navigate(hwnd, -1); break; - case VK_RIGHT: Navigate(hwnd, 1); break; - case VK_SPACE: Navigate(hwnd, 1); break; - - // File operations - case 'O': SendMessage(hwnd, WM_COMMAND, IDM_OPEN, 0); break; // O or Ctrl+O: Open - case 'E': SendMessage(hwnd, WM_COMMAND, IDM_EDIT, 0); break; // E: Edit - case VK_F2: SendMessage(hwnd, WM_COMMAND, IDM_RENAME, 0); break; // F2: Rename - case VK_DELETE: SendMessage(hwnd, WM_COMMAND, IDM_DELETE, 0); break; // Del: Delete - case 'P': if (ctrl) { SendMessage(hwnd, WM_COMMAND, IDM_PRINT, 0); } break; // Ctrl+P: Print - case 'C': // Ctrl+C: Copy image, Ctrl+Alt+C: Copy path - if (ctrl && alt) { - if (!g_imagePath.empty() && CopyToClipboard(hwnd, g_imagePath)) { - g_osd.Show(hwnd, L"File path copied!", false); - } - } else if (ctrl) { - SendMessage(hwnd, WM_COMMAND, IDM_COPY_IMAGE, 0); - } - break; - - // View - case 'T': // T: Gallery (non-Ctrl), Ctrl+T: Always on Top - if (ctrl) { - SendMessage(hwnd, WM_COMMAND, IDM_ALWAYS_ON_TOP, 0); - } else { - // Toggle Gallery (Only if not visible, ESC closes it) - if (!g_gallery.IsVisible()) { - g_gallery.Open(g_navigator.Index()); - InvalidateRect(hwnd, nullptr, FALSE); - SetTimer(hwnd, 998, 16, nullptr); // Fade in - } - } - break; - case VK_TAB: // Tab: Toggle compact info panel - if (!g_config.ShowInfoPanel) { - g_config.ShowInfoPanel = true; - g_config.InfoPanelExpanded = false; - g_toolbar.SetExifState(true); - } else if (g_config.InfoPanelExpanded) { - g_config.InfoPanelExpanded = false; - } else { - g_config.ShowInfoPanel = false; - g_toolbar.SetExifState(false); - } - InvalidateRect(hwnd, nullptr, FALSE); - break; - case 'I': // I: Toggle full info panel - if (!g_config.ShowInfoPanel) { - g_config.ShowInfoPanel = true; - g_config.InfoPanelExpanded = true; - if (g_currentMetadata.HistR.empty() && !g_imagePath.empty()) { - UpdateHistogramAsync(hwnd, g_imagePath); - } - g_toolbar.SetExifState(true); - } else if (!g_config.InfoPanelExpanded) { - g_config.InfoPanelExpanded = true; - if (g_currentMetadata.HistR.empty() && !g_imagePath.empty()) { - UpdateHistogramAsync(hwnd, g_imagePath); - } - } else { - g_config.ShowInfoPanel = false; - g_toolbar.SetExifState(false); - } - InvalidateRect(hwnd, nullptr, FALSE); - break; - - // Transforms - case 'R': PerformTransform(hwnd, shift ? TransformType::Rotate90CCW : TransformType::Rotate90CW); break; - case 'H': PerformTransform(hwnd, TransformType::FlipHorizontal); break; - case 'V': PerformTransform(hwnd, TransformType::FlipVertical); break; - - // Zoom - // Zoom - // Zoom - case '1': case 'Z': case VK_NUMPAD1: // 100% Original size - if (g_currentBitmap) { - D2D1_SIZE_F imgSize = g_currentBitmap->GetSize(); - if (imgSize.width > 0 && imgSize.height > 0) { - // Logic to resize window to wrap image at 100% if allowed - if (g_config.ResizeWindowOnZoom && !IsZoomed(hwnd) && !g_config.LockWindowSize) { - // Target is 100% of image size - int targetW = (int)imgSize.width; - int targetH = (int)imgSize.height; - - // Get Monitor Info - HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - MONITORINFO mi = { sizeof(mi) }; GetMonitorInfoW(hMon, &mi); - int maxW = (mi.rcWork.right - mi.rcWork.left); - int maxH = (mi.rcWork.bottom - mi.rcWork.top); - - // Clamp to screen - if (targetW > maxW) targetW = maxW; - if (targetH > maxH) targetH = maxH; - // Min size safety - if (targetW < 400) targetW = 400; - if (targetH < 300) targetH = 300; - - // Center Window - RECT rcWin; GetWindowRect(hwnd, &rcWin); - int cX = rcWin.left + (rcWin.right - rcWin.left) / 2; - int cY = rcWin.top + (rcWin.bottom - rcWin.top) / 2; - - SetWindowPos(hwnd, nullptr, cX - targetW/2, cY - targetH/2, targetW, targetH, SWP_NOZORDER | SWP_NOACTIVATE); - - // Recalculate Fit Scale with NEW window size - RECT rcNew; GetClientRect(hwnd, &rcNew); - float newFitScale = std::min((float)rcNew.right / imgSize.width, (float)rcNew.bottom / imgSize.height); - if (newFitScale > 0) g_viewState.Zoom = 1.0f / newFitScale; - } else { - // Standard logic (window size static) - RECT rc; GetClientRect(hwnd, &rc); - float fitScale = std::min((float)rc.right / imgSize.width, (float)rc.bottom / imgSize.height); - if (fitScale > 0) g_viewState.Zoom = 1.0f / fitScale; - } - - g_viewState.PanX = 0; - g_viewState.PanY = 0; - g_osd.Show(hwnd, L"Zoom: 100%", false, false, D2D1::ColorF(0.4f, 1.0f, 0.4f)); - } - } - InvalidateRect(hwnd, nullptr, FALSE); - break; - - case '0': case 'F': case VK_NUMPAD0: // Fit to Screen (Best Fit) - if (g_currentBitmap) { - // Get Monitor & Work Area - HMONITOR hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); - MONITORINFO mi = { sizeof(mi) }; GetMonitorInfoW(hMon, &mi); - int screenW = mi.rcWork.right - mi.rcWork.left; - int screenH = mi.rcWork.bottom - mi.rcWork.top; - - // Get Window Borders - RECT rcWin, rcClient; - GetWindowRect(hwnd, &rcWin); - GetClientRect(hwnd, &rcClient); - int borderW = (rcWin.right - rcWin.left) - (rcClient.right - rcClient.left); - int borderH = (rcWin.bottom - rcWin.top) - (rcClient.bottom - rcClient.top); - - // Max Client Size available - int maxClientW = screenW - borderW; - int maxClientH = screenH - borderH; - - // Get Image Size (DIPs -> Pixels) - D2D1_SIZE_F imgSize = g_currentBitmap->GetSize(); - float dpi = 96.0f; - UINT dpiX, dpiY; - if (SUCCEEDED(GetDpiForMonitor(hMon, MDT_EFFECTIVE_DPI, &dpiX, &dpiY))) { - dpi = (float)dpiX; - } - float imgPixW = imgSize.width * (dpi / 96.0f); - float imgPixH = imgSize.height * (dpi / 96.0f); - - if (imgPixW > 0 && imgPixH > 0) { - // Scale to fit max client area - float ratioW = (float)maxClientW / imgPixW; - float ratioH = (float)maxClientH / imgPixH; - float scale = std::min(ratioW, ratioH); - - // Target Client Size - int targetClientW = (int)(imgPixW * scale); - int targetClientH = (int)(imgPixH * scale); - -<<<<<<< HEAD - int totalW = targetClientW + borderW; - int totalH = targetClientH + borderH; - - // Center - int cX = mi.rcWork.left + (screenW - totalW) / 2; - int cY = mi.rcWork.top + (screenH - totalH) / 2; - - SetWindowPos(hwnd, nullptr, cX, cY, totalW, totalH, SWP_NOZORDER | SWP_NOACTIVATE); - - // Set Zoom to match fit - RECT rcNew; GetClientRect(hwnd, &rcNew); - float fitScale = std::min((float)rcNew.right / imgSize.width, (float)rcNew.bottom / imgSize.height); - g_viewState.Zoom = 1.0f / fitScale; // This fits image exactly in window? - // Wait, Logic: FinalScale = FitScale * Zoom. If we want FinalScale = FitScale, then Zoom = 1.0? - // Line 3236: float finalScale = fitScale * g_viewState.Zoom; - // So if we want to "Fit to Screen" (image fills window), Zoom should be 1.0f. - g_viewState.Zoom = 1.0f; - } -======= - // Target Window Size - int targetWinW = targetClientW + borderW; - int targetWinH = targetClientH + borderH; - - // Center on Screen - int x = mi.rcWork.left + (screenW - targetWinW) / 2; - int y = mi.rcWork.top + (screenH - targetWinH) / 2; - - SetWindowPos(hwnd, nullptr, x, y, targetWinW, targetWinH, SWP_NOZORDER | SWP_NOACTIVATE); - } - - // Reset View to Fit - g_viewState.Zoom = 1.0f; ->>>>>>> 86ab245bf3828b79c29a67446c97cc74c452c2d1 - g_viewState.PanX = 0; - g_viewState.PanY = 0; - - g_osd.Show(hwnd, L"Zoom: Fit Screen", false, false, D2D1::ColorF(D2D1::ColorF::White)); - InvalidateRect(hwnd, nullptr, FALSE); - } -<<<<<<< HEAD - break; - - case VK_ADD: case VK_OEM_PLUS: // Zoom In - case VK_SUBTRACT: case VK_OEM_MINUS: { // Zoom Out - bool isZoomIn = (wParam == VK_ADD || wParam == VK_OEM_PLUS); - float step = ctrl ? 0.01f : 0.1f; // 1% or 10% - - if (isZoomIn) g_viewState.Zoom += step; - else g_viewState.Zoom -= step; - - if (g_viewState.Zoom < 0.01f) g_viewState.Zoom = 0.01f; - if (g_viewState.Zoom > 50.0f) g_viewState.Zoom = 50.0f; - - // Show OSD - wchar_t buf[32]; - swprintf_s(buf, L"Zoom: %.0f%%", g_viewState.Zoom * 100.0f); - g_osd.Show(hwnd, buf, false); - InvalidateRect(hwnd, nullptr, FALSE); -======= ->>>>>>> 86ab245bf3828b79c29a67446c97cc74c452c2d1 - break; - } - - // Fullscreen - case VK_RETURN: case VK_F11: // Enter/F11: Toggle fullscreen - SendMessage(hwnd, WM_COMMAND, IDM_FULLSCREEN, 0); - break; - - // Exit - case VK_ESCAPE: - if (IsZoomed(hwnd)) { - ShowWindow(hwnd, SW_RESTORE); - } else { - if (CheckUnsavedChanges(hwnd)) PostQuitMessage(0); - } - break; - } - return 0; - } - - case WM_RBUTTONUP: { - // Show context menu - POINT pt = { (short)LOWORD(lParam), (short)HIWORD(lParam) }; - ClientToScreen(hwnd, &pt); - - bool hasImage = g_currentBitmap != nullptr; - bool extensionFixNeeded = false; - bool isRaw = false; - if (hasImage && !g_imagePath.empty()) { - extensionFixNeeded = CheckExtensionMismatch(g_imagePath, g_currentMetadata.Format); - isRaw = IsRawFile(g_imagePath); - } - - ShowContextMenu(hwnd, pt, hasImage, extensionFixNeeded, g_config.LockWindowSize, g_config.ShowInfoPanel, g_config.AlwaysOnTop, g_config.RenderRAW, isRaw); - return 0; - } - - case WM_COMMAND: { - UINT cmdId = LOWORD(wParam); - switch (cmdId) { - case IDM_OPEN: { - if (!CheckUnsavedChanges(hwnd)) break; - OPENFILENAMEW ofn = {}; - wchar_t szFile[MAX_PATH] = {}; - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = hwnd; - ofn.lpstrFile = szFile; - ofn.nMaxFile = MAX_PATH; - ofn.lpstrFilter = L"All Images\0*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.webp;*.avif;*.jxl;*.heic;*.heif;*.tga;*.psd;*.hdr;*.exr;*.svg;*.qoi;*.pcx;*.raw;*.arw;*.cr2;*.cr3;*.nef;*.dng;*.orf;*.rw2;*.raf;*.pef;*.pgm;*.ppm\0All Files\0*.*\0"; - ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; - if (GetOpenFileNameW(&ofn)) { - g_editState.Reset(); - g_viewState.Reset(); - g_navigator.Initialize(szFile); - g_thumbMgr.ClearCache(); // Fix: Clear old thumbnails on folder switch - LoadImageAsync(hwnd, szFile); - } - break; - } - case IDM_OPENWITH_DEFAULT: { - // Use rundll32 to show proper "Open With" dialog - if (!g_imagePath.empty()) { - std::wstring args = L"shell32.dll,OpenAs_RunDLL " + g_imagePath; - ShellExecuteW(hwnd, nullptr, L"rundll32.exe", args.c_str(), nullptr, SW_SHOWNORMAL); - } - break; - } - case IDM_EDIT: { - // Open with default editor (use "edit" verb, fallback to mspaint) - if (!g_imagePath.empty()) { - HINSTANCE result = ShellExecuteW(hwnd, L"edit", g_imagePath.c_str(), nullptr, nullptr, SW_SHOWNORMAL); - if ((intptr_t)result <= 32) { - // No editor registered, try mspaint - ShellExecuteW(hwnd, nullptr, L"mspaint.exe", g_imagePath.c_str(), nullptr, SW_SHOWNORMAL); - } - } - break; - } - case IDM_SHOW_IN_EXPLORER: { - if (!g_imagePath.empty()) { - std::wstring cmd = L"/select,\"" + g_imagePath + L"\""; - ShellExecuteW(nullptr, nullptr, L"explorer.exe", cmd.c_str(), nullptr, SW_SHOWNORMAL); - } - break; - } - case IDM_COPY_PATH: { - if (!g_imagePath.empty() && OpenClipboard(hwnd)) { - EmptyClipboard(); - size_t len = (g_imagePath.length() + 1) * sizeof(wchar_t); - HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, len); - if (hMem) { - memcpy(GlobalLock(hMem), g_imagePath.c_str(), len); - GlobalUnlock(hMem); - SetClipboardData(CF_UNICODETEXT, hMem); - } - CloseClipboard(); - g_osd.Show(hwnd, L"Path copied", false); - // Ensure UI updates to show OSD - InvalidateRect(hwnd, nullptr, FALSE); - } - break; - } - case IDM_COPY_IMAGE: { - // Copy file to clipboard (can paste in Explorer or other apps) - if (!g_imagePath.empty() && OpenClipboard(hwnd)) { - EmptyClipboard(); - - // CF_HDROP format for file copy - size_t pathLen = (g_imagePath.length() + 1) * sizeof(wchar_t); - size_t totalSize = sizeof(DROPFILES) + pathLen + sizeof(wchar_t); // Extra null for double-null terminator - HGLOBAL hDrop = GlobalAlloc(GHND, totalSize); - if (hDrop) { - DROPFILES* df = (DROPFILES*)GlobalLock(hDrop); - df->pFiles = sizeof(DROPFILES); - df->fWide = TRUE; - memcpy((char*)df + sizeof(DROPFILES), g_imagePath.c_str(), pathLen); - GlobalUnlock(hDrop); - SetClipboardData(CF_HDROP, hDrop); - } - - CloseClipboard(); - g_osd.Show(hwnd, L"File copied to clipboard", false); - InvalidateRect(hwnd, nullptr, FALSE); - } - break; - } - case IDM_PRINT: { - if (!g_imagePath.empty()) { - // Windows 10/11: Use "print" verb directly - Windows handles the print dialog - // This works for most image formats via Windows photo printing - HINSTANCE result = ShellExecuteW(hwnd, L"print", g_imagePath.c_str(), nullptr, nullptr, SW_SHOWNORMAL); - - if ((intptr_t)result <= 32) { - // Fallback: Open in default app and show OSD instructions - ShellExecuteW(hwnd, L"open", g_imagePath.c_str(), nullptr, nullptr, SW_SHOWNORMAL); - g_osd.Show(hwnd, L"Print: Use Ctrl+P in opened app", false); - InvalidateRect(hwnd, nullptr, FALSE); - } - } - break; - } - case IDM_FULLSCREEN: { - if (IsZoomed(hwnd)) ShowWindow(hwnd, SW_RESTORE); - else ShowWindow(hwnd, SW_MAXIMIZE); - break; - } - case IDM_DELETE: { - if (!g_imagePath.empty()) { - // Get filename for display - size_t lastSlash = g_imagePath.find_last_of(L"\\/"); - std::wstring filename = (lastSlash != std::wstring::npos) ? g_imagePath.substr(lastSlash + 1) : g_imagePath; - - // OSD-style confirmation dialog (consistent with rotation save dialog) - std::wstring dlgMessage = L"Move to Recycle Bin?"; - std::vector dlgButtons; - dlgButtons.emplace_back(DialogResult::Yes, L"Delete"); - dlgButtons.emplace_back(DialogResult::Cancel, L"Cancel"); - - // Red accent color for delete warning - DialogResult dlgResult = ShowQuickViewDialog(hwnd, filename.c_str(), dlgMessage.c_str(), - D2D1::ColorF(0.85f, 0.25f, 0.25f), dlgButtons, false, L"", L""); - - if (dlgResult == DialogResult::Yes) { - std::wstring nextPath = g_navigator.PeekNext(); - if (nextPath == g_imagePath) nextPath = g_navigator.PeekPrevious(); - - // Release image before delete - ReleaseImageResources(); - - // Use SHFileOperation for recycle bin - std::wstring pathCopy = g_imagePath; - pathCopy.push_back(L'\0'); // Double null terminator - SHFILEOPSTRUCTW op = {}; - op.wFunc = FO_DELETE; - op.pFrom = pathCopy.c_str(); - op.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_SILENT; - if (SHFileOperationW(&op) == 0) { - g_osd.Show(hwnd, L"Moved to Recycle Bin", false); - InvalidateRect(hwnd, nullptr, FALSE); - g_editState.Reset(); - g_viewState.Reset(); - g_currentBitmap.Reset(); - g_navigator.Initialize(nextPath.empty() ? L"" : nextPath.c_str()); - if (!nextPath.empty()) LoadImageAsync(hwnd, nextPath); - else InvalidateRect(hwnd, nullptr, FALSE); - } - } - } - break; - } - case IDM_LOCK_WINDOW_SIZE: { - g_config.LockWindowSize = !g_config.LockWindowSize; - g_toolbar.SetLockState(g_config.LockWindowSize); - g_osd.Show(hwnd, g_config.LockWindowSize ? L"Window Size Locked" : L"Window Size Unlocked", false); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - case IDM_SHOW_INFO_PANEL: { - g_config.ShowInfoPanel = !g_config.ShowInfoPanel; - if (g_config.ShowInfoPanel && g_currentMetadata.HistR.empty() && !g_imagePath.empty()) { - UpdateHistogramAsync(hwnd, g_imagePath); - } - - // Refresh Title (Just simple name now, Overlay handles info) - { - std::wstring title = L"QuickView"; - if (!g_imagePath.empty()) { - size_t lastSlash = g_imagePath.find_last_of(L"\\/"); - std::wstring rname = (lastSlash != std::wstring::npos) ? g_imagePath.substr(lastSlash + 1) : g_imagePath; - title = rname + L" - " + title; - } - } - - g_toolbar.SetExifState(g_config.ShowInfoPanel); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - case IDM_ALWAYS_ON_TOP: { - g_config.AlwaysOnTop = !g_config.AlwaysOnTop; - SetWindowPos(hwnd, g_config.AlwaysOnTop ? HWND_TOPMOST : HWND_NOTOPMOST, - 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); - g_osd.Show(hwnd, g_config.AlwaysOnTop ? L"Always on Top: ON" : L"Always on Top: OFF", false); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - - case IDM_HUD_GALLERY: - // Toggle Gallery - SendMessage(hwnd, WM_KEYDOWN, 'T', 0); - break; - - case IDM_LITE_INFO: - SendMessage(hwnd, WM_KEYDOWN, VK_TAB, 0); - break; - - case IDM_ZOOM_100: - SendMessage(hwnd, WM_KEYDOWN, '1', 0); - break; - - case IDM_ZOOM_FIT: - SendMessage(hwnd, WM_KEYDOWN, '0', 0); - break; - - case IDM_ZOOM_IN: - // Simulate Key Press - SendMessage(hwnd, WM_KEYDOWN, VK_ADD, 0); - break; - case IDM_ZOOM_OUT: - SendMessage(hwnd, WM_KEYDOWN, VK_SUBTRACT, 0); - break; - - case IDM_ROTATE_CW: - PerformTransform(hwnd, TransformType::Rotate90CW); - break; - case IDM_ROTATE_CCW: - PerformTransform(hwnd, TransformType::Rotate90CCW); - break; - case IDM_FLIP_H: - PerformTransform(hwnd, TransformType::FlipHorizontal); - break; - case IDM_FLIP_V: - PerformTransform(hwnd, TransformType::FlipVertical); - break; - - case IDM_RENDER_RAW: - g_config.RenderRAW = !g_config.RenderRAW; - g_toolbar.SetRawState(g_config.RenderRAW, false); - if (!g_imagePath.empty()) { - LoadImageAsync(hwnd, g_imagePath.c_str()); - } - InvalidateRect(hwnd, nullptr, FALSE); - break; - - case IDM_WALLPAPER_FILL: - case IDM_WALLPAPER_FIT: - case IDM_WALLPAPER_TILE: { - if (!g_imagePath.empty()) { - // Use IDesktopWallpaper COM interface - CoInitialize(nullptr); - IDesktopWallpaper* pWallpaper = nullptr; - HRESULT hr = CoCreateInstance(__uuidof(DesktopWallpaper), nullptr, CLSCTX_ALL, - IID_PPV_ARGS(&pWallpaper)); - if (SUCCEEDED(hr) && pWallpaper) { - DESKTOP_WALLPAPER_POSITION pos = DWPOS_FILL; - if (cmdId == IDM_WALLPAPER_FIT) pos = DWPOS_FIT; - else if (cmdId == IDM_WALLPAPER_TILE) pos = DWPOS_TILE; - - pWallpaper->SetPosition(pos); - hr = pWallpaper->SetWallpaper(nullptr, g_imagePath.c_str()); - pWallpaper->Release(); - - if (SUCCEEDED(hr)) { - g_osd.Show(hwnd, L"Wallpaper Set", false); - } else { - g_osd.Show(hwnd, L"Failed to set wallpaper", true); - } - InvalidateRect(hwnd, nullptr, FALSE); - } - CoUninitialize(); - } - break; - } - case IDM_RENAME: { - if (!g_imagePath.empty()) { - // Get current filename - size_t lastSlash = g_imagePath.find_last_of(L"\\/"); - std::wstring dir = (lastSlash != std::wstring::npos) ? g_imagePath.substr(0, lastSlash + 1) : L""; - std::wstring oldName = (lastSlash != std::wstring::npos) ? g_imagePath.substr(lastSlash + 1) : g_imagePath; - - // Custom Rename Dialog - std::wstring newName = ShowRenameDialog(hwnd, oldName); - - if (!newName.empty()) { - // Auto-append extension if missing (User request) - if (newName.find_last_of(L'.') == std::wstring::npos) { - size_t oldDot = oldName.find_last_of(L'.'); - if (oldDot != std::wstring::npos) { - newName += oldName.substr(oldDot); - } - } - - if (newName != oldName) { - std::wstring newPath = dir + newName; - if (newPath != g_imagePath) { - ReleaseImageResources(); - if (MoveFileW(g_imagePath.c_str(), newPath.c_str())) { - g_imagePath = newPath; - g_navigator.Initialize(newPath.c_str()); - LoadImageAsync(hwnd, newPath); - g_osd.Show(hwnd, L"Renamed", false); - } else { - LoadImageAsync(hwnd, g_imagePath); - g_osd.Show(hwnd, L"Rename Failed", true); - } - InvalidateRect(hwnd, nullptr, FALSE); - } - } - } - } - break; - } - case IDM_FIX_EXTENSION: { - if (!g_imagePath.empty() && !g_currentMetadata.Format.empty()) { - std::wstring fmt = g_currentMetadata.Format; - std::transform(fmt.begin(), fmt.end(), fmt.begin(), ::towlower); - - std::wstring newExt; - if (fmt == L"jpeg") newExt = L".jpg"; - else if (fmt == L"png") newExt = L".png"; - else if (fmt == L"webp") newExt = L".webp"; - else if (fmt == L"avif") newExt = L".avif"; - else if (fmt == L"jxl" || fmt == L"jpeg xl") newExt = L".jxl"; - else if (fmt == L"gif") newExt = L".gif"; - else if (fmt == L"bmp") newExt = L".bmp"; - else if (fmt == L"tiff") newExt = L".tiff"; - else if (fmt == L"heif" || fmt == L"heic") newExt = L".heic"; - else if (fmt == L"hdr") newExt = L".hdr"; - else if (fmt == L"psd") newExt = L".psd"; - else if (fmt == L"tga") newExt = L".tga"; - else if (fmt == L"exr") newExt = L".exr"; - else if (fmt == L"qoi") newExt = L".qoi"; - else if (fmt == L"pcx") newExt = L".pcx"; - else if (fmt == L"svg") newExt = L".svg"; - else if (fmt == L"ico") newExt = L".ico"; - else if (fmt == L"wbmp") newExt = L".wbmp"; - else if (fmt == L"pic") newExt = L".pic"; - else if (fmt == L"pnm") newExt = L".pnm"; - - if (!newExt.empty()) { - size_t lastDot = g_imagePath.find_last_of(L'.'); - std::wstring basePath = (lastDot != std::wstring::npos) ? g_imagePath.substr(0, lastDot) : g_imagePath; - std::wstring newPath = basePath + newExt; - - std::wstring msg = L"Format detected: " + g_currentMetadata.Format + L"\nChange extension to " + newExt + L"?"; - - std::vector buttons = { - { DialogResult::Yes, L"Rename", true }, - { DialogResult::Cancel, L"Cancel" } - }; - - DialogResult result = ShowQuickViewDialog(hwnd, L"Fix Extension", msg, D2D1::ColorF(D2D1::ColorF::Orange), buttons); - if (result == DialogResult::Yes) { - ReleaseImageResources(); - if (MoveFileW(g_imagePath.c_str(), newPath.c_str())) { - g_imagePath = newPath; - LoadImageAsync(hwnd, newPath); - g_osd.Show(hwnd, L"Extension Fixed", false); - } else { - LoadImageAsync(hwnd, g_imagePath); // Reload old - g_osd.Show(hwnd, L"Rename Failed", true); - } - } - InvalidateRect(hwnd, nullptr, FALSE); - } - } - break; - } - case IDM_SETTINGS: { - // Simple Settings / Help Dialog - std::wstring msg = L"Shortcuts:\n" - L"Double Click: Full Screen\n" - L"Wheel: Zoom\n" - L"Drag: Pan\n" - L"Hold Shift + R: Rotate Left\n" - L"R, H, V: Rotate/Flip\n" - L"Arrows/Space: Navigate\n" - L"Esc/MButton: Exit"; - - std::vector buttons = { - { DialogResult::Yes, L"OK", true } - }; - ShowQuickViewDialog(hwnd, L"QuickView Settings", msg, D2D1::ColorF(D2D1::ColorF::DodgerBlue), buttons); - InvalidateRect(hwnd, nullptr, FALSE); - break; - } - case IDM_ABOUT: { - MessageBoxW(hwnd, L"QuickView\n\nHigh Performance Image Viewer\n\n(c) 2024-2026", L"About QuickView", MB_ICONINFORMATION); - break; - } - case IDM_EXIT: { - if (CheckUnsavedChanges(hwnd)) PostMessage(hwnd, WM_CLOSE, 0, 0); - break; - } - // TODO: Implement other menu commands - default: - break; - } - return 0; - } - } - return DefWindowProc(hwnd, message, wParam, lParam); -} - -void OnResize(HWND hwnd, UINT width, UINT height) { - if (g_renderEngine) g_renderEngine->Resize(width, height); - g_toolbar.UpdateLayout((float)width, (float)height); -} -FireAndForget PrefetchImageAsync(HWND hwnd, std::wstring path); // fwd decl - - -FireAndForget UpdateHistogramAsync(HWND hwnd, std::wstring path) { - if (path.empty() || path != g_imagePath) co_return; - - co_await ResumeBackground{}; - - ComPtr tempBitmap; - std::wstring loaderName; // dummy - if (SUCCEEDED(g_imageLoader->LoadToMemory(path.c_str(), &tempBitmap, &loaderName))) { - CImageLoader::ImageMetadata histMeta; - g_imageLoader->ComputeHistogram(tempBitmap.Get(), &histMeta); - - co_await ResumeMainThread(hwnd); - - if (path == g_imagePath) { - g_currentMetadata.HistR = histMeta.HistR; - g_currentMetadata.HistG = histMeta.HistG; - g_currentMetadata.HistB = histMeta.HistB; - g_currentMetadata.HistL = histMeta.HistL; - InvalidateRect(hwnd, nullptr, FALSE); - } - } -} - -FireAndForget LoadImageAsync(HWND hwnd, std::wstring path) { - if (!g_imageLoader || !g_renderEngine) co_return; - - // 1. Check Prefetch Cache (Main Thread) - ComPtr wicMemoryBitmap; - bool usedPrefetchCache = false; - if (path == g_prefetchedPath && g_prefetchedBitmap) { - wicMemoryBitmap = g_prefetchedBitmap; - usedPrefetchCache = true; - // Note: FormatDetails from prefetch may be stale, will be cleared later - } - - // 2. If Miss, Load from Disk - if (!wicMemoryBitmap) { - // Switch to Background Thread - co_await ResumeBackground{}; - - // Decode & Measure Time - DWORD startTime = GetTickCount(); - std::wstring loaderName = L"Unknown"; - HRESULT hr = g_imageLoader->LoadToMemory(path.c_str(), &wicMemoryBitmap, &loaderName, g_config.ForceRawDecode); - - // Read Metadata (Background Thread) - // Read Metadata (Background Thread) - CImageLoader::ImageMetadata tempMetadata; - if (SUCCEEDED(hr)) { - g_imageLoader->ReadMetadata(path.c_str(), &tempMetadata); - - // Compute Histogram if needed (Expanded Mode only) - if (g_config.ShowInfoPanel && g_config.InfoPanelExpanded && wicMemoryBitmap) { - g_imageLoader->ComputeHistogram(wicMemoryBitmap.Get(), &tempMetadata); - } - } - - DWORD duration = GetTickCount() - startTime; - - // Switch back - co_await ResumeMainThread(hwnd); - - if (FAILED(hr) || !wicMemoryBitmap) { - // Error Handling - - // Check for HEIC Missing Codec - bool isHEIC = path.ends_with(L".heic") || path.ends_with(L".HEIC") || - path.ends_with(L".heif") || path.ends_with(L".HEIF"); - - if (isHEIC && (hr == WINCODEC_ERR_COMPONENTNOTFOUND || hr == E_FAIL)) { - // User needs HEVC extension - g_osd.Show(hwnd, AppStrings::OSD_HEICCodecMissing, true); - } else { - g_osd.Show(hwnd, L"Failed to load image", true); - } - co_return; - } - - g_currentMetadata = tempMetadata; - // FormatDetails: only valid if freshly loaded (not from prefetch cache) - if (usedPrefetchCache) { - g_currentMetadata.FormatDetails.clear(); // Prefetch doesn't preserve format details - g_currentMetadata.LoaderName = L"Prefetch Cache"; - g_currentMetadata.LoadTimeMs = 0; - } else { - g_currentMetadata.FormatDetails = g_imageLoader->GetLastFormatDetails(); - g_currentMetadata.LoaderName = loaderName; - g_currentMetadata.LoadTimeMs = duration; - } - - // Update Title with Performance Info AND Compact Metadata - // Format: "filename.ext - [Metadata Compact] - QuickView" - size_t lastSlash = path.find_last_of(L"\\/"); - std::wstring filename = (lastSlash != std::wstring::npos) ? path.substr(lastSlash + 1) : path; - - wchar_t titleBuf[1024]; - swprintf_s(titleBuf, L"%s - %s (%lu ms) - %s", filename.c_str(), loaderName.c_str(), duration, g_szWindowTitle); - SetWindowTextW(hwnd, titleBuf); - // Decoder info now shown in Info Panel instead of OSD - } - else { - // Cache Hit - still need to load metadata - CImageLoader::ImageMetadata tempMetadata; - g_imageLoader->ReadMetadata(path.c_str(), &tempMetadata); - - // Compute Histogram if needed (Offload to background to avoid jank) - // Optimization: Only if Expanded - if (g_config.ShowInfoPanel && g_config.InfoPanelExpanded && wicMemoryBitmap) { - co_await ResumeBackground{}; - g_imageLoader->ComputeHistogram(wicMemoryBitmap.Get(), &tempMetadata); - co_await ResumeMainThread(hwnd); - } - g_currentMetadata = tempMetadata; - g_currentMetadata.LoaderName = L"Prefetch Cache"; - g_currentMetadata.LoadTimeMs = 0; - g_currentMetadata.FormatDetails.clear(); // Prefetch doesn't preserve format details - - size_t lastSlash = path.find_last_of(L"\\/"); - std::wstring filename = (lastSlash != std::wstring::npos) ? path.substr(lastSlash + 1) : path; - wchar_t titleBuf[512]; - swprintf_s(titleBuf, L"%s - Prefetch Cache (0 ms) - %s", filename.c_str(), g_szWindowTitle); - SetWindowTextW(hwnd, titleBuf); - // Decoder info now shown in Info Panel instead of OSD - } - - // 3. Upload to GPU - ComPtr d2dBitmap; - if (FAILED(g_renderEngine->CreateBitmapFromWIC(wicMemoryBitmap.Get(), &d2dBitmap))) { - g_osd.Show(hwnd, L"Failed to upload texture", true); - co_return; - } - - // 4. Update State - g_currentBitmap = d2dBitmap; - g_imagePath = path; - - // Update Toolbar RAW State - bool isRaw = false; - std::wstring pLower = path; - std::transform(pLower.begin(), pLower.end(), pLower.begin(), ::towlower); - if (pLower.ends_with(L".arw") || pLower.ends_with(L".cr2") || pLower.ends_with(L".nef") || - pLower.ends_with(L".dng") || pLower.ends_with(L".orf") || pLower.ends_with(L".rw2") || - pLower.ends_with(L".raf") || pLower.ends_with(L".pef") || pLower.ends_with(L".srw") || pLower.ends_with(L".cr3")) { - isRaw = true; - } - g_toolbar.SetRawState(isRaw, g_config.ForceRawDecode); - - // Update Toolbar Extension Warning - bool needsFix = false; - if (!g_currentMetadata.Format.empty()) { - needsFix = CheckExtensionMismatch(path, g_currentMetadata.Format); - } - g_toolbar.SetExtensionWarning(needsFix); - - // 5. Adjust & Repaint - AdjustWindowToImage(hwnd); - InvalidateRect(hwnd, nullptr, FALSE); - - // 6. Trigger Prefetch for NEXT image - if (g_navigator.Count() > 0) { - std::wstring nextPath = g_navigator.PeekNext(); - if (!nextPath.empty() && nextPath != g_prefetchedPath && nextPath != path) { - PrefetchImageAsync(hwnd, nextPath); - } - } -} - -FireAndForget PrefetchImageAsync(HWND hwnd, std::wstring path) { - if (path.empty() || path == g_prefetchedPath) co_return; - - co_await ResumeBackground{}; - - ComPtr bitmap; - HRESULT hr = g_imageLoader->LoadToMemory(path.c_str(), &bitmap); - - co_await ResumeMainThread(hwnd); - - if (SUCCEEDED(hr) && bitmap) { - g_prefetchedBitmap = bitmap; - g_prefetchedPath = path; - // g_osd.Show(L"Prefetched", false, false); // Debug - } -} - -void Navigate(HWND hwnd, int direction) { - if (g_navigator.Count() <= 0) return; - if (CheckUnsavedChanges(hwnd)) { - std::wstring path = (direction > 0) ? g_navigator.Next() : g_navigator.Previous(); - if (!path.empty()) { - g_editState.Reset(); - g_viewState.Reset(); - LoadImageAsync(hwnd, path); - } - } -} - -void DrawHistogram(ID2D1DeviceContext* context, const CImageLoader::ImageMetadata& meta, D2D1_RECT_F rect) { - if (meta.HistR.empty()) return; // Need RGB data - - // Find max across all channels for consistent scaling - uint32_t maxVal = 1; - for (int i = 0; i < 256; i++) { - if (meta.HistR[i] > maxVal) maxVal = meta.HistR[i]; - if (meta.HistG[i] > maxVal) maxVal = meta.HistG[i]; - if (meta.HistB[i] > maxVal) maxVal = meta.HistB[i]; - } - - float stepX = (rect.right - rect.left) / 256.0f; - float bottom = rect.bottom; - float height = rect.bottom - rect.top; - - // Helper lambda to draw a single channel - auto drawChannel = [&](const std::vector& hist, D2D1::ColorF color) { - ComPtr path; - g_renderEngine->m_d2dFactory->CreatePathGeometry(&path); - ComPtr sink; - path->Open(&sink); - - sink->BeginFigure(D2D1::Point2F(rect.left, bottom), D2D1_FIGURE_BEGIN_FILLED); - for (int i = 0; i < 256; i++) { - float val = (float)hist[i] / maxVal; - float y = bottom - val * height; - sink->AddLine(D2D1::Point2F(rect.left + i * stepX, y)); - } - sink->AddLine(D2D1::Point2F(rect.right, bottom)); - sink->EndFigure(D2D1_FIGURE_END_CLOSED); - sink->Close(); - - ComPtr brush; - context->CreateSolidColorBrush(color, &brush); - context->FillGeometry(path.Get(), brush.Get()); - }; - - // Draw RGB with semi-transparency (order: B, G, R for nice overlap) - drawChannel(meta.HistB, D2D1::ColorF(0.0f, 0.4f, 1.0f, 0.4f)); // Blue - drawChannel(meta.HistG, D2D1::ColorF(0.2f, 0.9f, 0.3f, 0.4f)); // Green - drawChannel(meta.HistR, D2D1::ColorF(1.0f, 0.3f, 0.3f, 0.4f)); // Red -} - -void DrawCompactInfo(ID2D1DeviceContext* context) { - if (g_imagePath.empty()) return; - - if (!g_pPanelTextFormat) { - g_renderEngine->m_dwriteFactory->CreateTextFormat( - L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, - 13.0f, L"en-us", &g_pPanelTextFormat - ); - // Set no-wrap mode to prevent long filenames from wrapping - if (g_pPanelTextFormat) { - g_pPanelTextFormat->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP); - } - } - - std::wstring info = g_imagePath.substr(g_imagePath.find_last_of(L"\\/") + 1); - - // Add Size - if (g_currentMetadata.Width > 0) { - wchar_t sz[64]; swprintf_s(sz, L" %u x %u", g_currentMetadata.Width, g_currentMetadata.Height); - info += sz; - - // File Size - if (g_currentMetadata.FileSize > 0) { - double mb = g_currentMetadata.FileSize / (1024.0 * 1024.0); - swprintf_s(sz, L" %.2f MB", mb); - info += sz; - } - } - // Add Compact EXIF - std::wstring meta = g_currentMetadata.GetCompactString(); - if (!meta.empty()) info += L" " + meta; - - // Measure Text - float textW = MeasureTextWidth(info, g_pPanelTextFormat.Get()); - float totalW = textW + 70.0f; // Padding for 2 buttons - - D2D1_RECT_F rect = D2D1::RectF(20, 10, 20 + textW, 40); - D2D1_RECT_F bgRect = D2D1::RectF(20, 10, 20 + totalW + 10, 40); - - // Shadow Text - ComPtr brushShadow; - context->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.8f), &brushShadow); - D2D1_RECT_F shadowRect = D2D1::RectF(rect.left + 1, rect.top + 1, rect.right + 1, rect.bottom + 1); - context->DrawTextW(info.c_str(), (UINT32)info.length(), g_pPanelTextFormat.Get(), shadowRect, brushShadow.Get()); - - // Text - ComPtr brushText; - context->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &brushText); - context->DrawTextW(info.c_str(), (UINT32)info.length(), g_pPanelTextFormat.Get(), rect, brushText.Get()); - - // Expand Button [+] - Yellow with shadow - g_panelToggleRect = D2D1::RectF(rect.right + 8, rect.top, rect.right + 38, rect.bottom); - - // Shadow - D2D1_RECT_F shadowRect1 = D2D1::RectF(g_panelToggleRect.left + 1, g_panelToggleRect.top + 1, g_panelToggleRect.right + 1, g_panelToggleRect.bottom + 1); - context->DrawTextW(L"[+]", 3, g_pPanelTextFormat.Get(), shadowRect1, brushShadow.Get()); - - ComPtr brushYellow; - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 0.85f, 0.0f), &brushYellow); // Warm yellow - context->DrawTextW(L"[+]", 3, g_pPanelTextFormat.Get(), g_panelToggleRect, brushYellow.Get()); - - // Close Button [x] - Red with shadow - g_panelCloseRect = D2D1::RectF(g_panelToggleRect.right + 5, rect.top, g_panelToggleRect.right + 35, rect.bottom); - - // Shadow - D2D1_RECT_F shadowRect2 = D2D1::RectF(g_panelCloseRect.left + 1, g_panelCloseRect.top + 1, g_panelCloseRect.right + 1, g_panelCloseRect.bottom + 1); - context->DrawTextW(L"[x]", 3, g_pPanelTextFormat.Get(), shadowRect2, brushShadow.Get()); - - ComPtr brushRed; - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 0.3f, 0.3f), &brushRed); // Soft red - context->DrawTextW(L"[x]", 3, g_pPanelTextFormat.Get(), g_panelCloseRect, brushRed.Get()); -} - -// ============================================================================ -// Grid-Based Info Panel System -// ============================================================================ - -// Build info grid data from current metadata -void BuildInfoGrid() { - g_infoGrid.clear(); - - // Row 1: Filename - std::wstring filename = g_imagePath.substr(g_imagePath.find_last_of(L"\\/") + 1); - g_infoGrid.push_back({L"\U0001F4C4", L"File", filename, L"", filename, TruncateMode::MiddleEllipsis, true}); - - // Row 2: Dimensions + Megapixels - if (g_currentMetadata.Width > 0) { - UINT64 totalPixels = (UINT64)g_currentMetadata.Width * g_currentMetadata.Height; - double megapixels = totalPixels / 1000000.0; - wchar_t dimBuf[64]; - // Use 'x' instead of multiplication sign to avoid mojibake - swprintf_s(dimBuf, L"%u x %u", g_currentMetadata.Width, g_currentMetadata.Height); - wchar_t mpBuf[32]; - swprintf_s(mpBuf, L"(%.1f MP)", megapixels); - g_infoGrid.push_back({L"\U0001F4D0", L"Size", dimBuf, mpBuf, L"", TruncateMode::None, false}); - } - - // Row 3: File Size - if (g_currentMetadata.FileSize > 0) { - UINT64 bytes = g_currentMetadata.FileSize; - wchar_t sizeBuf[32]; - if (bytes >= 1024 * 1024) { - swprintf_s(sizeBuf, L"%.2f MB", bytes / (1024.0 * 1024.0)); - } else if (bytes >= 1024) { - swprintf_s(sizeBuf, L"%.2f KB", bytes / 1024.0); - } else { - swprintf_s(sizeBuf, L"%llu B", bytes); - } - std::wstring sub = L"(" + FormatBytesWithCommas(bytes) + L")"; - std::wstring extra = g_currentMetadata.FormatDetails.empty() ? L"" : L" [" + g_currentMetadata.FormatDetails + L"]"; - g_infoGrid.push_back({L"\U0001F4BE", L"Disk", std::wstring(sizeBuf) + extra, sub, L"", TruncateMode::None, false}); - } - - // Row 4: Date - if (!g_currentMetadata.Date.empty()) { - g_infoGrid.push_back({L"\U0001F4C5", L"Date", g_currentMetadata.Date, L"", L"", TruncateMode::EndEllipsis, false}); - } - - // Row 5: Camera - if (!g_currentMetadata.Make.empty()) { - std::wstring camera = g_currentMetadata.Make + L" " + g_currentMetadata.Model; - g_infoGrid.push_back({L"\U0001F4F7", L"Camera", camera, L"", camera, TruncateMode::EndEllipsis, false}); - } - - // Row 6: Exposure (ISO + Aperture + Shutter + Bias) - if (!g_currentMetadata.ISO.empty()) { - std::wstring exp = L"ISO " + g_currentMetadata.ISO + L" " + g_currentMetadata.Aperture + L" " + g_currentMetadata.Shutter; - std::wstring sub = g_currentMetadata.ExposureBias.empty() ? L"" : g_currentMetadata.ExposureBias; - g_infoGrid.push_back({L"\U000026A1", L"Exp", exp, sub, exp + L" " + sub, TruncateMode::EndEllipsis, false}); - } - - // Row 7: Lens - if (!g_currentMetadata.Lens.empty()) { - g_infoGrid.push_back({L"\U0001F52D", L"Lens", g_currentMetadata.Lens, L"", g_currentMetadata.Lens, TruncateMode::EndEllipsis, false}); - } - - // Row 8: Focal - if (!g_currentMetadata.Focal.empty()) { - g_infoGrid.push_back({L"\U0001F3AF", L"Focal", g_currentMetadata.Focal, L"", L"", TruncateMode::None, false}); - } - - // Row 9: Color Space - if (!g_currentMetadata.ColorSpace.empty()) { - g_infoGrid.push_back({L"\U0001F3A8", L"Color", g_currentMetadata.ColorSpace, L"", L"", TruncateMode::None, false}); - } - - // Row 10: Decoder - if (!g_currentMetadata.LoaderName.empty()) { - wchar_t timeBuf[32]; - swprintf_s(timeBuf, L"(%llu ms)", (UINT64)g_currentMetadata.LoadTimeMs); - g_infoGrid.push_back({L"\U00002699", L"Decode", g_currentMetadata.LoaderName, timeBuf, L"", TruncateMode::None, false}); - } - - // Row 11: Software - if (!g_currentMetadata.Software.empty()) { - g_infoGrid.push_back({L"\U0001F4BB", L"Soft", g_currentMetadata.Software, L"", g_currentMetadata.Software, TruncateMode::EndEllipsis, false}); - } -} - -// Layout and draw the info grid -void DrawInfoGrid(ID2D1DeviceContext* context, float startX, float startY, float width) { - if (g_infoGrid.empty()) return; - - ComPtr brushWhite, brushGray, brushHover; - context->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &brushWhite); - context->CreateSolidColorBrush(D2D1::ColorF(0.6f, 0.6f, 0.65f), &brushGray); - context->CreateSolidColorBrush(D2D1::ColorF(1.0f, 1.0f, 1.0f, 0.1f), &brushHover); - - float valueColStart = startX + GRID_ICON_WIDTH + GRID_LABEL_WIDTH; - float valueColWidth = width - GRID_ICON_WIDTH - GRID_LABEL_WIDTH - GRID_PADDING; - float y = startY; - - for (size_t i = 0; i < g_infoGrid.size(); i++) { - auto& row = g_infoGrid[i]; - - // Calculate hit rect (for tooltip and click) - row.hitRect = D2D1::RectF(startX, y, startX + width, y + GRID_ROW_HEIGHT); - - // Hover highlight - if ((int)i == g_hoverRowIndex) { - context->FillRectangle(row.hitRect, brushHover.Get()); - } - - // Icon column - D2D1_RECT_F iconRect = D2D1::RectF(startX, y, startX + GRID_ICON_WIDTH, y + GRID_ROW_HEIGHT); - context->DrawTextW(row.icon.c_str(), (UINT32)row.icon.length(), g_pPanelTextFormat.Get(), iconRect, brushWhite.Get()); - - // Label column (gray) - D2D1_RECT_F labelRect = D2D1::RectF(startX + GRID_ICON_WIDTH, y, valueColStart, y + GRID_ROW_HEIGHT); - context->DrawTextW(row.label.c_str(), (UINT32)row.label.length(), g_pPanelTextFormat.Get(), labelRect, brushGray.Get()); - - // Value column - apply truncation - float subWidth = row.valueSub.empty() ? 0 : MeasureTextWidth(row.valueSub, g_pPanelTextFormat.Get()) + 5; - float mainMaxWidth = valueColWidth - subWidth; - - if (row.mode == TruncateMode::MiddleEllipsis) { - row.displayText = MakeMiddleEllipsis(g_pPanelTextFormat.Get(), mainMaxWidth, row.valueMain); - } else if (row.mode == TruncateMode::EndEllipsis) { - row.displayText = MakeEndEllipsis(g_pPanelTextFormat.Get(), mainMaxWidth, row.valueMain); - } else { - row.displayText = row.valueMain; - } - row.isTruncated = (row.displayText != row.valueMain); - - // Draw main value - D2D1_RECT_F valueRect = D2D1::RectF(valueColStart, y, valueColStart + mainMaxWidth, y + GRID_ROW_HEIGHT); - context->DrawTextW(row.displayText.c_str(), (UINT32)row.displayText.length(), g_pPanelTextFormat.Get(), valueRect, brushWhite.Get()); - - // Draw sub value (gray, smaller feel) - if (!row.valueSub.empty()) { - D2D1_RECT_F subRect = D2D1::RectF(valueColStart + mainMaxWidth, y, startX + width, y + GRID_ROW_HEIGHT); - context->DrawTextW(row.valueSub.c_str(), (UINT32)row.valueSub.length(), g_pPanelTextFormat.Get(), subRect, brushGray.Get()); - } - - y += GRID_ROW_HEIGHT; - } -} - -// Draw tooltip for hovered row -void DrawGridTooltip(ID2D1DeviceContext* context) { - if (g_hoverRowIndex < 0 || g_hoverRowIndex >= (int)g_infoGrid.size()) return; - - const auto& row = g_infoGrid[g_hoverRowIndex]; - if (!row.isTruncated || row.fullText.empty()) return; - - float x = (float)g_lastMousePos.x + 10; - float y = (float)g_lastMousePos.y + 20; - - float textWidth = MeasureTextWidth(row.fullText, g_pPanelTextFormat.Get()); - float padding = 6.0f; - float boxWidth = textWidth + padding * 2; - float boxHeight = 20.0f; - - D2D1_SIZE_F size = context->GetSize(); - if (x + boxWidth > size.width - 10) x = size.width - boxWidth - 10; - if (y + boxHeight > size.height - 10) y = size.height - boxHeight - 10; - - D2D1_RECT_F boxRect = D2D1::RectF(x, y, x + boxWidth, y + boxHeight); - - ComPtr brushBg, brushBorder, brushText; - context->CreateSolidColorBrush(D2D1::ColorF(0.1f, 0.1f, 0.12f, 0.95f), &brushBg); - context->CreateSolidColorBrush(D2D1::ColorF(0.4f, 0.4f, 0.45f), &brushBorder); - context->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &brushText); - - context->FillRoundedRectangle(D2D1::RoundedRect(boxRect, 4.0f, 4.0f), brushBg.Get()); - context->DrawRoundedRectangle(D2D1::RoundedRect(boxRect, 4.0f, 4.0f), brushBorder.Get(), 1.0f); - - D2D1_RECT_F textRect = D2D1::RectF(x + padding, y + 2, x + boxWidth - padding, y + boxHeight); - context->DrawTextW(row.fullText.c_str(), (UINT32)row.fullText.length(), g_pPanelTextFormat.Get(), textRect, brushText.Get()); -} - -void DrawInfoPanel(ID2D1DeviceContext* context) { - if (!g_config.ShowInfoPanel) return; - - // Init Font - if (!g_pPanelTextFormat) { - g_renderEngine->m_dwriteFactory->CreateTextFormat( - L"Segoe UI", nullptr, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, - 13.0f, L"en-us", &g_pPanelTextFormat - ); - } - - // Ensure format attributes are reset (prevent contamination from DrawCompactInfo) - if (g_pPanelTextFormat) { - g_pPanelTextFormat->SetWordWrapping(DWRITE_WORD_WRAPPING_NO_WRAP); - g_pPanelTextFormat->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_NEAR); - g_pPanelTextFormat->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_LEADING); - } - - // Panel Rect (Top Left) - float padding = 10.0f; - float width = 300.0f; - float height = 220.0f; - float startX = 20.0f; - float startY = 40.0f; - - if (g_currentMetadata.HasGPS) height += 50.0f; - if (g_config.InfoPanelExpanded && !g_currentMetadata.HistL.empty()) height += 100.0f; - if (!g_currentMetadata.Software.empty()) height += 20.0f; - - D2D1_RECT_F panelRect = D2D1::RectF(startX, startY, startX + width, startY + height); - - // Background - ComPtr brushBg; - context->CreateSolidColorBrush(D2D1::ColorF(0.0f, 0.0f, 0.0f, 0.7f), &brushBg); - context->FillRoundedRectangle(D2D1::RoundedRect(panelRect, 8.0f, 8.0f), brushBg.Get()); - - ComPtr brushWhite; - context->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF::White), &brushWhite); - - // Buttons (Top Right) - // Close [ X ] - g_panelCloseRect = D2D1::RectF(startX + width - 25, startY + 5, startX + width - 5, startY + 25); - context->DrawTextW(L"x", 1, g_pPanelTextFormat.Get(), D2D1::RectF(g_panelCloseRect.left + 5, g_panelCloseRect.top, g_panelCloseRect.right, g_panelCloseRect.bottom), brushWhite.Get()); - - // Minimize [ - ] - g_panelToggleRect = D2D1::RectF(startX + width - 50, startY + 5, startX + width - 30, startY + 25); - context->DrawTextW(L"-", 1, g_pPanelTextFormat.Get(), D2D1::RectF(g_panelToggleRect.left + 6, g_panelToggleRect.top, g_panelToggleRect.right, g_panelToggleRect.bottom), brushWhite.Get()); - - - // === NEW: Grid-Based Info Panel === - BuildInfoGrid(); - float gridStartY = startY + 30.0f; // After buttons - float gridContentHeight = g_infoGrid.size() * GRID_ROW_HEIGHT; - DrawInfoGrid(context, startX + padding, gridStartY, width - padding * 2); - - // Calculate where histogram/GPS should start (after grid content) - - float currentY = startY + (height - (g_currentMetadata.HasGPS ? 130.0f : 100.0f)); - // Heuristic layout is tricky with variable lines. - // Re-calculating Y based on lines? - // Let's use fixed offset from bottom for Histogram? - if (!g_currentMetadata.HistR.empty()) { - float histH = 80.0f; - float histY = startY + height - padding - histH - (g_currentMetadata.HasGPS ? 50.0f : 0); - DrawHistogram(context, g_currentMetadata, D2D1::RectF(startX + padding, histY, startX + width - padding, histY + histH)); - } - - // GPS - g_gpsLinkRect = {}; - if (g_currentMetadata.HasGPS) { - float gpsY = startY + height - 55.0f; - - // Line 1: Coordinates (clickable to copy) - wchar_t gpsBuf[128]; - swprintf_s(gpsBuf, L"GPS: %.5f, %.5f", g_currentMetadata.Latitude, g_currentMetadata.Longitude); - g_gpsCoordRect = D2D1::RectF(startX + padding, gpsY, startX + width - padding, gpsY + 18.0f); - context->DrawTextW(gpsBuf, (UINT32)wcslen(gpsBuf), g_pPanelTextFormat.Get(), g_gpsCoordRect, brushWhite.Get()); - - // Line 2: Altitude and OpenMap - float line2Y = gpsY + 20.0f; - - // Altitude (if available) - if (g_currentMetadata.Altitude != 0) { - wchar_t altBuf[64]; swprintf_s(altBuf, L"Alt: %.1fm", g_currentMetadata.Altitude); - D2D1_RECT_F altRect = D2D1::RectF(startX + padding, line2Y, startX + width - 90, line2Y + 18.0f); - context->DrawTextW(altBuf, (UINT32)wcslen(altBuf), g_pPanelTextFormat.Get(), altRect, brushWhite.Get()); - } - - // Link Button - Right side - g_gpsLinkRect = D2D1::RectF(startX + width - 85.0f, line2Y, startX + width - padding, line2Y + 18.0f); - ComPtr brushLink; - context->CreateSolidColorBrush(D2D1::ColorF(0.4f, 0.7f, 1.0f), &brushLink); - context->DrawTextW(L"OpenMap", 7, g_pPanelTextFormat.Get(), g_gpsLinkRect, brushLink.Get()); - } -} - - - -void OnPaint(HWND hwnd) { - if (!g_renderEngine) return; - - // Track mouse position and update grid hover state - POINT cursorPos; - GetCursorPos(&cursorPos); - ScreenToClient(hwnd, &cursorPos); - g_lastMousePos = cursorPos; - - // Check which grid row is being hovered - g_hoverRowIndex = -1; - if (g_config.InfoPanelExpanded && g_config.ShowInfoPanel) { - float x = (float)cursorPos.x; - float y = (float)cursorPos.y; - for (size_t i = 0; i < g_infoGrid.size(); i++) { - const auto& row = g_infoGrid[i]; - if (x >= row.hitRect.left && x <= row.hitRect.right && - y >= row.hitRect.top && y <= row.hitRect.bottom) { - g_hoverRowIndex = (int)i; - break; - } - } - } - - g_renderEngine->BeginDraw(); - auto context = g_renderEngine->GetDeviceContext(); - if (context) { - context->SetTransform(D2D1::Matrix3x2F::Identity()); - context->Clear(D2D1::ColorF(0.18f, 0.18f, 0.18f)); - - if (g_currentBitmap) { - D2D1_SIZE_F size = g_currentBitmap->GetSize(); - D2D1_SIZE_F rtSize = context->GetSize(); - - // Calculate fit scale (to fit image in window at Zoom=1.0) - float fitScale = std::min(rtSize.width / size.width, rtSize.height / size.height); - float finalScale = fitScale * g_viewState.Zoom; - - // Calculate centering offset based on FINAL scaled size - float scaledW = size.width * finalScale; - float scaledH = size.height * finalScale; - float offsetX = (rtSize.width - scaledW) / 2.0f; - float offsetY = (rtSize.height - scaledH) / 2.0f; - - // Apply pan offset - float totalX = offsetX + g_viewState.PanX; - float totalY = offsetY + g_viewState.PanY; - - D2D1::Matrix3x2F transform = D2D1::Matrix3x2F::Scale(finalScale, finalScale, D2D1::Point2F(0, 0)) - * D2D1::Matrix3x2F::Translation(totalX, totalY); - - context->SetTransform(transform); - - // Draw at (0,0) with original size, transform handles placement - // Use dynamic interpolation: LINEAR during interaction for responsiveness, CUBIC when static for quality - D2D1_INTERPOLATION_MODE interpMode = g_viewState.IsInteracting - ? D2D1_INTERPOLATION_MODE_LINEAR - : D2D1_INTERPOLATION_MODE_HIGH_QUALITY_CUBIC; - context->DrawBitmap(g_currentBitmap.Get(), D2D1::RectF(0, 0, size.width, size.height), 1.0f, interpMode); - } - - // Reset transform for OSD and UI elements - context->SetTransform(D2D1::Matrix3x2F::Identity()); - - RECT rect; GetClientRect(hwnd, &rect); - D2D1_SIZE_F size = context->GetSize(); - CalculateWindowControls(size); - DrawWindowControls(hwnd, context); - - // Draw OSD - g_renderEngine->DrawOSD(g_osd); - - // Draw Info Panel - // Draw Info Panel OR Compact Overlay - if (g_config.ShowInfoPanel) { - if (g_config.InfoPanelExpanded) { - DrawInfoPanel(context); - } else { - DrawCompactInfo(context); - } - } - - // Draw Tooltip (from grid hover) - DrawGridTooltip(context); - - // --- Gallery Overlay --- - g_gallery.Update(0.016f); - if (g_gallery.IsVisible()) { - D2D1_SIZE_F rtSize = context->GetSize(); - g_gallery.Render(context, rtSize); - } - - // Toolbar (Top of Gallery?) - g_toolbar.Render(context); - - DrawDialog(context, rect); - } - g_renderEngine->EndDraw(); - g_renderEngine->Present(); - - ValidateRect(hwnd, nullptr); -} diff --git a/QuickView/pch.cpp b/QuickView/pch.cpp deleted file mode 100644 index 1d9f38c5..00000000 --- a/QuickView/pch.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "pch.h" diff --git a/QuickView/pch.h b/QuickView/pch.h deleted file mode 100644 index 21a07723..00000000 --- a/QuickView/pch.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -// Windows headers -#define WIN32_LEAN_AND_MEAN -#define NOMINMAX -#include -#include - -// Direct2D and DirectWrite -#include -#include -#include -#include -#include - -// COM smart pointers -#include -using Microsoft::WRL::ComPtr; - -// C++ Standard Library -#include -#include -#include -#include - -// Pragmas for linking -#pragma comment(lib, "d2d1.lib") -#pragma comment(lib, "d3d11.lib") -#pragma comment(lib, "dxgi.lib") -#pragma comment(lib, "dwrite.lib") -#pragma comment(lib, "windowscodecs.lib") - -// Helper macro for HRESULT checking -#ifndef THROW_IF_FAILED -#define THROW_IF_FAILED(hr) \ - if (FAILED(hr)) { throw std::runtime_error("HRESULT failed: " + std::to_string(hr)); } -#endif diff --git a/QuickView/revert_error.txt b/QuickView/revert_error.txt deleted file mode 100644 index 538c7f87..00000000 --- a/QuickView/revert_error.txt +++ /dev/null @@ -1,44 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework -Build started 2025/12/21 13:23:00. - - 1>Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" on node 1 (Build target(s)). - 1>PrepareForBuild: - Structured output is enabled. The formatting of compiler diagnostics will reflect the error hierarchy. See https://aka.ms/cpp/structured-output for more details. - InitializeBuildStatus: - Touching "E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.tlog\unsuccessfulbuild". - ComputeStdModulesCompileInputs: - Reading library manifest file 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\modules.json' which provides data for library 'microsoft/STL'. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.ixx' from library 'microsoft/STL' to be built with this project. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.compat.ixx' from library 'microsoft/STL' to be built with this project. - VcpkgTripletSelection: - Using triplet "x64-windows-static-opt" from "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\" - Using normalized configuration "Release" - ClCompile: - All outputs are up-to-date. - All outputs are up-to-date. - All outputs are up-to-date. - Link: - D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\bin\HostX86\x64\link.exe /ERRORREPORT:QUEUE /OUT:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe" /NOLOGO /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib" /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\manual-link" dwrite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG:incremental /LTCGOUT:"E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.iobj" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib" /MACHINE:X64 E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\pch.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\RenderEngine.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\ImageLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\LosslessTransform.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\StbLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\TinyExrLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\WuffsImpl.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\main.obj - ڴ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib Ͷ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exp - 1>StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>Done Building Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target(s)) -- FAILED. - -Build FAILED. - - "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target) (1) -> - (Link target) -> - StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - - 0 Warning(s) - 2 Error(s) - -Time Elapsed 00:00:01.30 diff --git a/QuickView/shim_error.txt b/QuickView/shim_error.txt deleted file mode 100644 index 73fd2a0c..00000000 --- a/QuickView/shim_error.txt +++ /dev/null @@ -1,44 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework -Build started 2025/12/21 13:28:03. - - 1>Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" on node 1 (Build target(s)). - 1>PrepareForBuild: - Structured output is enabled. The formatting of compiler diagnostics will reflect the error hierarchy. See https://aka.ms/cpp/structured-output for more details. - InitializeBuildStatus: - Touching "E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.tlog\unsuccessfulbuild". - ComputeStdModulesCompileInputs: - Reading library manifest file 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\modules.json' which provides data for library 'microsoft/STL'. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.ixx' from library 'microsoft/STL' to be built with this project. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.compat.ixx' from library 'microsoft/STL' to be built with this project. - VcpkgTripletSelection: - Using triplet "x64-windows-static-opt" from "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\" - Using normalized configuration "Release" - ClCompile: - All outputs are up-to-date. - All outputs are up-to-date. - All outputs are up-to-date. - Link: - D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\bin\HostX86\x64\link.exe /ERRORREPORT:QUEUE /OUT:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe" /NOLOGO /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib" /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\manual-link" dwrite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG:incremental /LTCGOUT:"E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.iobj" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib" /MACHINE:X64 E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\pch.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\RenderEngine.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\ImageLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\LosslessTransform.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\StbLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\TinyExrLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\WuffsImpl.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\main.obj - ڴ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib Ͷ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exp - 1>StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>Done Building Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target(s)) -- FAILED. - -Build FAILED. - - "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target) (1) -> - (Link target) -> - StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - - 0 Warning(s) - 2 Error(s) - -Time Elapsed 00:00:01.21 diff --git a/QuickView/targetver.h b/QuickView/targetver.h deleted file mode 100644 index eae4b4fb..00000000 --- a/QuickView/targetver.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include diff --git a/QuickView/wrapper_error.txt b/QuickView/wrapper_error.txt deleted file mode 100644 index a8ebebd4..00000000 --- a/QuickView/wrapper_error.txt +++ /dev/null @@ -1,44 +0,0 @@ -MSBuild version 18.0.5+e22287bf1 for .NET Framework -Build started 2025/12/21 13:26:52. - - 1>Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" on node 1 (Build target(s)). - 1>PrepareForBuild: - Structured output is enabled. The formatting of compiler diagnostics will reflect the error hierarchy. See https://aka.ms/cpp/structured-output for more details. - InitializeBuildStatus: - Touching "E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.tlog\unsuccessfulbuild". - ComputeStdModulesCompileInputs: - Reading library manifest file 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\modules.json' which provides data for library 'microsoft/STL'. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.ixx' from library 'microsoft/STL' to be built with this project. - Adding module source 'D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\modules\std.compat.ixx' from library 'microsoft/STL' to be built with this project. - VcpkgTripletSelection: - Using triplet "x64-windows-static-opt" from "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\" - Using normalized configuration "Release" - ClCompile: - All outputs are up-to-date. - All outputs are up-to-date. - All outputs are up-to-date. - Link: - D:\Program Files\Microsoft Visual Studio\18\Community\VC\Tools\MSVC\14.50.35717\bin\HostX86\x64\link.exe /ERRORREPORT:QUEUE /OUT:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe" /NOLOGO /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib" /LIBPATH:"E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\manual-link" dwrite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "E:\Personal\Coding\QuickView\third_party\vcpkg\installed\x64-windows-static-opt\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.pdb" /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /LTCG:incremental /LTCGOUT:"E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\QuickView2026.iobj" /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib" /MACHINE:X64 E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\pch.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\RenderEngine.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\ImageLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\LosslessTransform.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\StbLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\TinyExrLoader.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\WuffsImpl.obj - E:\Personal\Coding\QuickView\QuickView2026\obj\x64\Release\main.obj - ڴ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.lib Ͷ E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exp - 1>StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - 1>Done Building Project "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target(s)) -- FAILED. - -Build FAILED. - - "E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj" (Build target) (1) -> - (Link target) -> - StbLoader.obj : error LNK2001: ޷ⲿ stbi_zlib_decode_malloc [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - E:\Personal\Coding\QuickView\QuickView2026\bin\x64\Release\QuickView2026.exe : fatal error LNK1120: 1 ޷ⲿ [E:\Personal\Coding\QuickView\QuickView2026\QuickView2026.vcxproj] - - 0 Warning(s) - 2 Error(s) - -Time Elapsed 00:00:01.30 diff --git a/README.md b/README.md deleted file mode 100644 index bf11d70c..00000000 --- a/README.md +++ /dev/null @@ -1,182 +0,0 @@ -
- -QuickView Banner - -# ⚡ QuickView 2.0 - -### The Rebirth: Built for Speed, Engineered for Geeks. - -

- Direct2D Rendering • - AVX2/SIMD Optimized • - Dynamic Island UI -

- -

- - License - - - Platform - - - Release - -

- -

- 📥 Download Latest Release • - Report Bug • - Request Feature -

- -
- ---- - -## 💥 2.0 Preview: The Rebirth - -**QuickView 2.0 represents a complete break from the past.** - -This is not a simple iteration. It is a ground-up rewrite based on **Modern C++ (C++23)** and **Direct2D**. We have discarded the legacy GDI rendering baggage and integrated the industry's most cutting-edge decoding technologies (Google Wuffs, TurboJPEG v3, dav1d) with one goal in mind: **To build the fastest, most hardcore image viewer on the Windows platform.** - ---- - -## 🚀 Key Features - -### 🏎️ Extreme Performance Engine - -> *"Speed is a feature."* We squeeze every ounce of performance out of your hardware. - -
- Task Manager Proof -
- Figure: 18.6MB RAM usage while rendering high-res content with Real-time Histogram. -
- -
- -* **Direct2D Pipeline:** Fully GPU-accelerated. Panning, zooming, and rendering on 4K high-refresh displays run at a silky smooth **60fps+**. -* **Dual-Lane Scheduling:** Unique "Fast/Slow" thread pools ensure that loading massive RAW files in the background **never** blocks UI responsiveness. -* **Instant Preview:** For RAW (ARW, CR2, DNG...), HEIC, and PSD, we extract embedded preview streams for **zero-latency** opening of 200MB+ files. - -### 🏝️ Dynamic Island Toolbar (New!) - -*A UI that breathes with you.* - -* **Immersive Interaction:** The toolbar floats elegantly at the bottom, mimicking the "Dynamic Island" aesthetic. -* **Hover-Reactive:** It remains invisible to maximize viewing area and seamlessly expands when your mouse approaches the bottom edge. -* **Geek Tools:** Instant access to Format Repair, RAW Toggle, and Exif data without cluttering the screen. - -### 🖼️ HUD Photo Wall - -*Browse visually, not just sequentially.* - -
- HUD Photo Wall -
- Figure: HUD Photo Wall. -
- -* **"T" to Toggle:** Press `T` to summon the Photo Wall overlay in a Heads-Up Display style. -* **Virtualization:** Effortlessly handles folders with **10,000+ images**. We only render what is currently visible on screen. -* **Smart Caching:** Dual-layer RAM (L1) + VRAM (L2) architecture with strict memory capping. - -### 📊 Geek Visualization - -*Don't just view the image; understand the data.* - - -* **Real-time RGB Histogram:** Translucent waveform overlay for exposure analysis. -* **Reverse Q-Factor:** Algorithmically estimates the original JPEG quality (e.g., `Q~98`), seeing through "100% Quality" saves. -* **Chroma Subsampling:** Instantly identify **4:4:4** (Lossless/Design) vs **4:2:0** (Compressed). - ---- - -## ⚙️ The Engine Room: Format Support - -QuickView 2.0 doesn't just "open" images; it uses the fastest, most secure libraries available for each format. - -| Category | Format | Backend Engine | Why it rocks (Architecture) | -| :--- | :--- | :--- | :--- | -| **Standard** | **JPEG** | **libjpeg-turbo v3** | AVX2 SIMD acceleration. The king of decompression speed. | -| | **PNG** | **Google Wuffs** | Memory-safe, outperforms libpng, handles massive dimensions. | -| | **GIF** | **Google Wuffs** | Extremely low CPU usage for playback (Better than WIC). | -| | **WebP** | **libwebp** | Google's official library. Supports Lossless, Animation, & Alpha. | -| | **BMP / TGA**| **Google Wuffs** | Replaces WIC for robust handling of malformed files. | -| **Modern** | **AVIF** | **libavif + dav1d** | Assembly-level AV1 decoding. Opens AVIFs instantly. | -| | **JXL** | **libjxl + highway** | Next-gen JPEG XL standard with multi-threaded decoding. | -| **Pro / RAW**| **RAW** | **LibRaw** | Prioritizes "Instant Preview" extraction for speed. | -| | **EXR** | **TinyEXR** | Lightweight, industrial-grade OpenEXR support. | -| | **HDR** | **stb_image** | Radiance HDR format support. | -| | **PSD** | **stb_image** | Reads composite preview layer for instant viewing. | -| **Vector** | **SVG** | **NanoSVG** | Rasterizes vector to bitmap for infinite scaling. | -| **System** | **HEIC** | **Windows WIC** | Hardware accelerated (Requires HEIF Extension). | - ---- - -## ⌨️ Shortcuts - -Master these shortcuts to navigate QuickView at the speed of thought: - -### 👁️ Viewing & Navigation -| Key | Action | Description | -| :--- | :--- | :--- | -| **`T`** | **Photo Wall** | Toggle the HUD Gallery overlay. | -| **`1`** / **`Z`** | **100% View** | Pixel-perfect inspection (Actual Size). | -| **`0`** / **`F`** | **Fit to Screen** | Fit the entire image to the screen. | -| **`Enter`** / **`F11`** | **Fullscreen** | Toggle immersive fullscreen mode. | -| **`Esc`** | **Exit** | Exit fullscreen or close the application. | -| **`Tab`** | **Lite Info** | Cycle through basic OSD overlays. | -| **`I`** | **Full Info** | Toggle the detailed EXIF/Histogram panel. | -| **`Ctrl + T`** | **Always on Top** | Pin the window to the foreground. | - -### 🔄 Transform & Edit -| Key | Action | Description | -| :--- | :--- | :--- | -| **`R`** | **Rotate CW** | Rotate 90° Clockwise. | -| **`Shift + R`** | **Rotate CCW** | Rotate 90° Counter-Clockwise. | -| **`H`** | **Flip Horizontal** | Mirror the image horizontally. | -| **`V`** | **Flip Vertical** | Mirror the image vertically. | -| **`E`** | **Edit** | Open image in default external editor. | - -### 📁 File Operations -| Key | Action | Description | -| :--- | :--- | :--- | -| **`O`** / **`Ctrl + O`** | **Open File** | Open file dialog. | -| **`F2`** | **Rename** | Rename the current file on disk. | -| **`Del`** | **Delete** | Move current file to Recycle Bin. | -| **`Ctrl + C`** | **Copy Image** | Copy image data to Clipboard. | -| **`Ctrl + Alt + C`** | **Copy Path** | Copy full file path text. | -| **`Ctrl + P`** | **Print** | Open system print dialog. | - ---- - -## 📥 Download & Install - -**QuickView is Portable.** No installers, no registry bloat. - -1. Go to the [**Releases Page**](https://github.com/justnullname/QuickView/releases). -2. Download the latest `QuickView_2.0_Preview_x64.zip`. -3. Unzip and run `QuickView.exe`. - ---- - -## 🗺️ Roadmap - -We are moving fast. Here is our current progress: - -- [x] **Core Engine 2.0** (D2D, Wuffs, TurboJPEG) -- [x] **HUD Photo Wall** (Virtualization, Smart Cache) -- [x] **Geek Panel** (Histogram, Q-Estimator) -- [x] **Dynamic Island Toolbar** (Hover-reactive UI) -- [x] **Full Format Support** (SVG, EXR, PSD, JXL, AVIF) -- [ ] **Visual Settings UI** (Replacing manual .ini editing) -- [ ] **Gif/WebP Frame Inspector** (Frame-by-frame analysis) - ---- - -## ⚖️ License & Credits - -This project is licensed under the **GPL-2.0 License**. -QuickView stands on the shoulders of giants. We salute **David Kleiner** (original JPEGView) and the open-source community behind **LibRaw, LibJpeg-Turbo, Google Wuffs, dav1d, and TinyEXR**. \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md deleted file mode 100644 index 59a39a3b..00000000 --- a/RELEASE_NOTES.md +++ /dev/null @@ -1,153 +0,0 @@ -# QuickView v1.3.0 Release Notes - -**Context Menu Modernization & OSD Fixes** -* **Cleaner Context Menu**: Reduced clutter by moving "Print", "Batch Copy", "Wallpaper", and "Transform" into a new **"Tools"** submenu. -* **Enhanced OSD**: Fixed a bug where the zoom percentage OSD would lag when using double-click to zoom. - -# QuickView v1.2.1 Release Notes - -**Visual Feedback & Polish** -This update focuses on improving user feedback and code quality. We've introduced a unified On-Screen Display (OSD) system that provides clear visual confirmation for "Always on Top" and other states. - -## 🚀 New Features & Improvements - -### 🖥️ Always on Top OSD -* **Visual Confirmation**: Toggling "Always on Top" (`Shift + F12`) now displays a clear "ON" or "OFF" message in the center of the screen. -* **Modern Design**: Using a sleek, semi-transparent dark background with white Segoe UI text. - -### ⚡ Unified OSD System (Technical) -* **Refactored Core**: All OSD messages (Zoom, System Status) now run on a unified "OSD Manager". -* **Zero Latency**: Zoom percentage display is now instant (bypassing the previous 200ms optimization delay for purely visual feedback). -* **Consistent Look**: Zoom and System messages share the same visual style. - ---- - -# QuickView v1.2.0 Release Notes - -**The Smart Update** -QuickView v1.2.0 brings intelligence to your viewing experience with background updates, smart zooming, and instant gallery browsing. - -## 🚀 New Features - -### 🔄 Seamless Auto-Update -* **Silent Background Download**: Updates download while you utilize the app. No waiting bars. -* **One-Click Install**: When ready, a simple dialog lets you update instantly. -* **Smart Cleanup**: Temporary files are automatically removed. - -### 🔍 Smart Double-Click Zoom -* **One-Two Punch**: Double-click to inspect details at 100% pixel-perfect zoom. Double-click again to fit to window. -* **Zero Latency**: Optimized for instant response. - -### 🖼️ Instant Gallery Mode -* **Toggle with 'T'**: Press 'T' to instantly show/hide the thumbnail bar. -* **Overlay Design**: Modern overlay that doesn't resize your window content unnecessarily. - -## ✨ Improvements -* **Markdown Support**: Release notes in the update dialog now look cleaner with automatic Markdown formatting. -* **Localization**: Full support for interface translation. -* **Bug Fixes**: Fixed issues with ZIP download handling and version string display (ANSI/Unicode). - ---- - -# QuickView v1.1.6 Release Notes - -**Narrow Border Mode Restored** -This update restores the "Narrow Border Mode" feature, allowing a configurable border to be drawn in borderless window mode for better visibility. - -## 🚀 New Features - -* **Narrow Border Mode**: Restored the ability to draw a colored border around the window when in borderless mode. - * **Configuration**: Add the following to your `QuickView.ini` under `[QuickView]`: - ```ini - ; Width of the border in pixels (0 = disabled) - NarrowBorderWidth=2 - ; Color of the border (R G B) - NarrowBorderColor=128 128 128 - ``` - ---- - -# QuickView v1.1.5 Release Notes - -**Window Resizing Fix** -This update resolves an issue where the window would not correctly resize to accommodate the thumbnail bar, causing the image to be cropped. - -## 🐛 Bug Fixes - -# QuickView v1.1.4 Release Notes - -**Initialization & Cropping Fix** -This update resolves issues where images could appear cropped on startup or when the thumbnail bar was toggled. - -## 🐛 Bug Fixes - -* **Startup Cropping**: Fixed a bug where the "Fit to Screen" state was uninitialized on startup, leading to random cropping behavior. -* **Panning Reset**: Fixed an issue where the image would remain shifted (panned) when resizing to fit the thumbnail bar, causing the top or bottom to be cut off. Now, the image is correctly centered whenever it auto-resizes. - ---- - -# QuickView v1.1.3 Release Notes - -**Zoom Fix Release** -This update fixes a regression in v1.1.2 that prevented manual zooming. - -## 🐛 Bug Fixes - -* **Zoom Regression**: Fixed an issue where manual zooming was disabled (locked to "Fit to Screen") when the thumbnail bar fix was applied. Now, "Fit to Screen" correctly resizes for the thumbnail bar, but manual zooming works freely as expected. - ---- - -# QuickView v1.1.2 Release Notes - -**Refined Hotfix Release** -This update refines the fix for the thumbnail bar overlap issue, ensuring images are properly rescaled to fit the available space. - -## 🐛 Bug Fixes - -* **Thumbnail Bar Overlap (Refined)**: In v1.1.1, the image was shifted but not resized, causing the top to be cut off. v1.1.2 correctly recalculates the "Fit to Screen" zoom level when the thumbnail bar appears, ensuring the entire image is visible. - ---- - -# QuickView v1.1.1 Release Notes - -**Hotfix Release** -This update addresses a visual issue introduced in v1.1.0 where the thumbnail bar would overlap the main image. - -## 🐛 Bug Fixes - -* **Thumbnail Bar Overlap**: Fixed a bug where the main image was not correctly resized/positioned when the thumbnail bar was visible, causing the bottom of the image to be covered. The image now correctly fits within the available space above the thumbnail bar. - ---- - -# QuickView v1.1.0 Release Notes - -**This is a major release marking a significant evolution of QuickView.** -Building upon the solid foundation of JPEGView, this version introduces original features that transform the user experience, making QuickView not just a viewer, but a modern, borderless image consumption tool. - -## 🚀 Major New Features (Original) - -### 1. Thumbnail Gallery Navigation -* **What it is**: A completely new way to browse your folder. Instead of just next/prev, see a filmstrip of your images at the bottom. -* **New in v1.1.0**: Added dedicated left/right navigation arrows for independent scrolling, allowing you to peek at upcoming images without changing the main view. -* **Design**: Modern, transparent "chevron" arrows that blend seamlessly with the UI. - -### 2. True Borderless Experience -* **What it is**: We've removed the clutter. No title bars, no ugly borders. Just your image, edge-to-edge. -* **Chrome-style Floating Controls**: To maintain usability without borders, we've added a sleek, auto-hiding button bar (Minimize, Maximize, Close) that appears only when you need it (hover at the top). - -### 3. Startup Optimization -* **Optimization**: Eliminated the "white screen flash" on startup. QuickView now respects your dark theme from the very first millisecond. - -## 🐛 Critical Bug Fixes - -* **Zoom Text**: Fixed a glitch where zoom percentage text would overlap with the thumbnail bar. -* **Fullscreen Interaction**: Resolved issues where dragging the window was possible in fullscreen mode. -* **UI Stability**: Fixed various button visibility and interaction bugs. - -## 📦 Installation - -1. Download `QuickView_v1.1.0.zip`. -2. Extract the contents to a folder of your choice. -3. Run `QuickView.exe`. - -*Note: This is a portable release. All settings are stored in `QuickView.ini`.* diff --git a/custom-ports/libpng/cmake.patch b/custom-ports/libpng/cmake.patch deleted file mode 100644 index ebac200f..00000000 --- a/custom-ports/libpng/cmake.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d91e3a6c3..249d04c0f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -144,6 +144,12 @@ set(PNG_LINK_LIBRARIES ZLIB::ZLIB) - # Find the math library (unless we already know it's not available or - # not needed). - if(UNIX AND NOT (APPLE OR BEOS OR HAIKU OR EMSCRIPTEN)) -+ block(SCOPE_FOR VARIABLES) -+ if(VCPKG_CRT_LINKAGE STREQUAL "static") -+ list(PREPEND CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ endif() -+ check_library_exists(m pow "${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}" PNG_HAVE_LIBM_POW) -+ endblock() - check_library_exists(m pow "" PNG_HAVE_LIBM_POW) - endif() - if(PNG_HAVE_LIBM_POW) -@@ -240,9 +246,9 @@ if(PNG_HARDWARE_OPTIMIZATIONS) - - # Set definitions and sources for MIPS. - if(PNG_TARGET_ARCHITECTURE MATCHES "^(mipsel|mips64el)") -- set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) -+ set(PNG_MIPS_MSA_POSSIBLE_VALUES on off check) - set(PNG_MIPS_MSA -- "on" -+ "check" - CACHE STRING "Enable MIPS_MSA optimizations: on|off; on is default") - set_property(CACHE PNG_MIPS_MSA - PROPERTY STRINGS ${PNG_MIPS_MSA_POSSIBLE_VALUES}) -@@ -269,6 +275,12 @@ if(PNG_HARDWARE_OPTIMIZATIONS) - mips/filter_mmi_inline_assembly.c) - add_definitions(-DPNG_MIPS_MSA_OPT=2) - add_definitions(-DPNG_MIPS_MMI_OPT=1) -+ elseif(PNG_MIPS_MSA STREQUAL "check") -+ set(libpng_mips_sources -+ mips/mips_init.c -+ mips/filter_msa_intrinsics.c) -+ add_definitions(-DPNG_MIPS_MSA_CHECK_SUPPORTED) -+ add_definitions(-DPNG_MIPS_MMI_CHECK_SUPPORTED) - elseif(PNG_MIPS_MSA STREQUAL "on") - set(libpng_mips_sources - mips/mips_init.c -@@ -661,7 +673,7 @@ else() - # We also need to use a custom suffix, in order to distinguish between the - # shared import library name and the static library name. - set(PNG_SHARED_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}") -- set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}_static") -+ set(PNG_STATIC_OUTPUT_NAME "libpng${PNGLIB_ABI_VERSION}") - endif() - - if(PNG_SHARED) -@@ -939,10 +951,10 @@ if(PNG_TESTS AND PNG_SHARED) - FILES ${PNGSUITE_PNGS}) - endif() - --if(PNG_SHARED AND PNG_TOOLS) -+if(PNG_TOOLS) - add_executable(pngfix ${pngfix_sources}) - target_link_libraries(pngfix -- PRIVATE png_shared) -+ PRIVATE $ $) # in vcpkg there's only one - set(PNG_BIN_TARGETS pngfix) - - add_executable(png-fix-itxt ${png_fix_itxt_sources}) -@@ -1028,12 +1040,15 @@ endif() - # We use the same files like ./configure, so we have to set its vars. - # Only do this on Windows for Cygwin - the files don't make much sense - # outside of a UNIX look-alike. --if(NOT WIN32 OR CYGWIN OR MINGW) -+if(1) - set(prefix "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "${CMAKE_INSTALL_PREFIX}") - set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") - set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") -- set(LIBS "-lz -lm") -+ set(LIBS "") -+ if(PNG_HAVE_LIBM_POW) -+ string(APPEND LIBS "-lm") -+ endif() - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libpng.pc.in" - "${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc" - @ONLY) -@@ -1092,6 +1107,9 @@ if(NOT SKIP_INSTALL_PROGRAMS AND NOT SKIP_INSTALL_ALL) - endif() - - if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpng${PNGLIB_ABI_VERSION}.pc -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+elseif(0) - # Install the man pages. - install(FILES libpng.3 libpngpf.3 - DESTINATION "${CMAKE_INSTALL_MANDIR}/man3") diff --git a/custom-ports/libpng/libpng-config.cmake b/custom-ports/libpng/libpng-config.cmake deleted file mode 100644 index a2644487..00000000 --- a/custom-ports/libpng/libpng-config.cmake +++ /dev/null @@ -1,12 +0,0 @@ -file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) -message(WARNING "find_package(libpng) is deprecated.\n${usage}") - -include(CMakeFindDependencyMacro) -find_dependency(PNG CONFIG) - -if(NOT TARGET png_shared) - add_library(png_shared ALIAS PNG::PNG) -endif() -if(NOT TARGET png_static) - add_library(png_static ALIAS PNG::PNG) -endif() diff --git a/custom-ports/libpng/portfile.cmake b/custom-ports/libpng/portfile.cmake deleted file mode 100644 index 9ed26484..00000000 --- a/custom-ports/libpng/portfile.cmake +++ /dev/null @@ -1,128 +0,0 @@ -# Download the apng patch -set(LIBPNG_APNG_PATCH_PATH "") -if ("apng" IN_LIST FEATURES) - if(VCPKG_HOST_IS_WINDOWS) - # Get (g)awk and gzip installed - vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk gzip) - set(AWK_EXE_PATH "${MSYS_ROOT}/usr/bin") - vcpkg_add_to_path("${AWK_EXE_PATH}") - endif() - - set(LIBPNG_APNG_PATCH_NAME "libpng-${VERSION}-apng.patch") - vcpkg_download_distfile(LIBPNG_APNG_PATCH_ARCHIVE - URLS "https://downloads.sourceforge.net/project/libpng-apng/libpng16/${VERSION}/${LIBPNG_APNG_PATCH_NAME}.gz" - FILENAME "${LIBPNG_APNG_PATCH_NAME}.gz" - SHA512 9da270cb434fc00e16e66535c955e283367b7bf9ae64292b3fa3921e03d101b2c800041db23687e8653e2a2db1be126497d9c5bfd74cbe626bf2ad7d6f706978 - ) - set(LIBPNG_APNG_PATCH_PATH "${CURRENT_BUILDTREES_DIR}/src/${LIBPNG_APNG_PATCH_NAME}") - if (NOT EXISTS "${LIBPNG_APNG_PATCH_PATH}") - file(INSTALL "${LIBPNG_APNG_PATCH_ARCHIVE}" DESTINATION "${CURRENT_BUILDTREES_DIR}/src") - vcpkg_execute_required_process( - COMMAND gzip -d "${LIBPNG_APNG_PATCH_NAME}.gz" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src" - ALLOW_IN_DOWNLOAD_MODE - LOGNAME extract-patch.log - ) - endif() -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO pnggroup/libpng - REF v${VERSION} - SHA512 e854589401043c5f24e0365a578ccda8fde47766fa5990c7355581e4f0dc67bfefd7f1272fc25c269968135826cf583b1a10d01667af97e2ec4410cfaf2a700c - HEAD_REF master - PATCHES - "${LIBPNG_APNG_PATCH_PATH}" - cmake.patch -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PNG_STATIC) - -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools PNG_TOOLS - INVERTED_FEATURES - tools SKIP_INSTALL_PROGRAMS -) - -vcpkg_list(SET LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION) -if(VCPKG_TARGET_IS_IOS) - vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_HARDWARE_OPTIMIZATIONS=OFF") -endif() - -vcpkg_list(SET LD_VERSION_SCRIPT_OPTION) -if(VCPKG_TARGET_IS_ANDROID) - vcpkg_list(APPEND LD_VERSION_SCRIPT_OPTION "-Dld-version-script=OFF") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - vcpkg_cmake_get_vars(cmake_vars_file) - include("${cmake_vars_file}") - if(VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON) - vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") - else() - # for armeabi-v7a, check whether NEON is available - vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=check") - endif() - endif() -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_TARGET_IS_LINUX) - vcpkg_list(APPEND LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION "-DPNG_ARM_NEON=on") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" - "-DZLIB_LIBRARY_RELEASE=${CURRENT_INSTALLED_DIR}/lib/zlibstatic-ng.lib" - "-DZLIB_LIBRARY_DEBUG=${CURRENT_INSTALLED_DIR}/debug/lib/zlibstatic-ngd.lib" - # CMake FindZLIB typically uses ZLIB_LIBRARY for the main one, but separate release/debug might require CMAKE_ flags or specific handling. - # But for FindZLIB.cmake provided by CMake, usually ZLIB_LIBRARY is sufficient if generic? - # Let's try setting standard CMake cache entries. - "-DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlibstatic-ng.lib" - ${LIBPNG_HARDWARE_OPTIMIZATIONS_OPTION} - ${LD_VERSION_SCRIPT_OPTION} - -DPNG_STATIC=${PNG_STATIC} - -DPNG_SHARED=${PNG_SHARED} - -DPNG_FRAMEWORK=OFF - -DPNG_TESTS=OFF - -DSKIP_INSTALL_EXECUTABLES=ON - -DSKIP_INSTALL_FILES=OFF - ${FEATURE_OPTIONS} - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON - MAYBE_UNUSED_VARIABLES - PNG_ARM_NEON -) -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME png CONFIG_PATH lib/cmake/PNG) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpng) -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/png") - -# unofficial legacy usage -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libpng-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16d") - file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" "-lpng16" "-llibpng16") -elseif(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" "-lpng16" "-lpng16d") - file(INSTALL "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" RENAME "libpng.pc") -endif() -file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libpng16.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" RENAME "libpng.pc") - -vcpkg_copy_pdbs() - -if(PNG_TOOLS) - vcpkg_copy_tools(TOOL_NAMES "pngfix" "png-fix-itxt" AUTO_CLEAN) -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/custom-ports/libpng/usage b/custom-ports/libpng/usage deleted file mode 100644 index 122bb991..00000000 --- a/custom-ports/libpng/usage +++ /dev/null @@ -1,4 +0,0 @@ -libpng provides CMake targets: - - find_package(PNG REQUIRED) - target_link_libraries(main PRIVATE PNG::PNG) diff --git a/custom-ports/libpng/vcpkg-cmake-wrapper.cmake b/custom-ports/libpng/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index de1e087f..00000000 --- a/custom-ports/libpng/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,3 +0,0 @@ -find_library(PNG_LIBRARY_RELEASE NAMES png16 libpng16 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) -find_library(PNG_LIBRARY_DEBUG NAMES png16d libpng16d NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) -_find_package(${ARGS}) diff --git a/custom-ports/libpng/vcpkg.json b/custom-ports/libpng/vcpkg.json deleted file mode 100644 index 0d8f7cf5..00000000 --- a/custom-ports/libpng/vcpkg.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "libpng", - "version": "1.6.53", - "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", - "homepage": "https://github.com/pnggroup/libpng", - "license": "libpng-2.0", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, - { - "name": "vcpkg-cmake-get-vars", - "host": true, - "platform": "arm & android" - }, - "zlib-ng" - ], - "features": { - "apng": { - "description": "This is backward compatible with the regular libpng, both in library usage and format" - }, - "tools": { - "description": "Build the libpng tools", - "supports": "!android & !ios" - } - } -} \ No newline at end of file diff --git a/custom-ports/zlib/portfile.cmake b/custom-ports/zlib/portfile.cmake deleted file mode 100644 index e94b758d..00000000 --- a/custom-ports/zlib/portfile.cmake +++ /dev/null @@ -1,5 +0,0 @@ -# zlib -> zlib-ng redirect overlay port -# This port redirects zlib dependency to zlib-ng with ZLIB_COMPAT mode -# zlib-ng provides faster SIMD-optimized compression/decompression - -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/custom-ports/zlib/vcpkg.json b/custom-ports/zlib/vcpkg.json deleted file mode 100644 index 43e9ea2d..00000000 --- a/custom-ports/zlib/vcpkg.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "zlib", - "version": "1.3.1", - "port-version": 1, - "description": "Redirect to zlib-ng (faster, SIMD-optimized)", - "homepage": "https://github.com/zlib-ng/zlib-ng", - "license": "Zlib", - "dependencies": [ - { - "name": "zlib-ng", - "version>=": "2.0.0" - } - ] -} \ No newline at end of file diff --git a/custom-triplet/x64-windows-static-opt.cmake b/custom-triplet/x64-windows-static-opt.cmake deleted file mode 100644 index 51fb7a4a..00000000 --- a/custom-triplet/x64-windows-static-opt.cmake +++ /dev/null @@ -1,21 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE static) -set(VCPKG_LIBRARY_LINKAGE static) - -# Common flags -# /Gw = Optimize global data -set(COMMON_FLAGS "/DWIN32 /D_WINDOWS /W3 /utf-8 /MP /Gw") - -set(VCPKG_C_FLAGS "${COMMON_FLAGS}") -set(VCPKG_CXX_FLAGS "${COMMON_FLAGS}") - -# Release: Maximize Speed (/O2), Intrinsic (/Oi), Inline (/Ob2), LTO (/GL) -set(VCPKG_C_FLAGS_RELEASE "/O2 /Oi /Ob2 /GL") -set(VCPKG_CXX_FLAGS_RELEASE "/O2 /Oi /Ob2 /GL") -set(VCPKG_LINKER_FLAGS_RELEASE "/LTCG") - -# Debug: Default (no forced optimizations, allows /RTC1) - -# zlib-ng: Use ZLIB_COMPAT mode to replace zlib with faster zlib-ng -# This makes zlib-ng output zlib-compatible library names and APIs -set(ZLIB_COMPAT ON) diff --git a/readme.html b/readme.html deleted file mode 100644 index 85c7315b..00000000 --- a/readme.html +++ /dev/null @@ -1,1317 +0,0 @@ - - - - - - Readme for JPEGView - - - - - - - - -
-
- - -

Introduction

- JPEGView is a viewer/editor for JPEG, BMP, WEBP, PNG, TGA, RAW, GIF and TIFF images. It is designed to view images from digital cameras - full screen and with highest quality possible. Basic image editing functionality is provided - allowing to correct typical - problems as color cast, high/low contrast and under- or overexposure very quickly and interactively during review of the - images. JPEGView does not replace a full blown image editor - such an editor will just be needed less often.
- Features: -
    -
  • - Supported image formats -
      -
    • JPEG (including EXIF)
      • -
    • BMP (Windows Bitmap)
      • -
    • WEBP
      • -
    • - JPEG XR (Windows XP: WIC must be installed) -
      • -
    • PNG
      • -
    • GIF (including animated GIFs)
      • -
    • TIFF
      • -
    • TGA
      • -
    • - Camera RAW (embedded JPEGs, see here for details)
      -
      • -
    -
    • -
  • - Fullscreen viewing -
      -
    • Image centric - nothing else visible by default
      • -
    • Multiple monitor support
      • -
    • Window mode also supported (Toggle with Ctrl-W)
      • -
    -
    • -
  • - Small and fast -
      -
    • Executable is only 1 MB
      • -
    • C++/MMX/SSE/AVX2 code
      • -
    • 32 bit and 64 bit versions
      • -
    • Support for multiple CPU cores to speedup processing
      • -
    • Minimal dependencies on external libraries
      • -
    -
    • -
  • - High quality resizing of images -
      -
    • Downsampling filter preserves sharpness
      • -
    • Bicubic interpolation for upsampling
      • -
    -
    • -
  • - Interactive image processing and improvement -
      -
    • Real time and full screen image processing
      • -
    • Contrast, Brightness and Saturation adaptation
      • -
    • Unsharp masking
      • -
    • Cyan-Red, Magenta-Green, Yellow-Blue color balance
      • -
    • Local brightness correction to lighten shadows and darken highlights
      • -
    • Automatic color and contrast correction
      • -
    • Rotation in 90 deg steps
      • -
    • Free image rotation for horizon correction
      • -
    • Perspective correction
      • -
    • Lossless JPEG transformations
      • -
    • Crop image (supporting lossless crop for JPEGs)
      • -
    • Landscape picture improvement mode
      • -
    -
    • -
  • - Viewing and image processing parameters can be saved per image -
      -
    • Image file remains untouched
      • -
    • Database entries remain valid when image file is moved or renamed
      • -
    -
    • -
  • - Slide shows and movie playing -
      -
    • Plays slide shows given by text file
      • -
    • Multiple transition effects for slide shows
      • -
    • - Plays all images in folder as movie with configurable frame rate.
      - All image processing remains functional while playing. -
      • -
    -
    • -
  • - Batch rename and copy -
      -
    • Copies and renames files from digicam to target folders
      • -
    • Creates target folders as needed
      • -
    • Supports various placeholders for renaming files
      • -
    -
    • -
  • - Extensible and highly configurable - -
    • -
- - -

Installation

- There is no installer for JPEGView because none is needed. Just copy or extract all files to a folder - on your harddisk (e.g. C:\Program Files\JPEGView\).
- To define JPEGView as your default viewer for image files, perform the following steps: -
    -
  • Open the context menu of JPEGView (right mouse click)
    • -
  • On the context menu, choose 'Settings/Administration' - 'Set as default viewer'
    • -
  • Windows XP - Windows 8.1:
    • -
      -
    • - On the dialog that is appearing, the file extensions of the supported image file formats are listed, - together with the information if the corresponding extension is currently bound to JPEGView. -
      • -
    • Select the file extensions to be opened by JPEGView and confirm with OK
      • -
    -
  • - Windows 10 insists on using the 'Standard-apps' dialog of the operating system to change the standard application for images.
    - Thus you need to go to the 'Standard-Apps' settings page of Windows 10: -
    • -
      -
    • Open the Windows 10 start menu and type 'standard apps'. Click the found settings page.
      • -
    • On the right panel, scroll to the end and select 'Set defaults by app'
      • -
    • In the dialog that is appearing, choose JPEGView in the list on the left panel
      • -
    • Now you can assign all or a subset of the image file types to JPEGView
      • -
    -
- Hardware Requirements
-
    -
  • - 256 MB RAM
    - 512 MB RAM is required if images with more than 10 MegaPixels are viewed, - less than 256 MB is acceptable if only small images (less than 5 MegaPixels) are viewed. -
    • -
  • - CPU should be SSE2 capable (perfect is a CPU with 128 bit SSE2 processing and multiple CPU cores)
    - Other CPUs also work but performance decreases somewhat -
    • -
  • A mouse with a scroll wheel (for zooming) and navigation buttons on the side is highly recommended
    • -
  • - If you are using JPEGView on a touch-screen: You may increase the size of the buttons on the navigation - panel by increasing the value of 'ScaleFactorNavPanel' in the INI file. -
    • -
- Supported Operating Systems
-
    -
  • Windows 10 / 8.1 / 8
    • -
  • Windows 7
    • -
  • Windows Vista
    • -
  • Windows XP (SP2 required)
    • -
  • Windows 2000 : Not supported anymore, use version 1.0.21
    • -
- Supported Languages
-
    -
  • Basque
    • -
  • Belorussian
    • -
  • Chinese
    • -
  • Czech
    • -
  • English
    • -
  • French
    • -
  • German
    • -
  • Greek
    • -
  • Italian
    • -
  • Japanese
    • -
  • Korean
    • -
  • Polish
    • -
  • Portuguese
    • -
  • Romanian
    • -
  • Russian
    • -
  • Spanish
    • -
  • Swedish
    • -
  • Ukrainian
    • -
- By default JPEGView uses the same language as the operating system. However another language can be forced using the INI file. - Translations to other languages can be done very easily by providing an UTF8 coded text mapping file, see - strings_de.txt as an example.
- If you want that your translation is included into the next JPEGView release, contact me at - jpegview@gmail.com
- Registry
- JPEGView does not touch the registry except when registering file extensions to be displayed with - JPEGView. This will add some registry entries in the 'Current User' branch of the registry.
- Created Files during Runtime
- The only location where files are written (the parameter DB and the user INI file) - is in 'Users\Username\AppData\roaming\JPEGView\'. Notice that the exact path depends on the Windows version. For exceptions of this rule see next section.
- Note that these files are only created when they are needed, e.g. when the first parameter set is stored to the parameter DB.
- Forcing user data storage in EXE path
- By setting StoreToEXEPath=true in the global INI file, - the storage location for the user INI file and the parameter DB can be changed to the EXE path of JPEGView. This makes - sense when using JPEGView from an USB memory stick to prevent storing data on the host system.
- Restricted Rights
- JPEGView runs without problems on accounts with restricted rights. Setting JPEGView as default viewer for already registered file - extensions may fail without administrator rights when using Windows Vista, Windows 7 or later. - -

Using JPEGView

- -

Getting Started

- For getting started, the following commands in JPEGView are the most important ones:
-
    -
  • - F1 displays help on JPEGView -
    • -
  • - F2 displays information about the current image -
    • -
  • - PgDn/PgUp navigates to next/previous image (Alternative: 'forward' and 'back' mouse buttons) -
    • -
  • Mouse wheel zooms in and out
    • -
  • Dragging mouse while left mouse button is pressed will pan the image
    • -
  • Move mouse pointer to bottom of screen for image processing, parameter DB access and file renaming
    • -
  • Move mouse pointer to top of screen for minimizing or closing the application
    • -
  • Right mouse button displays the context menu
    • -
  • - ESC terminates the application -
    • -
- -

Navigation Panel

- Navigation panel -
- From left to right:
- - First image in folder, Previous image, Next image, Last image in folder
- - Delete image file (to recycle bin, use Shift+Del to delete image files permanently)
- - Zoom mode, when active zooming can be done by pressing the left mouse button and dragging the mouse to the left and right
- - Actual image size / Fit image to screen
- - Window mode / Full screen mode
- - Rotate clockwise, Rotate counter-clockwise
- - Rotate image by any angle, e.g. to perform horizon correction
- - Perspecive correction, corrects tilted vertical edges
- - Keep image processing parameters and zoom/pan between images
- - Toggle landscape picture enhancement mode
- - Toggle display of image information (EXIF)
- -

Full Screen Mode / Window Mode

- By default JPEGView starts in full screen mode on the largest monitor attached to the computer. - A window mode is also supported. Toggling between full screen and window mode is done with F11 or with - the button on the navigation panel.
- By changing the INI file, it is possible to force JPEGView to start in window mode and to use a different monitor - respectively window position and size. Note that when changing the window size with the mouse, the image is not - scaled automatically to fit the new size. Press then Enter key to fit the image to the window. - - -

Viewing Images

-

Navigation

- To navigate between images, the following commands are supported: -
    -
  • - Next image
    - Keyboard: PgDn or 'Left arrow'
    - Mouse: 'Forward' mouse button (normally on left side of mouse) -
    • -
  • - Previous image
    - Keyboard: PgUp or 'Right arrow'
    - Mouse: 'Back' mouse button -
    • -
  • - First image in folder (according to sort order, see below)
    - Keyboard: Home -
    • -
  • - Last image in folder (according to sort order, see below)
    - Keyboard: End -
    • -
  • - Mark image for toggling
    - Keyboard: Ctrl-M -
    • -
  • - Toggle between current image and marked image
    - Note that toggling only works between images in the same folder
    - Keyboard: Ctrl-Left arrow or Ctrl-Right arrow -
    • -
  • - Reload image
    - Keyboard: Ctrl-R
    -
    • -
  • - Open image or folder
    - Keyboard: Ctrl-O
    - The standard 'File Open' dialog is shown and allows displaying images from other folders. - Alternatively, a text file containing file names for a slide show can be opened. -
    • -
  • - Drag and drop image or folder from Windows Explorer to JPEGView window. -
    • -
- The basic navigation command (First image in folder, Previous image, Next image, Last image in folder) are also - available on the navigation panel, transparently blended over the image.
- JPEGView uses a second thread to read ahead and process the next image. Guessing the next image is based on - the last navigations.

- - JPEGView supports the following navigation modes: -
    -
  • - F7: (Default) Display all files in current folder, wrap around to first image when finished
    - The file name of the current file and it's position in the folder can be displayed using Ctrl-F2. -
    • -
  • - F8: Display all files in current folder, when finished recursively display images in subfolders.
    - Subfolders in the same root directory are traversed in alphabetic order. -
    • -
  • - F9: Display all files in current folder, when finished advance to next sibling folder - (folder on same level as current folder) -
    • -
- - The default navigation mode can be changed in the INI file.

- The display-order within one folder is also configurable: -
    -
  • - m: (Default) Order files according to date/time of last modification -
    • -
  • - c: Order files according to date/time of creation -
    • -
  • - n: Order files according to file name -
    • -
  • - z: Random file order -
    • -
- The default ordering can be changed in the INI file.
- -

Image Information

-
Image and EXIF Information
- Use F2 to display information about the current image, including the value of some EXIF tags, e.g. date and - time the image was taken and exposure information. Optionally the histogram of the image can be displayed below the - EXIF information. The histogram is updated immediately when the image is processed. -
File Name and Path
- Use Ctrl-F2 to display the full path and file name of the current image. - -

Zoom and Pan

- Images can be zoomed and panned interactively. While zooming, a lower quality image processing mode is used. The - image will be processed automatically with the high quality resize filters as soon as no zoom command is received for - about half a second.
- By default, images that are larger than the screen are scaled down to fit the screen. Images that are smaller than the screen - are not scaled by default. Use the following commands to change the zoom factor: -
    -
  • - Fit image to screen
    - Keyboard: Enter - Mouse: Double click on the image -
    • -
  • - Fill screen with crop (no black borders)
    - Keyboard: Ctrl-Enter -
    • -
  • - Zoom to 100 % (One image pixel corresponds to one screen pixel)
    - Keyboard: Space
    - Toggles back to 'Fit to screen' when zoom is already 100 %
    - Note that the point under the mouse cursor remains fixed during zoom - allows zooming to point of interest -
    • -
  • - Enlarge view to span all monitors (only available on multi monitor systems)
    - Keyboard: F12
    - Panoramas look great in this mode if you have multiple screen.
    - Pressing F12 again toggles back to normal one-screen mode. -
    • -
  • - Free Zoom
    - Keyboard: 'Plus' or Ctrl-'Arrow up' to zoom in, 'Minus' or Ctrl-'Arrow down' to zoom out
    - Mouse: Mouse wheel or Shift-left mouse click and drag mouse to the left and right
    -
    • -
  • - Pan
    - Keyboard: Shift+'Arrows'
    - Mouse: Left mouse and drag
    - Pan is only supported when the image is larger than the screen -
    • -
-
Because almost all images from digital cameras must be sampled down for a typical monitor, the downsampling filter - has been choosen carefully to provide an optimal image quality. The downsampling filter uses a 7 x 7 to 15 x 15 - (depending on resize-factor) Lanczos-like filter kernel. This kernel produces only a small amout of aliasing while - preserving or even slightly enhancing the sharpness of the image. You can see the difference to simple point sampling when - pressing F3 what toggles between point sampling and filter based sampling. - -

Auto Scale Mode

- The auto scale mode determines how images are fitted to the screen. The default auto scale mode is read from the - INI file, however the mode can also be changed during runtime with the context menu, submenu 'Auto scale mode'.
- The following modes are supported: -
    -
  • - Fit to screen (no zoom)
    - Images that are larger than the screen are scaled down to fit. No image areas are cropped but black borders - will be visible when the image aspect ratio and the screen aspect ratio do not match. Images that are smaller - than the screen are not enlarged. -
    • -
  • - Fill with crop (no zoom)
    - Images that are larger than the screen are scaled down to fill the entire screen. Cropping occurs if necessary to - avoid black borders. Images that are smaller than the screen are not enlarged.
    - This mode is suited for viewing 4:3 images on a 16:9 wide screen without black borders.
    - Note: Cropping is limited to approximately 30 % of the image in this mode. If more would be cropped, fit to screen is used instead. - As a result, portrait images will not be cropped on the screen. -
    • -
  • - Fit to screen
    - Images are scaled (up or down) to fit the screen. No image areas are cropped but black borders can be visible. -
    • -
  • - Fill with crop
    - Images are scaled (up or down) to fill the entire screen. Unlimited cropping may occurs if necessary to avoid - black borders. -
    • -
- -

Rotate

- With the 'Arrow down' and 'Arrow up' keys, the current image can be rotated clockwise, respectively - counter-clockwise. Note that JPEGView looks for the rotation tag in the EXIF data to rotate the image automatically. Some - cameras have an orientation sensor and set this tag.
- To rotate a JPEG image lossless on disk, use the R and T keys. - -

Crop

- When the Ctrl key and the left mouse button are pressed and the mouse is dragged, a selection on the image can be - defined. After having defined a selection, a context menu provides the following commands: -
    -
  • - Crop image selection
    - Crops the image selection and re-applies all image processing with the current parameters to the cropped image. - When the color and contrast correction is active, the cropped image may looks different afterwards. Note that a crop - operation cannot be stored to the parameter DB. -
    • -
  • - Lossless crop (for JPEG images only)
    - Crops the image selection without recompression of the JPEG image. The cropped image must be stored as a new JPEG file. - Note that lossless crop cannot be more exact than to 8 or 16 pixel boundaries due to the structure of JPEG images. -
    • -
  • - Copy image selection to clipboard
    - Note that this command will copy the image selection in original resolution and not in screen resolution. -
    • -
  • - Crop Mode
    - Sets the crop mode - either to free croping, fixed size cropping or cropping with a fixed aspect ratio. - Note that the default fixed crop size can be set in the INI file. -
    • -
  • Zoom to selection
    • -
- Hint: Use a large zoom factor and the point-sampling mode (F3 key) to crop with pixel precision.
- Note: When the crop-menu appears, the crop rectangle can still be edited by clicking on the handles or on the border of - the rectangle. Use the right mouse button to display the crop-menu again when the crop rectangle has the desired size. - - -

Lossless JPEG Transformations

- The JPEG compression scheme consists of multiple steps. Some of the steps are lossless, others are lossy. Because of the - lossy steps, each editing operation involving a recompression results in a (moderate) quality decrease. Lossless JPEG - transformations do not include any of the lossy compression steps and therefore should be prefered whenever possible. - However only a very limited number of operations can be done lossless on JPEG images: -
    -
  • - Rotation in steps of 90 degrees -
    • -
  • - Mirror horizontally and vertically -
    • -
  • - Crop -
    • -
- Note: Due to the structure of JPEG files, all these transformations only work if the width and height of the JPEG image is a multiple of the JPEG compression - block size. This block size is 8 or 16 pixels, depending on the chrominance subsampling used for the image. - -

Slide Shows

- JPEGView can display the content of the current folder (or folders if the navigation mode is set accordingly) as a slide show. - Alternatively a text file can be used to list the image files being part of a slide show. -

Slide Show Text File

- A text file containing file names can be passed on the command line to JPEGView. Alternatively such a file can be loaded - using the 'Open image' command. The following text file formats are supported: -
    -
  • ANSI coded text file
    • -
  • Unicode (UTF16) text file
    • -
  • UTF8 coded text file
    • -
- All text formats must contain one file name per line. The file names must use paths relative to the folder of the slide show - text file or absolute paths and must be terminated either with a hyphen ("), with a newline character or with a < character.
- The following examples show possible line formats:
- - d:\Images\test.jpg
- test.jpg
- "d:\My Documents\test.jpg"
- <image>d:\My Documents\test2.jpg</image>
- - Note that the parser searches for a path marker (looking for :\ or \\) and ignores all text before the first found - path marker. Starting from the path marker, the parser searches forward for an end marker (newline, " or <) and - everything after that end marker until end of line is also ignored.
- A slide show file list is a sort of virtual folder containing all images listed in the slide show file. - -

Using Slide Shows

- The following commands can be used to control a slide show: -
    -
  • - PgDn/PgUp/Home/End : Navigates to next/previous/first/last image of slide show -
    • -
  • - 1 .. 9 : Starts the slide show with a delay of n seconds between the images -
    • -
  • - Ctrl + [Shift] + 1 .. 9 : Uses a delay of n/10 of a second, respectively n/100 of a second -
    • -
  • - Esc : Stops the slide show -
    • -
- If the current context is a folder and not a slide show list, the slideshow is performed with the images - in the folder. The folder navigation mode and the sorting order are taken into account in this case - with - a slide show list they have no effect. For showing the images in a folder in random order, press 'z' before - starting the slide show (this sets random sorting order). -

Transition Effects

- Different transition effects can be used to switch between images when playing a slide show. - The use of transition effects has the following limitations: -
    -
  • - Transition effects are only available in full screen mode -
    • -
  • - When playing a slide show with transition effects, reaction on commands may be somewhat slow. - The ESC key always immediatly terminates the slide show. -
    • -
- Use the INI file to set the default transition effect and the default transition effect speed. - -

Playing Image Series as Movie

- The slide show feature can be used to play a series of images in a folder or given by a text file as a movie: -
    -
  • - First set the display order for the files. The order is either given by a text file or by choosing the - display order mode for folders accordingly. -
    • -
  • - Press the Home key to go to the first frame of the movie. -
    • -
  • - Start the movie using the context menu 'Play folder as movie' or the Ctrl+[Shift]+Number keys. - Of course the number of frames per seconds is limited by the computing power available to decode and process the frames. - JPEGView will never skip frames - if more - frames are requested than possible, the frames are displayed as fast as possible. During movie playing, high quality - resampling, contrast correction and local brightness correction are disabled to speed up processing. -
    • -
  • Keeping parameters between the frames is enabled during movie playing - corrections apply to the whole movie.
    • -
  • - To stop the movie, press the Esc key. -
    • -
- -

Processing Images

- JPEGView provides some basic image processing. Most image processing is done interactively on the fullscreen image what - allows to see the effect of the processing immediately. The processed image can be stored either by storing the - applied parameters in the parameter DB (the image remains untouched), by copying the processed image to the clipboard to - further process it with an external program or by saving the processed image to a JPEG file.
- The following image processing commands are supported: -
    -
  • - Contrast
    - Keyboard: Ctrl - +/-
    - Mouse: Use processing panel
    - Increases or decreases the global contrast of the image. Technically, the steepness - of an S-curve is changed by this parameter.
    - This value can be stored in the parameter DB. -
    • -
  • - Brightness
    - Keyboard: Shift - +/-
    - Mouse: Use processing panel
    - Increases or decreases the global brightness of the image. Technically, a exponent of - a gamma curve is changed by this parameter.
    - This value can be stored in the parameter DB. -
    • -
  • - Saturation
    - Keyboard: none
    - Mouse: Use processing panel
    - Increases or decreases the color saturation of the image.
    - This value can be stored in the parameter DB. -
    • -
  • - Downsampling Sharpness
    - Keyboard: Alt - +/-
    - Mouse: Use processing panel. Note that this slider is only visible when the window/screen is large enough.
    - Increases or decreases sharpness of the image. If the default sharpening filter is used, sharpness - only applies to images that are downsampled but not for images displayed with 100% zoom. The - filter to be used can be set in the INI file.
    - This value can be stored in the parameter DB. -
    • -
  • - Unsharp Mask
    - Keyboard: none
    - Mouse: Use processing panel, 'Unsharp Mask' button.
    - Unsharp masking is an adaptive sharpening filter that creates a smoothed version of the original image (thus the name 'unsharp'). - The filter then adds the difference of the original image and the smoothed image to the original image:
    - Sharpened Image = Original Image + Amount * ( Original Image - Smoothed Image)
    - The 'Radius' parameter sets the radius of the smoothing kernel, the 'Amount' parameter sets the amount of sharpening and the - 'Threshold' value sets the miminal difference of original and smoothed image to apply the filter to a pixel.
    - Note that unsharp masking is previewed always in 100 % zoom.
    - This value cannnot be stored in the parameter DB. The image must be saved ('Save image' in context menu) to retain the processing. -
    • -
  • - Free Rotate
    - Keyboard: none
    - Mouse: Use navigation panel, 'Free Rotate' button.
    - In preview mode the image can be rotated with the mouse in real time, but with low quality. Grid lines help performing horizon correction. - Alternatively, horizon correction can be done by drawing a line along the horizon or along a vertical structure. The rotation angle will be calculated so - that this line is exactly horizontal, respecitively vertical. - Activate this mode with the right most tool button on the panel.
    - Press the 'Apply' button to apply the rotation to the original image with high quality (bicubic interpolation). By default the - rotated image is cropped automatically to avoid black borders. This behavior can be changed with the middle tool button on the rotation panel.
    - This value can be stored in the parameter DB. -
    • -
  • - Perspective Correction
    - Keyboard: none
    - Mouse: Use navigation panel, 'Perspective Correction' button.
    - When a picture of a building is taken from ground level, the vertical edges of the building are usually tilted because the camera is not aligned - horizontally when taking the picture. Perspective correction can be used to correct for this effect - at least partially.
    - In preview mode the image can be tilted with the mouse in real time, but with low quality. Grid lines help during the process.
    - Press the 'Apply' button to apply the correction to the original image with high quality (bicubic interpolation). By default the - corrected image is cropped automatically to avoid black borders. This behavior can be changed with the right tool button on the panel.
    - This value cannnot be stored in the parameter DB. The image must be saved ('Save image' in context menu) to retain the processing. -
    • -
  • - Change Size
    - Keyboard: none
    - Mouse: Use context menu, 'Transform image > Change size...' menu item.
    - This will resize the image to the specified new size using one of the selectable filters. The 'Box' filter is just - repeating pixels (upsampling), respectively deleting pixels (downsampling). The other filters are higher order reconstruction filters - that balance between no aliasing and improved sharpness.
    - This value cannnot be stored in the parameter DB. The image must be saved ('Save image' in context menu) to retain the processing. -
    • -
  • - Color balance
    - Mouse: Use processing panel
    - Changes the color balance of the image by changing the cyan-red, magenta-green and yellow-blue - color balance.
    - This value can be stored in the parameter DB. -
    • -
  • - Local brightness
    - Keyboard: F6
    - Mouse: Use processing panel
    - Toggle local brightness correction. Local brightness correction lightens shadows and darkens - highlights by applying a smoothed additive/subtractive mask to the image. It can be used to correct images with - hard contrasts and uncovers details in dark shadows or in overexposed areas.
    - This value can be stored in the parameter DB. -
    • -
  • - Color and contrast correction
    - Keyboard: F5
    - Mouse: Use processing panel
    - Toggle color and contrast correction. Color correction tries to reduce global color casts. Contrast - correction enhances contrast by moving the black point of the image (darkest area) towards black and the white point - (brightest area) towards white. The color and contrast correction algorithm can be configured in the INI file.
    - This value can be stored in the parameter DB. -
    • -
  • - Landscape picture enhancement mode
    - Keyboard: Ctrl-L
    - Mouse: Use navigation panel
    - Toggle landscape picture enhancement mode. The landscape picture mode is simply a special parameter set optimized - for landscapes pictures. It will brighten shadows, darken highlights and enhance contrast when needed. The parameter - set used in landscape mode can be configured in the INI file (setting "LandscapeModeParams").
    - This value can be stored in the parameter DB. -
    • -
- Most image processing can be done interactively with the mouse on the processing panel that appears when the mouse - cursor is moved to the bottom of the screen.
- Default settings for most of the image processing parameters can be given in the INI file.
- Image Processing Tips
-
    -
  • - Clicking on the number on the right of the sliders will temporarily reset the value to the default value. The value remains reset - until the mouse button is released. -
    • -
  • Double clicking above a slider will permanently reset its value to the default value.
    • -
- -

Keeping Parameters Between Images

- By default, all image processing parameters (including zoom and pan) are reset to the default values given in the INI file - when the next image is displayed. Using the F4 key, the behavior can be changed to keeping the parameters between - images. Pressing F4 again will toggle back to not-keeping the parameters.
- Note: While keeping parameters mode is active, the parameter DB cannot be used. Parameter DB values are ignored while - this mode is active. - -

Comparing Processed Image with Original Image

- When JPEGView displays a new image, it creates a second set of image processing parameters and initializes it with zero, - meaning that the original, unprocessed image will be displayed when this set is applied. - Ctrl-A toggles between the two sets - allowing to compare the processed image with the original image. - Note that it is possible to change both sets of parameters - however the second set will always be reset to zero when - a new image is displayed. - -

Saving and Renaming Images

-

Saving Images

- Processed images can be saved as JPEG, BMP, PNG or TIFF files using the 'Save image' (Ctrl-S) command. - The image is saved in its original size: Performed rotations are taken into account, zoom and pan are not. - To save an image in screen size, use the Ctrl-Shift-S keyboard shortcut.
- Note: The quality of the saved JPEG file can be set in the INI file.
- JPEGView will automatically create a parameter DB entry for the saved image having - all image processing disabled. - This prevents that JPEGView will double-apply automatic image improvements next time the image is displayed.
- Note: When saving images, JPEGView will prompt for a new file name. If you want that Ctrl-S just overrides the - original file without showing a dialog, use the INI file setting OverrideOriginalFileWithoutSaveDialog=true.
- Use this setting with care, be aware of the risk!
- EXIF information
- EXIF information is copied to the target JPEG image if it was present in the source JPEG image. An embedded thumbnail image - is updated - rotation and image processing is applied to the thumbnail image.
- -

Renaming Images

- On the processing panel, images can be renamed by clicking on the file name with the mouse. To - confirm the new name, press Enter or click outside of the edit control. To cancel renaming, press Esc. - Note that renaming images is not possible when a slide show file is loaded because this would invalidate the slide show file. - -

Batch Rename/Copy

- Using the context menu entry 'Batch rename/copy' a series of files from the current folder can be renamed and/or copied to - another folder: -
    -
  1. - First select the files to be renamed. Use the Ctrl and Shift keys to select multiple files and click the checkboxes. -
    2. -
  2. - Enter the target file name pattern. When not using a backslash in the pattern, the files are renamed in the current - folder, else they are copied to the target folder as given. Target folders not yet existing are created as needed.
    - Several placeholders are supported. See some examples below. A template pattern can be saved when needed. -
    3. -
  3. Before really renaming the files, always verify the new names by pressing the 'Preview' button.
    4. -
  4. - To rename the selected files, press the 'Rename' button. Renaming/copying can take a while, especially when - the source or target is a slow USB device. -
    5. -
- Examples

- %pictures%\Digicam\%2y-%m-%M\%f
- Source image: IMG00244.JPG, created June 12, 2007
- Target: 'My pictures'\Digicam\07-06-June\IMG00244.JPG
- The folder 'Digicam\07-06-June\' is created when needed.

- %pictures%\Digicam\%M %y\Trip to Barcelona %x.%e
- Source image: IMG00244.JPG, created June 12, 2007
- Target: 'My pictures'\Digicam\June 2007\Trip to Barcelona 1.JPG
- -

Copying Images to the Clipboard

- Copy screen
- Keyboard: Ctrl-C
- Copies the image (respectively the visible image section) as displayed on the screen to the clipboard. This is similar to the - PrtSc function, however text overlays and areas outside of the image are not included.
- Copy processed image in its original size
- Keyboard: Ctrl-X
- Copies the processed image in its original size to the clipboard. Rotation is taken into account, zoom and pan is not. - This command is useful when the corrected image shall be processed and saved in an external application. -

Pasting Images from the Clipboard

- Keyboard: Ctrl-V
- Paste image from clipboard and fit to screen.
- For pasted images, storing the parameters to the parameter DB is not possible - because they have no representation on the file system. However these images can be processed and saved. -

- Tip: Ctrl-C also enables to paste the current image file to a new location in the Windows Explorer using Ctrl-V. - -

Printing Images

- Keyboard: Ctrl-P
- Some aspects of printing can be changed in the INI file: -
    -
  • - Default margins
    - Setting: PrintMargin
    - Sets the default print margin (all sides) in centimeters. - Notice that you cannot set this value below the physical margins as specified by the printer driver. -
    • -
  • - Default width of printed image
    - Setting: PrintWidth
    - Sets the default print width in centimeters. Use negative numbers to set the 'Fit to paper' printing mode. -
    • -
  • - Units in print dialog
    - Setting: Units
    - Sets the units (cm, inches) used in the print dialog. By default the units as specified by the operating system are used. - Set to 'metric' or 'english' to force using centimeters, respectively inches. -
    • -
- Notice that JPEGView uses the default printer as specified in the Windows printer configuration but allows changing the printer for - the time JPEGView is running. To change the default printer permanently, use the Windows printer configuration. - -

Parameter Database

- The currently visible section, rotation and the image processing parameters can be bound to the image by storing them to the - parameter DB. If this image is displayed in JPEGView later on, the stored parameters will be loaded and applied automatically. -
    -
  • - Add image to the parameter DB
    - Keyboard: S
    - Mouse: Use processing panel -
    • -
  • - Remove image from the parameter DB
    - Keyboard: D
    - Mouse: Use processing panel -
    • -
  • - Backup parameter DB
    - Use this command in the context menu to backup the parameter DB to another folder or disk. -
    • -
  • - Restore parameter DB
    - Use this command in the context menu to restore the parameter DB from a backuped version. - Note that when restoring the parameter DB, the selected DB is merged with the current DB - so this - command can also be used to merge two parameter DBs. In case of conflicting entries in the merge, - the system asks which entries shall have priority. -
    • -
- Using the parameter DB has the advantage that the original image remains untouched. The parameter DB entry for an - image is found using a hash value of the image file what has the following advantages: -
    -
  • Moving the image to a different folder or renaming the image does not break the link
    • -
  • Two copies of the same image have the same parameter DB entry
    • -
- For JPEG images, the hash value is created on the compressed pixel data but not on the EXIF and comment blocks. Changing - the EXIF data or commenting the JPEG image will not invalidate the parameter DB entry.
- The following parameters are stored in the parameter DB: -
    -
  • - Visible section of image
    - The visible section is stored resolution independent - the same section will be displayed on a monitor with a higher - resolution (but the zoom factor will be different then). -
    • -
  • Rotation of image
    • -
  • Contrast value
    • -
  • Brightness value
    • -
  • Saturation value
    • -
  • Sharpness value (but no Unsharp Mask)
    • -
  • Color balance values
    • -
  • Local brighness correction on/off
    • -
  • Lighten shadows value
    • -
  • Darken highlights value
    • -
  • Deep shadows value
    • -
  • Color and contrast correction on/off
    • -
  • Color correction amount
    • -
  • Contrast correction amount
    • -
  • High quality resizing on/off
    • -
- The parameter database is located in 'Users\Username\AppData\roaming\JPEGView\ParamDB.db', - respectively in the EXE path when StoreToEXEPath=true is set in the INI file. - It uses 40 bytes per stored parameter set and is limitated to 100000 entries.
- Note: The parameter DB settings have precedence over any image processing settings in the INI file. - -

JPEGView.ini File

- The INI file of JPEGView allows configuring a lot of parameters of the application. A two level hierarchy of INI files is - used. If a setting is found in the user INI file, it has precedence over the same setting in the global INI file. -
    -
  • - User INI file
    - 'Users\Username\AppData\roaming\JPEGView\JPEGView.ini' (path name depends on Windows version) -
    • -
  • - Global INI file
    - 'Path of JPEGView.exe\JPEGView.ini' -
    • -
- The user INI file can be edited by using the command 'Edit user settings' in the context menu. - Note that changes to these files do not take effect until JPEGView is restarted.
- Some parameters can be written to the user INI file with the command 'Save parameters to INI' located in the - context menu. -
    -
  • Default contrast
    • -
  • Default brightness
    • -
  • Default saturation
    • -
  • Default sharpness
    • -
  • Default color balance
    • -
  • Local brighness correction on/off by default
    • -
  • Color and contrast correction on/off by default
    • -
  • Default sorting order
    • -
  • Default auto zoom mode
    • -
  • Navigation panel on/off
    • -
- The values set for the current image are written to the INI file when using this command. Be - aware that these values are then used as default values for all images!

- Note: No user INI file is used if the key StoreToEXEPath is set - to true in the global INI file. All saved setting are directly written to the global INI file in this case. -

INI File Settings

- The INI file settings are explained in detail in the INI file (Caution: The link is to the global INI) itself. - Only an overview on the available settings is given here: -
    -
  • Default image processing parameters: Contrast, brightness, sharpness, color balance
    • -
  • Default background color
    • -
  • Show file name by default
    • -
  • Show file info by default
    • -
  • Show navigation panel by default
    • -
  • Blending factor for navigation panel
    • -
  • Keep parameters by default
    • -
  • Force CPU type (if autodetection fails)
    • -
  • Force number of CPU cores to be used
    • -
  • Used filter kernel for downsampling images
    • -
  • Default sorting order
    • -
  • Default navigation mode
    • -
  • Default auto zoom mode
    • -
  • Quality (and file size) of saved JPEG images
    • -
  • Monitor to use (for multi monitor systems)
    • -
  • Color and contrast correction settings
    • -
  • Folders to explicitely include/exclude from auto color and contrast correction
    • -
  • Local brighness correction settings
    • -
  • Folders to explicitely include/exclude from local brightness correction
    • -
  • Parameters used in landscape enhancement mode
    • -
  • - Definition of user commands -
    • -

- - A note on the support for multiple CPU cores (CPUCoresUsed setting):
- By default, JPEGView uses all cores of the CPU for processing images. To force JPEGView to use - a given number of parallel processing threads, use the CPUCoresUsed setting. - Note that no more than 4 cores (and therefore 4 processing threads) are supported. - One additional thread is always created to read ahead the next image - this cannot be suppressed by the INI file. - -

Command Line Parameters

- - JPEGView supports the following command line parameters: -
    -
  • - filename
    - File name of the file to load or folder to show. If this is a file name, it must be a valid - image file name or a file name of a text file that contains a list of files to display, listing one file name per line. - If it is a folder name, JPEGView displays the image files in this folder.
    - The file name must be specified before all other parameters in the command line.
    - Note: No slide show is started automatically. Use the /slideshow parameter for that. -
    • -
  • - /slideshow [time in seconds]
    - Automatically starts a slide show after startup. Example:
    - jpegview.exe myfilelist.txt /slideshow 3
    - Starts a slideshow of the files listed in "myfilelist.txt" with an interval of 3 seconds between the images. -
    • -
  • - /effect [effect]
    - Sets the transition effect for full screen slideshows. The parameter has no effect if not used in fullscreen mode.
    - Possible effects are: None, Blend, SlideLR, SlideRL, SlideTB, SlideBT, RollLR, RollRL, RollTB, RollBT, ScrollLR, ScrollRL, ScrollTB, ScrollBT
    - Example:
    - jpegview.exe myfilelist.txt /slideshow 3 /effect blend /fullscreen -
    • -
  • - /transitiontime [time in milliseconds]
    - Sets the transition time for the effect in full screen slideshows. Example:
    - jpegview.exe myfilelist.txt /slideshow 3 /effect blend /transitiontime 250 /fullscreen -
    • -
  • - /monitor [monitor index]
    - Sets the monitor to display JPEGView, overriding the INI file setting. 0 stands for the primary monitor, - any number bigger than 0 for the secondary monitor with the corresponding index. Example:
    - jpegview.exe "d:\pictures\jan 2013\" /slideshow 3 /fullscreen /monitor 1 -
    • -
  • - /autoexit
    - Terminates JPEGView automatically after having finished the slide show if combined with the /slideshow parameter.
    - Setting this parameter also changes the behavior of the ESC key: JPEGView terminates immediately when pressing the ESC key, - also while playing a slideshow or an animated GIF.
    - Note that WrapAroundFolder must be set to false in the INI file - otherwise the slideshow does not finish when the - end of the folder is reached. -
    -
    • -
  • - /fullscreen
    - Starts JPEGView in full screen mode, ignoring the INI file setting that is currently active. -
    -
    • -
  • - /order [mode]
    - Forces file ordering mode 'mode', ignoring the INI file setting that is currently active.
    - [mode] can be M, C, N or Z, for the file ordering modes 'M: modification date', 'C: creation date', 'N: file name', 'Z: random'
    - Example: jpegview.exe c:\pictures /slideshow 2 /order z /fullscreen
    - Shows a slideshow of the files in the folder "c:\pictures" using random ordering and an interval of 2 seconds, forcing full screen mode for the slide show. -
    • -
  • - /ini [ini file title]
    - Uses the INI file as specified. The file extension can be omitted, ".ini" is added when it is missing. - The file name must neither contain an absolute nor a relative path, nor space characters.
    - When the specified INI file contains the key StoreToEXEPath=true, it must be located in the EXE path and it must exist. - Otherwise, the INI file will be created in the user INI path (%appdata%/roaming/JPEGView/) when it does not exist and when it is used - the first time.
    - Example: jpegview.exe /ini AlternativeConfig
    - Uses an INI file named "AlternativeConfig.ini" in %appdata%/roaming/JPEGView/ -
    • -
- -

Keymap - Changing Keyboard and Mouse Shortcuts

- The mapping of keys to commands can be changed by editing the keymap file.
- Within the keymap file it is also possible to define additional keyboard shortcuts for command that are - not mapped by default. The keymap file also allows defining a command that gets executed when pressing one - of the mouse buttons. Be aware that by doing so, the default mouse button functionality will be disabled.
- When editing this file, make sure you follow the instructions mentioned in the keymap file itself. - -

Adding Support for Viewing Camera RAW Files to JPEGView

- JPEGView has built in support to view the JPEG images embedded in many camera RAW files. These embedded JPEGs often - have a smaller resolution than the RAW image itself but can be decoded and displayed very quickly.
- Support for viewing the full size camera RAW images is provided indirectly by using the Microsoft Camera Codec pack.
- This codec pack is only available for Windows Vista SP2 and Windows 7/8, but not for Windows XP!
- To add support for viewing full size camera RAW files: -
    -
  • - Download and install the Microsoft Camera Codec pack.
    - Check if your camera model is supported by the codec pack. -
    • -
  • - Add the extension(s) of the camera RAW files to be read by JPEGView to the user INI file, setting 'FilesProcessedByWIC'.
    - Context menu: Settings/Admin > Edit user settings...
    - Example for adding the extension "cr2", used by Canon cameras:
    - - FilesProcessedByWIC=*.wdp;*.mdp;*.hdp;*.cr2 - -
    • -
  • - Save the INI file and restart JPEGView. -
    • -
- Be warned that decoding the full size RAW images is much, much slower than just decoding the embedded JPEG! - -

Calling External Programs or Batch Files

- In the INI file, user commands can be defined. User command can call any external program or batch file and can be integrated into JPEGView using: -
    -
  • - Binding to a keyboard shortcut. -
    • -
  • - Binding to a menu item in the 'User Commands' submenu of the JPEGView context menu. -
    • -
- Refer to the INI file itself for a full description of the format and the features.
- JPEGView itself uses this mechanism to implement the following commands: -
    -
  • - Shift-Del : Delete the current image file permanently - calls the command processor (cmd.exe) to - delete the file. -
    • -
- Other commands can be added as needed, e.g. moving an image to a specific folder. - -

Opening Images with External Applications

- JPEGView supports opening the currently displayed image in an external application (e.g. GIMP) if the application supports passing a file - name on the command line (as most applications do).
- To define external applications, use the 'Settings/Admin' - 'Manage 'Open with' menu' dialog. - The defined applications are visible in the 'Open with' submenu of the JPEGView context menu. Binding an application to a keyboard shortcut is also possible. - -

Troubleshooting

- JPEGView crashes when displaying an image
- Maybe the CPU detection failed. Try to set the CPU type manually in the INI File (key 'CPUType'). Set this - key to 'Generic' - this is slower but should run on all CPUs.

- - The file type .JPG can not be assigned to JPEGView using the method described in the - installation section. JPEGView never appears in the list of programs for JPG files even - when it is added with 'Browse'. -
- Maybe JPEGView was moved to another folder while the file type was already registered to it. In this case Windows - loses the connection and this cannot be fixed with the Windows Explorer. Start regedit.exe and check the path in - 'HKEY_CLASSES_ROOT\Applications\JPEGView.exe\shell\open\command'. Correct the path if it points to an invalid location.

- - The language of the user interface is in English instead of 'Portuguese/French/whatever'
- Normally JPEGView selects the UI language automatically to match the operating system language. - This auto detection may has failed. To force a specific language, set the
- Language=language_code
- setting in the INI file to the desired language code. The supported codes are listed in the INI file.

- - The colors of images do not look the same compared to other viewers and to the Internet browser
- By default, JPEGView is not interpreting embedded color profiles in JPEG and TIFF images. You can force using these - color profiles by setting the following key to true in the INI file:
- UseEmbeddedColorProfiles=true
- Be aware the this slows down loading of JPEG images considerably (also when no color profile is embedded) - because it forces JPEGView to read the JPEG image with GDI+ instead of using the optimized TJPEG library. -

- - The image set as desktop wallpaper does not span all screens.
- In Windows 7 / 8 and later a desktop wallpaper image can span multiple screens. To create such a wallpaper, switch to fullscreen - mode (F11 key) and expand JPEGView to span all screens (F12 key). Then zoom in the image so that no black borders are visible on - any side of the screen and pan the image as desired. Finally select 'Set as desktop wallpaper' > 'Use processed image as displayed'. - -

License & Copyright

- Copyright © 2006-2017 David Kleiner

- This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, version 2. - The full text of the GPL can be found here.
- JPEGView is hosted by SourceForge. You can check for a new version, - get the source code or report a bug using the following URL:
- https://sourceforge.net/projects/jpegview/
- -
- JPEGView contains the following binary libraries:
- - Turbo JPEG, Copyright (C)2009-2011 D. R. Commander. All Rights Reserved.
- Turbo JPEG is based on libjpeg, © 1994-2010, Independent JPEG Group.
- - WebP codec provided by Google https://developers.google.com/speed/webp, © Google Inc.
-
- JPEGView includes or uses the following source code libraries:
- - Windows Template Library 8.1, Copyright © 2006 Microsoft Corporation
- - dcraw, © 1997-2011 by Dave Coffin
-
- Developed and compiled with Visual Studio 2010/2013 Professional -

- Thanks to:
-
    -
  • - Armel for testing, bug reporting and suggestions for improvements since the very first versions -
    • -
  • - Michi, Patrik and Michael for additional testing and ideas -
    • -
  • - Anonymous for integration of dcraw, for viewing JPEGs embedded in camera RAW -
    • -
  • - Franco Bianconi, Daniel Sánchez Vargas and Enrique Pineiro for the Spanish translation -
    • -
  • - winPenPack Team and Massimo Pietrolonardo for the Italian translation -
    • -
  • - Adil Tiadi and Fabrice for the French translation -
    • -
  • - Anonymous for the Korean translation -
    • -
  • - Silviu Laurentiu for the Romanian translation -
    • -
  • - Dmitry Yerokhin for the Russian translation -
    • -
  • - Åke Engelbrektson for the Swedish translation -
    • -
  • - Carpegieri Torezan for the Portuguese (Brasilian) translation -
    • -
  • - Milos Koutny for the Czech translation -
    • -
  • - Paris Setos for the Greek translation -
    • -
  • - Sérgio Marques for the Portuguese translation -
    • -
  • - Xabier Aramendi for the Basque translation -
    • -
  • - Yia Guo and 风逸兰 for the Chinese translations -
    • -
  • - Uladzimir Panada for the Belarusan translation -
    • -
  • - Володимир for the Ukrainian translation -
    • -
  • - Hiroyuki Matenokoji for the Japanese translation -
    • -
  • - Damian for the Polish translation -
    • -
-
-
- - - - \ No newline at end of file