Changeset 25412

Show
Ignore:
Timestamp:
05/10/08 06:27:48 (6 days ago)
Author:
stippi
Message:
* Used ui_color() for default view color.
* Fixed Track and Disc time labels to be large enough. (Fixes #2201.)
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • haiku/trunk/src/apps/cdplayer/CDPlayer.cpp

    r25410 r25412  
    7575        fCDQuery("freedb.freedb.org") 
    7676{ 
    77         SetViewColor(216, 216, 216); 
     77        SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); 
    7878 
    7979        fVolume = 255; 
    …… 
    140140        r.OffsetBy(0, r.Height() + 5); 
    141141        r.right = r.left + (r.Width() / 2); 
    142         fTrackTime = new BStringView(r, "TrackTime", "Track: --:-- / --:--", 
     142        fTrackTime = new BStringView(r, "TrackTime", "Track: 88:88 / 88:88", 
    143143                B_FOLLOW_LEFT_RIGHT); 
     144        fTrackTime->ResizeToPreferred(); 
     145        fTrackTime->SetText("Track: --:-- / --:--"); 
    144146        box->AddChild(fTrackTime); 
    145147 
    146         r.OffsetTo(box->Bounds().right / 2, r.top); 
    147         fDiscTime = new BStringView(r, "DiscTime", "Disc: --:-- / --:--", 
     148        r.OffsetTo(fTrackTime->Frame().right + 5, r.top); 
     149        fDiscTime = new BStringView(r, "DiscTime", "Disc: 88:88 / 88:88", 
    148150                B_FOLLOW_RIGHT); 
    149151        fDiscTime->ResizeToPreferred(); 
    150         fDiscTime->ResizeBy(10, 0); 
     152        fDiscTime->SetText("Disc: --:-- / --:--"); 
    151153        box->AddChild(fDiscTime); 
    152154 
    153         box->ResizeTo(fCDTitle->Frame().right + 5, fDiscTime->Frame().bottom + 10); 
     155        float maxWidth = max_c(fDiscTime->Frame().right, fCDTitle->Frame().right); 
     156 
     157        box->ResizeTo(maxWidth + 5, fDiscTime->Frame().bottom + 10); 
    154158 
    155159        fStop = new DrawButton(BRect(0, 0, 1, 1), "Stop",