From 0f2bb6479b09bf0c6c537bdd67654c6c4b6b011c Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 5 Apr 2018 19:08:40 +1000 Subject: Backed out changeset: 7402342dc7a3 Caching client rectangle on EditView. This change was not compatible with Cocoa as it uses document-based coordinates rather than view-based. --- src/ScintillaBase.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ScintillaBase.cxx') diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index da569d490..febc4f11f 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -261,7 +261,7 @@ void ScintillaBase::AutoCompleteStart(Sci::Position lenEntered, const char *list ac.Start(wMain, idAutoComplete, sel.MainCaret(), PointMainCaret(), lenEntered, vs.lineHeight, IsUnicodeMode(), technology); - const PRectangle rcClient = view.ViewRectangle(); + const PRectangle rcClient = GetClientRectangle(); Point pt = LocationFromPosition(sel.MainCaret() - lenEntered); PRectangle rcPopupBounds = wMain.GetMonitorRect(pt); if (rcPopupBounds.Height() == 0) @@ -477,7 +477,7 @@ void ScintillaBase::CallTipShow(Point pt, const char *defn) { wMain); // If the call-tip window would be out of the client // space - const PRectangle rcClient = view.ViewRectangle(); + const PRectangle rcClient = GetClientRectangle(); const int offset = vs.lineHeight + static_cast(rc.Height()); // adjust so it displays above the text. if (rc.bottom > rcClient.bottom && rc.Height() < rcClient.Height()) { -- cgit v1.2.3