[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: BTextView: Draw string even if foundTab
From: Gerrit <review () review ! haiku-os ! org>
Date: 2020-09-25 16:38:37
Message-ID: gerrit.1601051915000.Icca0b50f5432351b9c7ffcb82b1c8195a7ed286b () review ! haiku-os ! org
[Download RAW message or body]
From John Scipione <jscipione@gmail.com>:
John Scipione has uploaded this change for review. ( https://review.haiku-os.org/c/haiku/+/3267 )
Change subject: BTextView: Draw string even if foundTab
......................................................................
BTextView: Draw string even if foundTab
Fixes #16544 (regression from hrev54549.)
---
M src/kits/interface/TextView.cpp
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/67/3267/1
diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 64d4d63..67c71ac 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -4424,6 +4424,11 @@
view->PopState();
}
+ int32 size = tabChars;
+ const char* stringToDraw = fText->GetString(offset, &size);
+ view->SetDrawingMode(textRenderingMode);
+ view->DrawString(stringToDraw, size);
+
if (foundTab) {
float penPos = PenLocation().x - fTextRect.left;
switch (fAlignment) {
@@ -4451,11 +4456,6 @@
// move pen by tab(s) width
view->MovePenBy(tabWidth, 0.0);
tabChars += numTabs;
- } else {
- int32 size = tabChars;
- const char* stringToDraw = fText->GetString(offset, &size);
- view->SetDrawingMode(textRenderingMode);
- view->DrawString(stringToDraw, size);
}
offset += tabChars;
--
To view, visit https://review.haiku-os.org/c/haiku/+/3267
To unsubscribe, or for help writing mail filters, visit https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Icca0b50f5432351b9c7ffcb82b1c8195a7ed286b
Gerrit-Change-Number: 3267
Gerrit-PatchSet: 1
Gerrit-Owner: John Scipione <jscipione@gmail.com>
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>John Scipione has uploaded this change for <strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/3267">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">BTextView: Draw \
string even if foundTab<br><br>Fixes #16544 (regression from hrev54549.)<br>---<br>M \
src/kits/interface/TextView.cpp<br>1 file changed, 5 insertions(+), 5 \
deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: \
pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku refs/changes/67/3267/1</pre><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git \
a/src/kits/interface/TextView.cpp \
b/src/kits/interface/TextView.cpp</span><br><span>index 64d4d63..67c71ac \
100644</span><br><span>--- a/src/kits/interface/TextView.cpp</span><br><span>+++ \
b/src/kits/interface/TextView.cpp</span><br><span>@@ -4424,6 +4424,11 \
@@</span><br><span> view->PopState();</span><br><span> }</span><br><span> \
</span><br><span style="color: hsl(120, 100%, 40%);">+ int32 size = \
tabChars;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char* \
stringToDraw = fText->GetString(offset, &size);</span><br><span style="color: \
hsl(120, 100%, 40%);">+ view->SetDrawingMode(textRenderingMode);</span><br><span \
style="color: hsl(120, 100%, 40%);">+ view->DrawString(stringToDraw, \
size);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if \
(foundTab) {</span><br><span> float penPos = PenLocation().x - \
fTextRect.left;</span><br><span> switch (fAlignment) {</span><br><span>@@ \
-4451,11 +4456,6 @@</span><br><span> // move pen by tab(s) width</span><br><span> \
view->MovePenBy(tabWidth, 0.0);</span><br><span> tabChars += \
numTabs;</span><br><span style="color: hsl(0, 100%, 40%);">- } else \
{</span><br><span style="color: hsl(0, 100%, 40%);">- int32 size = \
tabChars;</span><br><span style="color: hsl(0, 100%, 40%);">- const char* \
stringToDraw = fText->GetString(offset, &size);</span><br><span style="color: \
hsl(0, 100%, 40%);">- view->SetDrawingMode(textRenderingMode);</span><br><span \
style="color: hsl(0, 100%, 40%);">- view->DrawString(stringToDraw, \
size);</span><br><span> }</span><br><span> </span><br><span> offset += \
tabChars;</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/3267">change 3267</a>. To unsubscribe, or \
for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="about:invalid#zSoyz"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
Icca0b50f5432351b9c7ffcb82b1c8195a7ed286b </div> <div style="display:none"> \
Gerrit-Change-Number: 3267 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: John Scipione \
<jscipione@gmail.com> </div> <div style="display:none"> Gerrit-MessageType: \
newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic