Ticket #749: patch-bug#749.diff

src/kits/tracker/CountView.h

@@ -66 +66 @@
     BRect BarberPoleInnerRect() const;
     BRect BarberPoleOuterRect() const;
     BRect TextInvalRect() const;
+    BRect TextAndBarberPoleRect() const;
     void TrySpinningBarberPole();
 
     int32 fLastCount;

src/kits/tracker/CountView.cpp

@@ -73 +73 @@
     if (fStartSpinningAfter && system_time() < fStartSpinningAfter)
         return;
 
+    // When the barber pole just starts spinning we need to invalidate
+    // the whole rectangle of text and barber pole.
+    // After this the text needs no updating since only the pole changes.
     if (fStartSpinningAfter) {
         fStartSpinningAfter = 0;
-        Invalidate(BarberPoleOuterRect());
+        Invalidate(TextAndBarberPoleRect());
     } else
         Invalidate(BarberPoleInnerRect());
 }
@@ -133 +136 @@
 {
     BRect result = Bounds();
     result.InsetBy(4, 2);
-    result.right -= 10;
 
+    // if the barber pole is not present, use its space for text
+    if(fShowingBarberPole)
+        result.right -= 10;
+
     return result;
 }
 
+BRect
+BCountView::TextAndBarberPoleRect() const
+{
+    BRect result = Bounds();
+    result.InsetBy(4, 2);
+
+    return result;
+}
+
 void
 BCountView::CheckCount()
 {
@@ -154 +169 @@
 BCountView::Draw(BRect)
 {
     BRect bounds(Bounds());
-    BRect barberPoleRect;
     BString itemString;
     if (!IsTypingAhead()) {
         if (fLastCount == 0) 
@@ -166 +180 @@
     } else
         itemString << TypeAhead();
         
-    
     BString string(itemString);
     BRect textRect(TextInvalRect());
 
-    if (fShowingBarberPole && !fStartSpinningAfter) {
-        barberPoleRect = BarberPoleOuterRect();
-        TruncateString(&string, B_TRUNCATE_END, textRect.Width());
-    }
+    TruncateString(&string, B_TRUNCATE_END, textRect.Width());
 
     if (IsTypingAhead())
         // use a muted gray for the typeahead
@@ -202 +212 @@
         EndLineArray();
         return;
     }
+    
+    BRect barberPoleRect(BarberPoleOuterRect());
 
     AddLine(barberPoleRect.LeftTop(), barberPoleRect.RightTop(), shadow);
     AddLine(barberPoleRect.LeftTop(), barberPoleRect.LeftBottom(), shadow);