Skip to content

Preserve view state when switching color spaces #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justnullname merged 2 commits into from
Mar 31, 2026
Merged

Preserve view state when switching color spaces #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1f40e8
Fix: Preserve zoom and pan states when switching color spaces or RAW …
justnullname Mar 27, 2026
07e3998
Fix: Bypass AdjustWindowToImage on Color Space switch
justnullname Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions QuickView/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ static EditState g_editState;
AppConfig g_config;
RuntimeConfig g_runtime;
ViewState g_viewState; // Non-static for extern access from UIRenderer
bool g_preserveViewStateOnNextLoad = false;
ViewState g_preservedViewState;
static int g_renderExifOrientation = 1; // Exif orientation baked into the bitmap surface
FileNavigator g_navigator; // New Navigator (Non-static for extern access from SettingsOverlay)
static ThumbnailManager g_thumbMgr;
Expand Down Expand Up @@ -8586,6 +8588,8 @@ SKIP_EDGE_NAV:;
g_imageEngine->UpdateConfig(g_runtime); // [Fix] Push config to engine
g_imageEngine->SetForceRefresh(true);
}
g_preservedViewState = g_viewState;
g_preserveViewStateOnNextLoad = true;
ReleaseImageResources();
LoadImageAsync(hwnd, contextPath.c_str());
}
Expand Down Expand Up @@ -8613,6 +8617,8 @@ SKIP_EDGE_NAV:;
g_imageEngine->UpdateConfig(g_runtime);
g_imageEngine->SetForceRefresh(true);
}
g_preservedViewState = g_viewState;
g_preserveViewStateOnNextLoad = true;
ReleaseImageResources();
LoadImageAsync(hwnd, g_imagePath, false, QuickView::BrowseDirection::IDLE);
}
Expand Down Expand Up @@ -9204,11 +9210,20 @@ void ProcessEngineEvents(HWND hwnd) {

// [Fix] Update Window Size AFTER RenderImageToDComp
// This ensures g_lastSurfaceSize is updated with the NEW image dimensions.
AdjustWindowToImage(hwnd);

// [Feature] Apply Fullscreen Zoom Mode if active
if (g_isFullScreen || IsZoomed(hwnd)) {
ApplyFullScreenZoomMode(hwnd);
// If we are preserving view state (e.g., Color Space switch), we DO NOT resize the window
// and we bypass the Fullscreen zoom mode reset, ensuring exact visual continuity.
if (g_preserveViewStateOnNextLoad) {
g_viewState.Zoom = g_preservedViewState.Zoom;
g_viewState.PanX = g_preservedViewState.PanX;
g_viewState.PanY = g_preservedViewState.PanY;
g_preserveViewStateOnNextLoad = false; // Consume it
} else {
AdjustWindowToImage(hwnd);

// [Feature] Apply Fullscreen Zoom Mode if active
if (g_isFullScreen || IsZoomed(hwnd)) {
ApplyFullScreenZoomMode(hwnd);
}
}

// [Fix] Explicitly Sync DComp State immediately after Window Adjustment
Expand Down