CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #648 from RaiKoHoff/Dev_0906

Browse Source 
Add missing notification on Ctrl+Mouse-Wheel zooming
This commit is contained in:
Rainer Kottenhoff 2018-09-06 14:54:23 +02:00 committed by GitHub
commit 91fcfb110b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scintilla/win32/ScintillaWin.cxx
View File

@ -946,7 +946,7 @@ sptr_t ScintillaWin::WndPaint(uptr_t wParam) {
PAINTSTRUCT *pps;
const bool IsOcxCtrl = (wParam != 0); // if wParam != 0, it contains
// a PAINTSTRUCT* from the OCX
// a PAINTSTRUCT* from the OCX
// Removed since this interferes with reporting other assertions as it occurs repeatedly
//PLATFORM_ASSERT(hRgnUpdate == nullptr);
hRgnUpdate = ::CreateRectRgn(0, 0, 0, 0);
@ -1463,6 +1463,8 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
} else {
KeyCommand(SCI_ZOOMOUT);
}
// send to main window too !
::DefWindowProc(MainHWND(), iMessage, wParam, lParam);
} else {
// Scroll
ScrollTo(topLine + linesToScroll);

4
src/Notepad3.c
View File

@ -1500,6 +1500,10 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
return MsgSysCommand(hwnd, umsg, wParam, lParam);
break;
case WM_MOUSEWHEEL:
if (wParam & MK_CONTROL) { EditShowZoomCallTip(g_hwndEdit); }
break;
default:
if (umsg == msgTaskbarCreated) {
if (!IsWindowVisible(hwnd)) { ShowNotifyIcon(hwnd, true); }