diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2021-08-27 15:56:38 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2021-08-27 15:56:38 +1000 |
| commit | 1033917f37d01f2b826a16b4e71ba6a6fd9ef00e (patch) | |
| tree | acec21d605a895d9b3753891ebf114bd432052f6 | |
| parent | 6a4ba450a78154a10360a43b6f36cb2c11d1c955 (diff) | |
| download | scintilla-mirror-1033917f37d01f2b826a16b4e71ba6a6fd9ef00e.tar.gz | |
Bug [#2271] Fix disabling horizontal scrollbar in non-wrapping mode.
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 2 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 242cd4162..91bc55987 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -1964,7 +1964,7 @@ bool ScintillaCocoa::SetScrollingSize(void) { CGFloat docWidth = scrollWidth; bool showHorizontalScroll = horizontalScrollBarVisible && !Wrapping(); - if (!showHorizontalScroll) + if (Wrapping()) docWidth = clipRect.size.width; NSRect contentRect = {{0, 0}, {docWidth, docHeight}}; NSRect contentRectNow = inner.frame; diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 98251fde9..0ae2e9b42 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -601,6 +601,10 @@ <a href="https://sourceforge.net/p/scintilla/bugs/2268/">Bug #2268</a>. </li> <li> + On Cocoa, fix disabling horizontal scrollbar in non-wrapping mode. + <a href="https://sourceforge.net/p/scintilla/bugs/2271/">Bug #2271</a>. + </li> + <li> On Cocoa, ensure cursor and background images are loaded. </li> </ul> |