diff options
| -rw-r--r-- | baserender.c | 4 | ||||
| -rw-r--r-- | displaymenu.c | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/baserender.c b/baserender.c index a622f309..b2989a66 100644 --- a/baserender.c +++ b/baserender.c @@ -445,8 +445,8 @@ void cFlatBaseRender::TopBarUpdate(void) { if( topBarMenuIconRightSet ) { cImage *img = imgLoader.LoadIcon(*topBarMenuIconRight, 999, topBarHeight - marginItem*2); if( img ) { - titleMaxWidth -= img->Width()+marginItem*2; - int IconLeft = titleLeft + topBarFont->Width(topBarTitle) + marginItem; + titleMaxWidth -= img->Width()+marginItem*4; + int IconLeft = titleLeft + topBarFont->Width(topBarTitle) + marginItem*3; int iconTop = (topBarHeight / 2 - img->Height()/2); topBarIconPixmap->DrawImage(cPoint(IconLeft, iconTop), *img); } diff --git a/displaymenu.c b/displaymenu.c index 54d09121..a27906b7 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -253,11 +253,6 @@ void cFlatDisplayMenu::SetTitle(const char *Title) { } break; case mcRecording: - if( RecordingsSortMode == rsmName ) - TopBarSetMenuIconRight("menuIcons/RecsSortName"); - else if( RecordingsSortMode == rsmTime ) - TopBarSetMenuIconRight("menuIcons/RecsSortDate"); - if( Config.MenuRecordingShowCount ) { int recCount = 0, recNewCount = 0; for(cRecording *Rec = Recordings.First(); Rec; Rec = Recordings.Next(Rec)) { @@ -268,6 +263,10 @@ void cFlatDisplayMenu::SetTitle(const char *Title) { cString newTitle = cString::sprintf("%s (%d*/%d)", Title, recNewCount, recCount); TopBarSetTitle(*newTitle); } + if( RecordingsSortMode == rsmName ) + TopBarSetMenuIconRight("menuIcons/RecsSortName"); + else if( RecordingsSortMode == rsmTime ) + TopBarSetMenuIconRight("menuIcons/RecsSortDate"); icon = "menuIcons/Recordings"; break; case mcSetup: |