diff options
| author | nyamatongwe <unknown> | 2012-02-10 20:52:02 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2012-02-10 20:52:02 +1100 |
| commit | 924742e901072eeb552a51e5dab916d9fa245e67 (patch) | |
| tree | 0ca00e30710e935e55d2f9953466d65a8332ed5e | |
| parent | c44a9aea060348b8e279acec0c10252c164187bd (diff) | |
| download | scintilla-mirror-924742e901072eeb552a51e5dab916d9fa245e67.tar.gz | |
Bug #3484416. Modify how scroll bars are hidden in order not to
interfere with dwelling. From Marko Njezic.
| -rw-r--r-- | win32/ScintillaWin.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 92dd32ffc..e7236024e 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1348,13 +1348,11 @@ bool ScintillaWin::ModifyScrollBars(int nMax, int nPage) { GetScrollInfo(SB_VERT, &sci); int vertEndPreferred = nMax; if (!verticalScrollBarVisible) - vertEndPreferred = 0; + nPage = vertEndPreferred + 1; if ((sci.nMin != 0) || (sci.nMax != vertEndPreferred) || (sci.nPage != static_cast<unsigned int>(nPage)) || (sci.nPos != 0)) { - //Platform::DebugPrintf("Scroll info changed %d %d %d %d %d\n", - // sci.nMin, sci.nMax, sci.nPage, sci.nPos, sci.nTrackPos); sci.fMask = SIF_PAGE | SIF_RANGE; sci.nMin = 0; sci.nMax = vertEndPreferred; @@ -1369,9 +1367,9 @@ bool ScintillaWin::ModifyScrollBars(int nMax, int nPage) { int horizEndPreferred = scrollWidth; if (horizEndPreferred < 0) horizEndPreferred = 0; - if (!horizontalScrollBarVisible || (wrapState != eWrapNone)) - horizEndPreferred = 0; unsigned int pageWidth = rcText.Width(); + if (!horizontalScrollBarVisible || (wrapState != eWrapNone)) + pageWidth = horizEndPreferred + 1; sci.fMask = SIF_PAGE | SIF_RANGE; GetScrollInfo(SB_HORZ, &sci); if ((sci.nMin != 0) || |