Ticket #2209: TextView.diff

src/kits/interface/TextView.cpp

@@ -3576 +3576 @@
                 } while ((tabChars + numTabs) < numBytes);
             }
 
-            if (inputRegion.CountRects() > 0) {
+            int32 returnedBytes;
+            const char* stringToDraw;
+
+            if (inputRegion.CountRects() > 0
+                && (offset <= fInline->Offset() && fInline->Offset() < offset + tabChars
+                || fInline->Offset() <= offset && offset < fInline->Offset() + fInline->Length())) {
                 BRegion textRegion;
                 GetTextRegion(offset, offset + length, &textRegion);
-
                 textRegion.IntersectWith(&inputRegion);
-                view->PushState();  
 
+                rgb_color viewColor = view->ViewColor();
+
                 // Highlight in blue the inputted text
                 view->SetHighColor(kBlueInputColor);
                 view->FillRect(textRegion.Frame());
@@ -3594 +3599 @@
                         + fInline->SelectionOffset(), fInline->Offset()
                         + fInline->SelectionOffset()
                         + fInline->SelectionLength(), &selectedRegion);
-
                     textRegion.IntersectWith(&selectedRegion);
 
                     view->SetHighColor(kRedInputColor);
                     view->FillRect(textRegion.Frame());
                 }
+                
+                int32 drawnBytes = 0;
+                view->SetHighColor(*color);
 
-                view->PopState();
+                // before inputted text
+                _DrawLineInlucdeInputted(view, offset, min_c(fInline->Offset(), offset + tabChars),
+                        viewColor, &drawnBytes);
+
+                // blue inputted text
+                _DrawLineInlucdeInputted(view, offset,
+                    min_c(fInline->Offset() + fInline->SelectionOffset(), offset + tabChars),
+                    kBlueInputColor, &drawnBytes);
+
+                // red inputted text
+                int32 afterSelectionOffset = fInline->Offset() + fInline->SelectionOffset()
+                    + fInline->SelectionLength();
+                _DrawLineInlucdeInputted(view, offset, min_c(afterSelectionOffset, offset + tabChars),
+                    kRedInputColor, &drawnBytes);
+
+                // blue inputted text
+                int32 afterInputted = fInline->Offset() + fInline->Length();
+                _DrawLineInlucdeInputted(view, offset, min_c(afterInputted, offset + tabChars),
+                    kBlueInputColor, &drawnBytes);
+
+                // after inputted text
+                _DrawLineInlucdeInputted(view, offset, offset + tabChars, viewColor, &drawnBytes);
+                view->SetLowColor(viewColor);
+                view->SetViewColor(viewColor);
+            } else {
+                returnedBytes = tabChars;
+                stringToDraw = fText->GetString(offset, &returnedBytes);
+                view->DrawString(stringToDraw, returnedBytes);
             }
 
-            int32 returnedBytes = tabChars;
-            const char *stringToDraw = fText->GetString(offset,
-                &returnedBytes);
-
-            view->DrawString(stringToDraw, returnedBytes);
             if (foundTab) {
                 float penPos = PenLocation().x - fTextRect.left;
                 float tabWidth = _ActualTabWidth(penPos);
@@ -3630 +3659 @@
 
 
 void
+BTextView::_DrawLineInlucdeInputted(BView* view, int32 offset, int32 end, const rgb_color& bgColor,
+    int32* drawnBytes)
+{
+    if (offset + *drawnBytes >= end)
+        return;
+    SetLowColor(bgColor);
+    SetViewColor(bgColor);
+
+    int32 returnedBytes = end - (offset + *drawnBytes);
+    const char* stringToDraw = fText->GetString(offset + *drawnBytes, &returnedBytes);
+    view->DrawString(stringToDraw, returnedBytes);
+    *drawnBytes += returnedBytes;
+}
+
+
+void
 BTextView::_DrawLines(int32 startLine, int32 endLine, int32 startOffset,
     bool erase)
 {

headers/os/interface/TextView.h

@@ -254 +254 @@
         void _DrawLine(BView* view, const int32 &startLine,
             const int32& startOffset, const bool& erase, BRect& eraseRect,
             BRegion& inputRegion);
+        void _DrawLineInlucdeInputted(BView* view, int32 offset, int32 end, const rgb_color& bgColor,
+            int32* drawnBytes);
 
         void _DrawLines(int32 startLine, int32 endLine, int32 startOffset = -1,
             bool erase = false);