Ticket #3637: filetypes.patch

src/preferences/filetypes/FileTypesWindow.cpp

@@ -512 +512 @@
 
     innerRect.right = innerRect.left - 6.0f;
     innerRect.left = 8.0f;
-    BView* constrainingView = new BView(innerRect, NULL, B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW);
-    constrainingView->SetViewColor(topView->ViewColor());
 
-    fPreferredField = new BMenuField(innerRect.OffsetToCopy(B_ORIGIN), "preferred",
-        NULL, menu);
+    fPreferredField = new BMenuField(innerRect, "preferred",
+        NULL, menu, true, B_FOLLOW_LEFT_RIGHT );
     float width;
     fPreferredField->GetPreferredSize(&width, &height);
     fPreferredField->ResizeTo(innerRect.Width(), height);
     fPreferredField->MoveBy(0.0f, (innerRect.Height() - height) / 2.0f);
-    constrainingView->AddChild(fPreferredField);
-        // we embed the menu field in another view to make it behave like
-        // we want so that it can't obscure other elements with larger
-        // labels
 
-    fPreferredBox->AddChild(constrainingView);
+    fPreferredBox->AddChild( fPreferredField );
 
     // "Extra Attributes" group
 

src/kits/interface/Menu.cpp

@@ -203 +203 @@
     fAscent(-1.0f),
     fDescent(-1.0f),
     fFontHeight(-1.0f),
-    fState(0),
+    fState(MENU_STATE_CLOSED),
     fLayout(layout),
     fExtraRect(NULL),
     fMaxContentWidth(0.0f),
@@ -272 +272 @@
     fAscent(-1.0f),
     fDescent(-1.0f),
     fFontHeight(-1.0f),
-    fState(0),
+    fState(MENU_STATE_CLOSED),
     fLayout(B_ITEMS_IN_ROW),
     fExtraRect(NULL),
     fMaxContentWidth(0.0f),
@@ -1255 +1255 @@
     fAscent(-1.0f),
     fDescent(-1.0f),
     fFontHeight(-1.0f),
-    fState(0),
+    fState(MENU_STATE_CLOSED),
     fLayout(layout),
     fExtraRect(NULL),
     fMaxContentWidth(0.0f),

src/kits/interface/MenuItem.cpp

@@ -23 +23 @@
 #include <Window.h>
 
 #include <MenuPrivate.h>
+#include <BMCPrivate.h>
 
 #include "utf8_functions.h"
 
@@ -398 +399 @@
 
     fSuper->SetDrawingMode(B_OP_OVER);
 
+    float frameWidth = fBounds.Width();
+    if( MenuPrivate(fSuper).State() == MENU_STATE_CLOSED ) {
+        frameWidth = fSuper->Frame().Width();
+        _BMCMenuBar_* menuBar = dynamic_cast<_BMCMenuBar_*>(fSuper);
+        if (menuBar and menuBar->IsPopUpMarkerShown())
+            frameWidth-=15;
+                //-15 for popup indicator , see BMCMenuBar::Draw()
+    }
+
     // truncate if needed
-    // TODO: Actually, this is still never triggered
-    if (fBounds.Width() > labelWidth)
+    if (frameWidth > labelWidth)
         fSuper->DrawString(fLabel);
     else {
         char *truncatedLabel = new char[strlen(fLabel) + 4];
-        TruncateLabel(fBounds.Width(), truncatedLabel);
+        TruncateLabel(frameWidth, truncatedLabel);
         fSuper->DrawString(truncatedLabel);
         delete[] truncatedLabel;
     }