Ticket #9189: Terminal.patch

src/apps/terminal/AppearPrefView.cpp

@@ -454 +454 @@
 /*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++) {
+    BPopUpMenu* menu = new BPopUpMenu("size");
+    int32       sizes[] = {9, 10, 11, 12, 14, 16, 18}; /** Must be monotonically increasing sequence */
+    const uint8 SIZES_MAX = sizeof(sizes)/sizeof(sizes[0]);
+    bool        found = false;
+    BMenuItem*  item;
+    
+    for (uint32 i = 0; i < SIZES_MAX; i++) {
+        if (!found && defaultSize < sizes[i]) {
+            BString string;
+            string << defaultSize;
+
+            item = new BMenuItem(string.String(), new BMessage(command));
+            item->SetMarked(true);
+            menu->AddItem(item);
+            found = true;   
+        }
         BString string;
         string << sizes[i];
 
-        BMenuItem* item = new BMenuItem(string.String(), new BMessage(command));
-        menu->AddItem(item);
-
-        if (sizes[i] == defaultSize) {
+        item = new BMenuItem(string.String(), new BMessage(command));
+        if (defaultSize == sizes[i]) {
             item->SetMarked(true);
             found = true;
         }
+        menu->AddItem(item);        
     }
     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;
-            }
-        }
-    }
+        BString string;
+        string << defaultSize;
 
+        item = new BMenuItem(string.String(), new BMessage(command));
+        item->SetMarked(true);
+        menu->AddItem(item);    
+    }
     return menu;
 }