Viewer: exit full screen with Esc (#82)

Author: chammoru

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to Q1View are documented here. Releases follow [semantic ver
 ## [Unreleased]
 
 ### Changed
+- Viewer: pressing `Esc` now exits full-screen mode and returns to the previous normal window state, even when focus is in the thumbnail drawer or another Viewer child control. `Return` still toggles full screen. (issue #82)
 - Viewer: the thumbnail drawer now always starts closed, so every launch looks like the classic Viewer and the drawer appears only when you open it (the `E` shortcut). Its width is still remembered, so it reopens at the size you last used; only the open/closed state is no longer persisted.
 - Viewer: when the thumbnail drawer has focus, `PgUp`/`PgDn` now step the selection to the previous/next file (matching the main view's file navigation) instead of scrolling by a page — in the gallery grid the page was the whole list, so they had simply duplicated `Home`/`End`. They move the selection only (arrow keys still browse folders; `Enter`/double-click still opens), while `Home`/`End` continue to jump to the first/last item. (issue #84)
 

QVisionCore/QViewerShortcuts.h

@@ -41,13 +41,14 @@ static const Q1ViewShortcutRow Q1VIEW_SHORTCUTS[] = {
 	{ "Ctrl + O",     "Open an image",                                Q1VIEW_FE_QT  },
 	{ "Mouse Wheel",  "Zoom in or out; high zoom shows pixel values", Q1VIEW_FE_ALL },
 	{ "Left Drag",    "Pan the image",                                Q1VIEW_FE_QT  },
-	{ "Return",       "Full screen",                                  Q1VIEW_FE_ALL },
+	{ "Return",       "Enter or exit full screen",                    Q1VIEW_FE_ALL },
 	{ "H",            "Toggle hex pixel values",                      Q1VIEW_FE_ALL },
 	{ "Y",            "Toggle Y-only view",                           Q1VIEW_FE_ALL },
 	{ "V",            "Toggle RGB/source YUV pixel values",           Q1VIEW_FE_ALL },
 	{ "R",            "Rotate 90 degrees clockwise",                  Q1VIEW_FE_ALL },
 	{ "Page Up/Down", "Previous or next file",                        Q1VIEW_FE_ALL },
 	{ "S",            "Selection capture mode",                       Q1VIEW_FE_ALL },
+	{ "Esc",          "Exit full screen",                             Q1VIEW_FE_MFC },
 	{ "Esc",          "Clear selection",                              Q1VIEW_FE_QT  },
 	{ "Ctrl + C",     "Capture view or selected region",             Q1VIEW_FE_ALL },
 	{ "Ctrl + V",     "Paste image from clipboard",                   Q1VIEW_FE_ALL },

Viewer/MainFrm.cpp

@@ -501,6 +501,19 @@ BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 	return TRUE;
 }
 
+BOOL CMainFrame::PreTranslateMessage(MSG *pMsg)
+{
+	if (pMsg != NULL && pMsg->message == WM_KEYDOWN && pMsg->wParam == VK_ESCAPE) {
+		CViewerView *pView = DYNAMIC_DOWNCAST(CViewerView, GetActiveView());
+		if (pView != NULL && pView->IsFullScreen()) {
+			pView->ToggleFullScreen();
+			return TRUE;
+		}
+	}
+
+	return CFrameWnd::PreTranslateMessage(pMsg);
+}
+
 void CMainFrame::OnUpdateFrameTitle(BOOL bAddToTitle)
 {
 	if ((GetStyle() & FWS_ADDTOTITLE) == 0)
@@ -1175,7 +1188,11 @@ void CMainFrame::UpdateMagnication(float n, int wDst, int hDst)
 	CString str;
 	str.Format(_T("%dx%d (%.2fx)"), wDst, hDst, n);
 
-	GetMenu()->ModifyMenu(ID_MAGNIFY, MF_BYCOMMAND | MF_RIGHTJUSTIFY | MF_GRAYED, ID_MAGNIFY, str);
+	CMenu *pMenu = GetMenu();
+	if (pMenu == NULL)
+		return;
+
+	pMenu->ModifyMenu(ID_MAGNIFY, MF_BYCOMMAND | MF_RIGHTJUSTIFY | MF_GRAYED, ID_MAGNIFY, str);
 
 	// While the drawer slides or the divider is dragged, the image refits every
 	// frame; DrawMenuBar repaints the whole (non-buffered) menu bar each time, which

Viewer/MainFrm.h

@@ -165,6 +165,7 @@ class CMainFrame : public CFrameWnd
 // Overrides
 public:
 	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual BOOL PreTranslateMessage(MSG *pMsg);
 	virtual void OnUpdateFrameTitle(BOOL bAddToTitle);
 	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
 

Viewer/ViewerView.cpp

@@ -21,6 +21,9 @@
 #include "Q1ViewVersion.h"
 
 #include <cmath>
+#include <dwmapi.h>
+
+#pragma comment(lib, "dwmapi.lib")
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -38,6 +41,9 @@ const bool printPlaySpeed = false;
 
 #define WM_VIEWER_PLAY_TIMER (WM_APP + 1)
 
+static const UINT_PTR VIEWER_FULLSCREEN_DWM_TIMER = 0x5100;
+static const UINT VIEWER_FULLSCREEN_DWM_DELAY_MS = 250;
+
 enum QMouseMenuID
 {
 	QMouseMenuStart = 0x10000000,
@@ -72,6 +78,7 @@ BEGIN_MESSAGE_MAP(CViewerView, CView)
 	ON_WM_DESTROY()
 	ON_WM_CREATE()
 	ON_WM_SIZE()
+	ON_WM_TIMER()
 	ON_WM_SETCURSOR()
 	ON_WM_RBUTTONUP()
 	ON_MESSAGE(WM_VIEWER_PLAY_TIMER, CViewerView::OnPlayTimer)
@@ -120,7 +127,7 @@ CViewerView::CViewerView()
 , mFullMode(false)
 , mShowCoord(false)
 , mShowBoxInfo(true)
-, mWasZoomed(false)
+, mHavePreFullPlacement(false)
 , mHexMode(false)
 , mShowSourceYuv(true)
 , mRgbHex(_T("%02X\n%02X\n%02X"))
@@ -129,6 +136,9 @@ CViewerView::CViewerView()
 , mNewSel(false)
 , mDeltaIdx(-1)
 {
+	::ZeroMemory(&mPreFullPlacement, sizeof(mPreFullPlacement));
+	mPreFullPlacement.length = sizeof(mPreFullPlacement);
+
 	LOGFONT lf;
 
 	::ZeroMemory(&lf, sizeof(lf));
@@ -262,11 +272,16 @@ void CViewerView::AdjustWindowSize()
 
 void CViewerView::FitToWindow()
 {
-	// The frame size is unchanged, so OnSize did not run; refresh the canvas
-	// extent from the current client size in case Initialize() toggled the
-	// per-frame progress bar for the newly loaded source.
+	CRect rcClient;
+	GetClientRect(&rcClient);
+	mWClient = rcClient.Width();
+	mHClient = rcClient.Height();
+
+	// Refresh the canvas extent from the actual client size. During frame style
+	// changes OnSize can arrive after the first repaint, so do not rely on the
+	// cached size when fitting a full-screen transition.
 	mWCanvas = mWClient;
-	mHCanvas = mHClient - mHProgress;
+	mHCanvas = max(0, mHClient - mHProgress);
 
 	// Scale the freshly loaded image so the whole image is visible in the
 	// current viewport, without touching the frame size. Mirroring common
@@ -1696,32 +1711,69 @@ void CViewerView::ToggleFullScreen()
 {
 	// In this SDI app the view's parent is CMainFrame.
 	CMainFrame *pMainFrm = static_cast<CMainFrame *>(AfxGetMainWnd());
-	mFullMode = !mFullMode;
-
-	if (mFullMode) {
-		pMainFrm->SetMenu(NULL);
-		if (pMainFrm->IsZoomed()) {
-			pMainFrm->SendMessage(WM_SYSCOMMAND, SC_RESTORE,
-				(LPARAM)pMainFrm->GetSafeHwnd());
-			mWasZoomed = true;
+	if (pMainFrm == NULL)
+		return;
+
+	const bool entering = !mFullMode;
+	pMainFrm->SetRedraw(FALSE);
+	SetRedraw(FALSE);
+	::LockWindowUpdate(pMainFrm->GetSafeHwnd());
+	KillTimer(VIEWER_FULLSCREEN_DWM_TIMER);
+	BOOL disableDwmTransitions = TRUE;
+	::DwmSetWindowAttribute(pMainFrm->GetSafeHwnd(),
+		DWMWA_TRANSITIONS_FORCEDISABLED,
+		&disableDwmTransitions,
+		sizeof(disableDwmTransitions));
+
+	if (entering) {
+		mPreFullPlacement.length = sizeof(mPreFullPlacement);
+		mHavePreFullPlacement = pMainFrm->GetWindowPlacement(&mPreFullPlacement) != FALSE;
+		if (mPreFullPlacement.showCmd == SW_SHOWMINIMIZED)
+			mPreFullPlacement.showCmd = SW_SHOWNORMAL;
+
+		mFullMode = true;
+
+		MONITORINFO mi = {};
+		mi.cbSize = sizeof(mi);
+		HMONITOR hmon = ::MonitorFromWindow(pMainFrm->GetSafeHwnd(), MONITOR_DEFAULTTONEAREST);
+		if (::GetMonitorInfo(hmon, &mi)) {
+			CRect rc(mi.rcMonitor);
+			pMainFrm->SetMenu(NULL);
+			pMainFrm->ModifyStyle(
+				WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX,
+				WS_POPUP, 0);
+			pMainFrm->SetWindowPos(&CWnd::wndTop, rc.left, rc.top,
+				rc.Width(), rc.Height(),
+				SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOREDRAW);
 		}
-		pMainFrm->ModifyStyle(WS_CAPTION | WS_SYSMENU, WS_POPUP, SWP_FRAMECHANGED);
-		pMainFrm->SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE,
-			(LPARAM)pMainFrm->GetSafeHwnd());
 	} else {
+		mFullMode = false;
 		HMENU hMenu = ::LoadMenu(theApp.m_hInstance, MAKEINTRESOURCE(IDR_MAINFRAME));
 		::SetMenu(pMainFrm->GetSafeHwnd(), hMenu);
-		pMainFrm->ModifyStyle(WS_POPUP, WS_CAPTION | WS_SYSMENU, SWP_FRAMECHANGED);
+		pMainFrm->ModifyStyle(WS_POPUP,
+			WS_OVERLAPPED | WS_CAPTION | FWS_ADDTOTITLE |
+			WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU | WS_THICKFRAME,
+			0);
 		pMainFrm->AddMainMenu();
 		GetDocument()->UpdateMenu();
-		pMainFrm->SendMessage(WM_SYSCOMMAND, SC_RESTORE,
-			(LPARAM)pMainFrm->GetSafeHwnd());
-		if (mWasZoomed) {
-			pMainFrm->SendMessage(WM_SYSCOMMAND, SC_MAXIMIZE,
-				(LPARAM)pMainFrm->GetSafeHwnd());
-			mWasZoomed = false;
-		}
+		if (mHavePreFullPlacement)
+			pMainFrm->SetWindowPlacement(&mPreFullPlacement);
+		else
+			pMainFrm->ShowWindow(SW_RESTORE);
+		pMainFrm->SetWindowPos(NULL, 0, 0, 0, 0,
+			SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
+			SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOREDRAW);
 	}
+
+	pMainFrm->RecalcLayout(TRUE);
+	FitToWindow();
+	pMainFrm->SetRedraw(TRUE);
+	SetRedraw(TRUE);
+	::LockWindowUpdate(NULL);
+	pMainFrm->SetForegroundWindow();
+	pMainFrm->RedrawWindow(NULL, NULL,
+		RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_FRAME | RDW_ERASE);
+	SetTimer(VIEWER_FULLSCREEN_DWM_TIMER, VIEWER_FULLSCREEN_DWM_DELAY_MS, NULL);
 }
 
 void CViewerView::ToggleHelp()
@@ -2049,6 +2101,16 @@ void CViewerView::OnDestroy()
 {
 	CView::OnDestroy();
 
+	KillTimer(VIEWER_FULLSCREEN_DWM_TIMER);
+	CMainFrame *pMainFrm = static_cast<CMainFrame *>(AfxGetMainWnd());
+	if (pMainFrm != NULL) {
+		BOOL disableDwmTransitions = FALSE;
+		::DwmSetWindowAttribute(pMainFrm->GetSafeHwnd(),
+			DWMWA_TRANSITIONS_FORCEDISABLED,
+			&disableDwmTransitions,
+			sizeof(disableDwmTransitions));
+	}
+
 	mBufferPool->disable();
 	mBufferQueue->destroy();
 	KillPlayTimer();
@@ -2090,6 +2152,24 @@ void CViewerView::OnSize(UINT nType, int cx, int cy)
 	mRcProgress.SetRect(0, mHCanvas, mWClient, mHClient);
 }
 
+void CViewerView::OnTimer(UINT_PTR nIDEvent)
+{
+	if (nIDEvent == VIEWER_FULLSCREEN_DWM_TIMER) {
+		KillTimer(VIEWER_FULLSCREEN_DWM_TIMER);
+		CMainFrame *pMainFrm = static_cast<CMainFrame *>(AfxGetMainWnd());
+		if (pMainFrm != NULL) {
+			BOOL disableDwmTransitions = FALSE;
+			::DwmSetWindowAttribute(pMainFrm->GetSafeHwnd(),
+				DWMWA_TRANSITIONS_FORCEDISABLED,
+				&disableDwmTransitions,
+				sizeof(disableDwmTransitions));
+		}
+		return;
+	}
+
+	CView::OnTimer(nIDEvent);
+}
+
 void CViewerView::OnRButtonUp(UINT nFlags, CPoint point)
 {
 	if ((!mRcVolume.IsRectEmpty() && mRcVolume.PtInRect(point)) ||

Viewer/ViewerView.h

@@ -166,7 +166,8 @@ class CViewerView : public CView
 	bool mFullMode;
 	bool mShowCoord;
 	bool mShowBoxInfo;
-	bool mWasZoomed;
+	bool mHavePreFullPlacement;
+	WINDOWPLACEMENT mPreFullPlacement;
 	bool mHexMode;
 	bool mShowSourceYuv;
 	const CString mRgbHex;
@@ -198,6 +199,7 @@ class CViewerView : public CView
 	void ChangeZoom(short zDelta, CPoint &pt);
 	cv::Mat CreateRoiMat(int x0, int y0, int w, int h);
 	void ToggleFullScreen();
+	bool IsFullScreen() const { return mFullMode; }
 	void DrawPixelText(CDC *pDC, q1::GridInfo &gi);
 	void DrawPixelValueMode(CDC *pDC);
 	void ToggleHelp();
@@ -254,6 +256,7 @@ class CViewerView : public CView
 	afx_msg void OnDestroy();
 	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 	afx_msg void OnRButtonUp(UINT nFlags, CPoint point);
 	afx_msg LRESULT OnPlayTimer(WPARAM wParam, LPARAM lParam);
 };

docs/USER_GUIDE.md

@@ -46,7 +46,8 @@ Viewer includes a built-in control panel, opened with `?`.
 | Toggle thumbnail browser (drawer) | `E` |
 | Paste image from clipboard | `Ctrl+V` |
 | Zoom | Mouse wheel |
-| Full screen | `Return` |
+| Enter or exit full screen | `Return` |
+| Exit full screen | `Esc` |
 | Play or pause video | `Space` |
 | Previous or next frame | Left / Right |
 | First or last frame | Home / End |