CBEBouquet-Classes: switch to new buttonbar based up cc-footer class

This commit is contained in:
2014-12-27 20:45:40 +01:00
parent 9776d163f7
commit b565700168
6 changed files with 18 additions and 15 deletions

View File

@@ -41,7 +41,7 @@
#include <driver/fontrenderer.h>
#include <driver/screen_max.h>
#include <gui/widget/icons.h>
#include <gui/widget/buttons.h>
#include <zapit/zapit.h>
#include <zapit/getservices.h>
@@ -59,7 +59,7 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, CZap
info_height = 0;
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
footerHeight= footer.getHeight();
frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_GREEN, &icol_w, &icol_h);
iheight = std::max(fheight, icol_h+2);
@@ -251,7 +251,8 @@ void CBEChannelSelectWidget::paintFoot()
Button[0].locale = LOCALE_CHANNELLIST_FOOT_SORT_ALPHA;
break;
}
::paintButtons(x, y + (height-footerHeight), width, numbuttons, Button, width, footerHeight);
footer.paintButtons(x, y + (height-footerHeight), width, footerHeight, numbuttons, Button, width/numbuttons-20);
}
std::string CBEChannelSelectWidget::getInfoText(int index)