Ticket #9189: Terminal-2.patch

src/apps/terminal/AppearPrefView.cpp

@@ -16 +16 @@
 #include <CheckBox.h>
 #include <ColorControl.h>
 #include <LayoutBuilder.h>
+#include <List.h>
 #include <Locale.h>
 #include <Menu.h>
 #include <MenuField.h>
@@ -455 +456 @@
     return menu;
 }
 
+static int CompareStrAsDecimalValue(const void *ptr1, const void *ptr2)
+{
+    const char *pStr1 = *(const char **)ptr1;
+    const char *pStr2 = *(const char **)ptr2;
+    const int len1 = strlen(pStr1);
+    const int len2 = strlen(pStr2);
+
+    if (len1 == len2)
+        return strcmp(pStr1, pStr2);
+    else if (len1 < len2) 
+        return -1;
+    else 
+        return 1;
+}
+
+static int ListHasString(BList* pList, const char *pStr)
+{
+    for (int32 i = 0; i < pList->CountItems(); i++) {
+        if (strcmp(static_cast<const char *>(pList->ItemAt(i)), pStr) == 0)
+            return i;
+    }
+    return -1;
+}
 
 /*static*/ BMenu*
 AppearancePrefView::_MakeSizeMenu(uint32 command, uint8 defaultSize)
 {
-    BPopUpMenu* menu = new BPopUpMenu("size");
-    int32 sizes[] = {9, 10, 11, 12, 14, 16, 18, 0};
-
-    bool found = false;
-
-    for (uint32 i = 0; sizes[i]; i++) {
-        BString string;
-        string << sizes[i];
+    BList* sizes = new BList(8);     
+    sizes->AddItem((void *)"9");
+    sizes->AddItem((void *)"10");
+    sizes->AddItem((void *)"11");
+    sizes->AddItem((void *)"12");
+    sizes->AddItem((void *)"14");
+    sizes->AddItem((void *)"16");
+    sizes->AddItem((void *)"18");
+
+    BString defaultSizeStr;
+    defaultSizeStr << defaultSize;
+    int32 markedPos = ListHasString(sizes, defaultSizeStr.String());
+    if (markedPos < 0) {
+        sizes->AddItem((void *)defaultSizeStr.String());
+        sizes->SortItems(CompareStrAsDecimalValue);
+        markedPos = ListHasString(sizes, defaultSizeStr.String());
+    }
 
-        BMenuItem* item = new BMenuItem(string.String(), new BMessage(command));
+    BPopUpMenu* menu = new BPopUpMenu("size");
+    BMenuItem* item;
+    for (int32 i = 0; i < sizes->CountItems(); i++) {
+        item = new BMenuItem(static_cast<const char *>(sizes->ItemAt(i)), 
+            new BMessage(command));
+        if (i == markedPos) item->SetMarked(true);
         menu->AddItem(item);
-
-        if (sizes[i] == defaultSize) {
-            item->SetMarked(true);
-            found = true;
-        }
-    }
-    if (!found) {
-        for (uint32 i = 0; sizes[i]; i++) {
-            if (sizes[i] > defaultSize) {
-                BString string;
-                string << defaultSize;
-                BMenuItem* item = new BMenuItem(string.String(),
-                    new BMessage(command));
-                item->SetMarked(true);
-                menu->AddItem(item, i);
-                break;
-            }
-        }
     }
 
     return menu;