diff options
-rw-r--r-- | displaymenu.c | 1 | ||||
-rw-r--r-- | displaymenuview.c | 6 | ||||
-rw-r--r-- | displaymenuview.h | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/displaymenu.c b/displaymenu.c index 7056b75..4ea103f 100644 --- a/displaymenu.c +++ b/displaymenu.c @@ -28,7 +28,6 @@ cNopacityDisplayMenu::cNopacityDisplayMenu(cImageCache *imgCache) { osd = menuView->createOsd(); menuView->SetDescriptionTextWindowSize(); menuView->CreatePixmaps(); - menuView->SetAvrgFontWidth(); menuView->DrawHeaderLogo(); menuView->DrawBorderDecoration(); currentFeed = 0; diff --git a/displaymenuview.c b/displaymenuview.c index ece34ca..cdcdddd 100644 --- a/displaymenuview.c +++ b/displaymenuview.c @@ -267,10 +267,6 @@ int cNopacityDisplayMenuView::GetMenuItemLeft(int itemWidth) { return menuLeft; } -void cNopacityDisplayMenuView::SetAvrgFontWidth(void) { - avrgFontWidth = fontManager->menuItemDefault->Width("x")+3; -} - void cNopacityDisplayMenuView::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, int Tab5) { mytabs[0] = 1; mytabs[1] = Tab1 ? mytabs[0] + Tab1 : 0; @@ -280,7 +276,7 @@ void cNopacityDisplayMenuView::SetTabs(int Tab1, int Tab2, int Tab3, int Tab4, i mytabs[5] = Tab5 ? mytabs[4] + Tab5 : 0; if (Tab2) { for (int i = 1; i < cSkinDisplayMenu::MaxTabs; i++) - mytabs[i] *= avrgFontWidth; + mytabs[i] *= fontManager->menuItemDefault->Width("x") + 3; } else if (Tab1) { mytabs[1] = GetEditableWidth(); } diff --git a/displaymenuview.h b/displaymenuview.h index 05a88c8..0899828 100644 --- a/displaymenuview.h +++ b/displaymenuview.h @@ -33,7 +33,6 @@ class cNopacityDisplayMenuView { cPixmap *pixmapDiskUsageLabel; cNopacityMessageBox *messageBox; int feedNameLength; - int avrgFontWidth; cRect textWindowSizeSchedules; cRect textWindowSizeRecordings; cRect textWindowSizeChannels; @@ -49,7 +48,6 @@ class cNopacityDisplayMenuView { void GetMenuItemSize(eMenuCategory menuCat, cPoint *itemSize); int GetMenuTop(int numItems, int itemHeight); int GetMenuItemLeft(int itemWidth); - void SetAvrgFontWidth(void); int mytabs[cSkinDisplayMenu::MaxTabs]; void SetTabs(int Tab1, int Tab2 = 0, int Tab3 = 0, int Tab4 = 0, int Tab5 = 0); int GetEditableWidth(void); |