Ticket #7772: Deskbar_truncate_label_cleanup_2.diff

src/apps/deskbar/TeamMenuItem.cpp

@@ -445 +445 @@
     if (Submenu() && fVertical)
         cachedWidth += 18;
 
-    const char* label = Label();
-    char* truncLabel = NULL;
+    BString label(Label());
     float max = 0;
 
     if (static_cast<TBarApp*>(be_app)->Settings()->superExpando && fVertical)
@@ -458 +457 @@
         BPoint penloc = menu->PenLocation();
         BRect frame = Frame();
         float offset = penloc.x - frame.left;
-        if (cachedWidth + offset > max) {
-            truncLabel = (char*)malloc(strlen(label) + 4);
-            if (!truncLabel)
-                return;
-            TruncateLabel(max-offset, truncLabel);
-            label = truncLabel;
-        }
+        if (cachedWidth + offset > max)
+            menu->TruncateString(&label, B_TRUNCATE_MIDDLE, max - offset);
     }
 
-    if (!label)
-        label = Label();
-
     TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
     bool canHandle = !barview->Dragging()
         || barview->AppCanHandleTypes(Signature());
@@ -479 +470 @@
     else
         menu->SetLowColor(menu->ViewColor());
 
-    menu->DrawString(label);
-
-    free(truncLabel);
+    menu->DrawString(label.String());
 }