mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

CMenuWidget: fix width calculation for large menus

Browse Source 
with small screen offsets, large menus could get too large for
the screen and displayed outside -> possible segfault


Origin commit data
------------------
Branch: ni/coolstream
Commit: 047223440b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-10-31 21:17:40 +01:00
parent 7cb2a9a3ca
commit a5a0e909b9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -882,8 +882,15 @@ void CMenuWidget::calcSize()
if(total_pages > 1) if(total_pages > 1)
sb_width=15; sb_width=15;
full_width = ConnectLineBox_Width+width+sb_width+SHADOW_OFFSET; /* 2 times ConnectLineBox_Width for symmetry */
full_width = ConnectLineBox_Width * 2 + width + sb_width + SHADOW_OFFSET;
full_height = height+RADIUS_LARGE+SHADOW_OFFSET*2+hint_height+INFO_BOX_Y_OFFSET; full_height = height+RADIUS_LARGE+SHADOW_OFFSET*2+hint_height+INFO_BOX_Y_OFFSET;
if (full_width > (int)frameBuffer->getScreenWidth())
{
width -= (full_width - frameBuffer->getScreenWidth());
/* subtract the additional connectlineboxwidth we added above */
full_width = frameBuffer->getScreenWidth() - ConnectLineBox_Width;
}
setMenuPos(full_width); setMenuPos(full_width);
} }
@@ -951,6 +958,7 @@ void CMenuWidget::setMenuPos(const int& menu_width)
x = /*offx +*/ scr_x + scr_w - menu_width - 10; x = /*offx +*/ scr_x + scr_w - menu_width - 10;
break; break;
} }
x += ConnectLineBox_Width;
} }
void CMenuWidget::paintItems() void CMenuWidget::paintItems()