From bc7078eaf3037d64e3aa667c6df667bb4f071357 Mon Sep 17 00:00:00 2001 From: Benedikt Freisen Date: Wed, 24 May 2017 19:31:43 +0000 Subject: [PATCH] [MSPAINT] - Determine and adapt to actual status bar height instead of assuming a fixed height. This improves theme support. svn path=/trunk/; revision=74642 --- reactos/base/applications/mspaint/winproc.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/reactos/base/applications/mspaint/winproc.cpp b/reactos/base/applications/mspaint/winproc.cpp index 2e2ab6349a3..e35f93e3901 100644 --- a/reactos/base/applications/mspaint/winproc.cpp +++ b/reactos/base/applications/mspaint/winproc.cpp @@ -66,7 +66,13 @@ void CMainWindow::alignChildrenToMainWindow() h = clientRect.bottom - 3; } - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - 23 : h, TRUE); + RECT statusBarRect0; + SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); + int statusBarBorders[3]; + SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; + + scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); }