summaryrefslogtreecommitdiffstats
path: root/scintilla/src/EditView.cxx
diff options
context:
space:
mode:
authorXhmikosR <xhmikosr@gmail.com>2015-04-16 09:19:34 +0300
committerXhmikosR <xhmikosr@gmail.com>2015-04-17 22:30:47 +0300
commit3194c494fc903bada6217bbea92147690e56adbb (patch)
tree6a49b444a26bb8a531bdc4be307291a168c7ec82 /scintilla/src/EditView.cxx
parent15a383653ec284b297e0f44d74e97e0fbc0a0024 (diff)
downloadnotepad2-mod-3194c494fc903bada6217bbea92147690e56adbb.zip
notepad2-mod-3194c494fc903bada6217bbea92147690e56adbb.tar.gz
notepad2-mod-3194c494fc903bada6217bbea92147690e56adbb.tar.bz2
Update Scintilla to v3.5.5.4.2.25.953
Diffstat (limited to 'scintilla/src/EditView.cxx')
-rw-r--r--scintilla/src/EditView.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx
index 9d940f7..5372e3a 100644
--- a/scintilla/src/EditView.cxx
+++ b/scintilla/src/EditView.cxx
@@ -173,6 +173,7 @@ const XYPOSITION epsilon = 0.0001f; // A small nudge to avoid floating point pre
EditView::EditView() {
ldTabstops = NULL;
+ tabWidthMinimumPixels = 2; // needed for calculating tab stops for fractional proportional fonts
hideSelection = false;
drawOverstrikeCaret = true;
bufferedDraw = true;
@@ -220,10 +221,10 @@ void EditView::ClearAllTabstops() {
}
XYPOSITION EditView::NextTabstopPos(int line, XYPOSITION x, XYPOSITION tabWidth) const {
- int next = GetNextTabstop(line, static_cast<int>(x + 2));
+ int next = GetNextTabstop(line, static_cast<int>(x + tabWidthMinimumPixels));
if (next > 0)
return static_cast<XYPOSITION>(next);
- return (static_cast<int>((x + 2) / tabWidth) + 1) * tabWidth;
+ return (static_cast<int>((x + tabWidthMinimumPixels) / tabWidth) + 1) * tabWidth;
}
bool EditView::ClearTabstops(int line) {