i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And here's the blue highlight when an input method addon like the Japanese one is used (the red one isn't yet there)

Browse Source 
Some minor changes.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8657 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-08-26 06:30:43 +00:00
parent 187bee4d77
commit 7fd612e59f
1 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+36 -16
View File
@@ -3058,15 +3058,15 @@ BTextView::HandlePageKey(uint32 inPageKey)
if (ScrollBar(B_VERTICAL) != NULL) if (ScrollBar(B_VERTICAL) != NULL)
ScrollBar(B_VERTICAL)->SetValue(ScrollBar(B_VERTICAL)->Value() - delta); ScrollBar(B_VERTICAL)->SetValue(ScrollBar(B_VERTICAL)->Value() - delta);
int32 newOffset = OffsetAt(LineAt(PointAt(currentOffset - delta))); fClickOffset = OffsetAt(LineAt(PointAt(currentOffset - delta)));
if (shiftDown) { if (shiftDown) {
if (newOffset <= fSelStart) if (fClickOffset <= fSelStart)
Select(newOffset, fSelEnd); Select(fClickOffset, fSelEnd);
else else
Select(fSelStart, newOffset); Select(fSelStart, fClickOffset);
} else } else
Select(newOffset, newOffset); Select(fClickOffset, fClickOffset);
break; break;
} }
@@ -3079,16 +3079,15 @@ BTextView::HandlePageKey(uint32 inPageKey)
if (ScrollBar(B_VERTICAL) != NULL) if (ScrollBar(B_VERTICAL) != NULL)
ScrollBar(B_VERTICAL)->SetValue(ScrollBar(B_VERTICAL)->Value() + delta); ScrollBar(B_VERTICAL)->SetValue(ScrollBar(B_VERTICAL)->Value() + delta);
int32 newOffset = OffsetAt(LineAt(PointAt(currentOffset + delta))); fClickOffset = OffsetAt(LineAt(PointAt(currentOffset + delta)));
if (shiftDown) { if (shiftDown) {
if (newOffset >= fSelEnd) if (fClickOffset >= fSelEnd)
Select(fSelStart, newOffset); Select(fSelStart, fClickOffset);
else else
Select(newOffset, fSelEnd); Select(fClickOffset, fSelEnd);
} else } else
Select(newOffset, newOffset); Select(fClickOffset, fClickOffset);
break; break;
} }
@@ -3635,7 +3634,29 @@ BTextView::DrawLines(int32 startLine, int32 endLine, int32 startOffset,
break; break;
} }
} }
// TODO: Revisit this as it isn't working so good, and it looks ugly
// and add clauses support (red highlighing)
if (fInline && fInline->IsActive() && (fInline->Offset() >= offset
&& fInline->Offset() + fInline->Length() <= offset + length)) {
float height;
BPoint leftTop = PointAt(fInline->Offset(), &height);
BPoint rightBottom = PointAt(fInline->Offset() + fInline->Length());
rightBottom.y += height;
BRect rect(leftTop, rightBottom);
PushState();
rgb_color blue = {152, 203, 255};
//rgb_color red = {255, 152, 152};
SetHighColor(blue);
SetLowColor(blue);
FillRect(rect);
PopState();
}
DrawString(fText->GetString(offset, tabChars), tabChars); DrawString(fText->GetString(offset, tabChars), tabChars);
if (foundTab) { if (foundTab) {
@@ -3672,6 +3693,7 @@ BTextView::DrawLines(int32 startLine, int32 endLine, int32 startOffset,
} }
ConstrainClippingRegion(NULL); ConstrainClippingRegion(NULL);
Flush();
} }
@@ -4236,8 +4258,6 @@ BTextView::HandleInputMethodChanged(BMessage *message)
if (!fInline) if (!fInline)
return; return;
// TODO: Highlight in blue/red the various clauses
const char *string = NULL; const char *string = NULL;
if (message->FindString("be:string", &string) < B_OK || string == NULL) if (message->FindString("be:string", &string) < B_OK || string == NULL)
return; return;
@@ -4261,8 +4281,6 @@ BTextView::HandleInputMethodChanged(BMessage *message)
fSelStart += stringLen; fSelStart += stringLen;
fClickOffset = fSelEnd = fSelStart; fClickOffset = fSelEnd = fSelStart;
Refresh(0, fSelEnd, true, false);
// If we find the "be:confirmed" boolean (and the boolean is true), // If we find the "be:confirmed" boolean (and the boolean is true),
// it means it's over for now, so the current _BInlineInput_ object // it means it's over for now, so the current _BInlineInput_ object
// should become inactive // should become inactive
@@ -4271,6 +4289,8 @@ BTextView::HandleInputMethodChanged(BMessage *message)
fInline->SetActive(true); fInline->SetActive(true);
else else
fInline->SetActive(false); fInline->SetActive(false);
Refresh(0, fSelEnd, true, false);
} }