diff options
| author | Neil <devnull@localhost> | 2015-04-14 10:07:12 +1000 |
|---|---|---|
| committer | Neil <devnull@localhost> | 2015-04-14 10:07:12 +1000 |
| commit | 9eb20293474d61ab5ba1f83472013bff1f0e248c (patch) | |
| tree | f298622ae4d7a7f551bd108e4626bd97f1843e05 | |
| parent | d0b7fcbb956615f3da6ea2c759467986f4a1c44b (diff) | |
| download | scintilla-mirror-9eb20293474d61ab5ba1f83472013bff1f0e248c.tar.gz | |
Ensure SCI_TEXTHEIGHT uses valid style data and remove test pauses that
hid this.
| -rw-r--r-- | src/Editor.cxx | 1 | ||||
| -rw-r--r-- | test/simpleTests.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index 2f2458861..77d9ce5e7 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -6227,6 +6227,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return TextWidth(static_cast<int>(wParam), CharPtrFromSPtr(lParam)); case SCI_TEXTHEIGHT: + RefreshStyleData(); return vs.lineHeight; case SCI_SETENDATLASTLINE: diff --git a/test/simpleTests.py b/test/simpleTests.py index 590d288b8..4e8462c71 100644 --- a/test/simpleTests.py +++ b/test/simpleTests.py @@ -139,7 +139,6 @@ class TestSimple(unittest.TestCase): data = b"x" * 70 + b"\n" for i in range(5): self.ed.AddText(len(data), data) - self.xite.DoEvents() self.assertEquals(self.ed.LineCount, i + 2) self.assert_(self.ed.Length > 0) @@ -1169,8 +1168,6 @@ class TestTextMargin(unittest.TestCase): self.assertEquals(self.ed.ExtraAscent, 1) self.ed.ExtraDescent = 2 self.assertEquals(self.ed.ExtraDescent, 2) - # Allow line height to recalculate - self.xite.DoEvents() lineHeightIncreased = self.ed.TextHeight(0) self.assertEquals(lineHeightIncreased, lineHeight + 2 + 1) |