From 36759a6b6c8faad3c52cbf5690022fef1f5db947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 18 Mar 2009 17:19:05 +0000 Subject: [PATCH] Always use B_OP_OVER for rendering the text in BMenuItem, not just when using BControlLook. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29598 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/MenuItem.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index e92d184933..01d161f0d8 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -439,7 +439,9 @@ BMenuItem::DrawContent() BPoint lineStart = fSuper->PenLocation(); float labelWidth, labelHeight; - GetContentSize(&labelWidth, &labelHeight); + GetContentSize(&labelWidth, &labelHeight); + + fSuper->SetDrawingMode(B_OP_OVER); // truncate if needed // TODO: Actually, this is still never triggered @@ -482,9 +484,6 @@ BMenuItem::Draw() rgb_color noTint = fSuper->LowColor(); rgb_color bgColor = noTint; - if (be_control_look != NULL) - fSuper->SetDrawingMode(B_OP_OVER); - // set low color and fill background if selected bool activated = selected && (enabled || Submenu()) /*&& fSuper->fRedrawAfterSticky*/;