From fe58401893de2ad59e2dfabd50ab0bda3ae657b7 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Mon, 3 Sep 2007 03:49:23 +0000 Subject: [PATCH] - scroll window with ScrollWindowEx - fix a bug in GuiConsoleWndProc - scrolling does not work yet svn path=/trunk/; revision=28798 --- .../win32/csrss/win32csr/guiconsole.c | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c index 8cd99c5430c..3b8486fb626 100644 --- a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c +++ b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c @@ -1745,7 +1745,7 @@ GuiApplyUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PConsole static LRESULT -GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) +GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam, PGUI_CONSOLE_DATA GuiData) { SCROLLINFO sInfo; int old_pos; @@ -1793,10 +1793,6 @@ GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) sInfo.nPos = sInfo.nMax; break; - break; - - - default: break; } @@ -1825,8 +1821,16 @@ GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) /// fixme scroll window /// - // ScrollWindow - //UpdateWindow(hwnd); + ScrollWindowEx(hwnd, + 0, + GuiData->CharHeight * (old_pos - sInfo.nPos), + NULL, + NULL, + NULL, + NULL, + SW_INVALIDATE); + + UpdateWindow(hwnd); } return 0; } @@ -1881,7 +1885,7 @@ GuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_HSCROLL: case WM_VSCROLL: - Result = GuiConsoleHandleScroll(hWnd, msg, wParam); + Result = GuiConsoleHandleScroll(hWnd, msg, wParam, GuiData); break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam);