Ticket #7052: Deskbar_WindowMenuItem_cpp_style_fix.diff

File Deskbar_WindowMenuItem_cpp_style_fix.diff, 2.5 KB (added by jscipione, 13 years ago)
  • src/apps/deskbar/WindowMenuItem.cpp

    diff --git a/src/apps/deskbar/WindowMenuItem.cpp b/src/apps/deskbar/WindowMenuItem.cpp
    index ddf94f4..3e23585 100644
    a b Except as contained in this notice, the name of Be Incorporated shall not be  
    2626used in advertising or otherwise to promote the sale, use or other dealings in
    2727this Software without prior written authorization from Be Incorporated.
    2828
    29 Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
    30 of Be Incorporated in the United States and other countries. Other brand product
    31 names are registered trademarks or trademarks of their respective holders.
     29Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
     30trademarks of Be Incorporated in the United States and other countries. Other
     31brand product names are registered trademarks or trademarks of their respective
     32holders.
    3233All rights reserved.
    3334*/
    3435
    All rights reserved.  
    4849#include "WindowMenu.h"
    4950
    5051
    51 const float kHPad = 10.0f;
    52 const float kVPad = 2.0f;
    53 const float kLabelOffset = 8.0f;
    54 const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
     52const float kHPad = 10.0f;
     53const float kVPad = 2.0f;
     54const float kLabelOffset = 8.0f;
     55const BRect kIconRect(1.0f, 1.0f, 13.0f, 14.0f);
    5556
    5657
    5758TWindowMenuItem::TWindowMenuItem(const char* title, int32 id, bool mini,
    void  
    7576TWindowMenuItem::Initialize(const char* title)
    7677{
    7778    if (fMini) {
    78         fBitmap = fCurrentWorkSpace
     79        fBitmap = fCurrentWorkSpace
    7980            ? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenIcon)
    8081            : AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowHiddenSwitchIcon);
    8182    } else {
    82         fBitmap = fCurrentWorkSpace
     83        fBitmap = fCurrentWorkSpace
    8384            ? AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownIcon)
    8485            : AppResSet()->FindBitmap(B_MESSAGE_TYPE, R_WindowShownSwitchIcon);
    8586    }
    TWindowMenuItem::Draw()  
    204205
    205206    menu->PushState();
    206207
    207     //  if not selected or being tracked on, fill with gray
     208    // if not selected or being tracked on, fill with gray
    208209    TBarView* barview = (static_cast<TBarApp*>(be_app))->BarView();
    209210    if ((!IsSelected() && !menu->IsRedrawAfterSticky())
    210211        || barview->Dragging() || !IsEnabled()) {
    TWindowMenuItem::DrawContent()  
    241242
    242243    BRect frame(Frame());
    243244    BPoint contLoc = ContentLocation() + BPoint(kHPad, kVPad);
    244 //  if (fExpanded)
    245 //      contLoc.x += kHPad;
     245    //if (fExpanded)
     246    //  contLoc.x += kHPad;
    246247
    247248    if (fID >= 0) {
    248249        menu->SetDrawingMode(B_OP_OVER);