mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-11-12 18:06:26 +01:00
parent 5257d14c13 ad7947d11a
commit 2c92d112d0
58 changed files with 6498 additions and 735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/widget/menue.cpp
View File

@@ -890,9 +890,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
pos -= dir * items.size();
wrap = true;
}
if (pos >= (int)items.size())
if (!items.empty() && pos >= (int)items.size())
pos = (int)items.size() - 1;
do {
if(items.empty())
break;
CMenuItem* item = items[pos];
if (item->isSelectable()) {
if (pos < page_start[current_page + 1] && pos >= page_start[current_page]) {
@@ -1225,7 +1227,6 @@ void CMenuWidget::initSelectable()
void CMenuWidget::paint()
{
OnBeforePaint();
if (header){
if ((bool)header->getCornerRadius() != (bool)g_settings.rounded_corners) //ensure reset if corner mode was changed
ResetModules();
@@ -1236,6 +1237,8 @@ void CMenuWidget::paint()
calcSize();
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/);
OnBeforePaint();
// paint head
if (header == NULL){
header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile);
@@ -1388,7 +1391,7 @@ void CMenuWidget::saveScreen()
delete[] background;
background = new fb_pixel_t [full_width * full_height];
background = new fb_pixel_t [full_width * (full_height+fbutton_height)];
if(background)
frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
}