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

menuewidget: fix menu position code after last uncool merge

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad959d9e08
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-03 12:33:52 +01:00
parent 0ffa8a1583
commit f849ff2612
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -889,11 +889,15 @@ void CMenuWidget::calcSize()
full_width = /*ConnectLineBox_Width+*/width+sb_width+SHADOW_OFFSET; full_width = /*ConnectLineBox_Width+*/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*/;
/* 2 times ConnectLineBox_Width for symmetry */ /* + ConnectLineBox_Width for the hintbox connection line
if (full_width + 2 * ConnectLineBox_Width > (int)frameBuffer->getScreenWidth()) * + center_offset for symmetry
* + 20 for setMenuPos calculates 10 pixels border left and right */
int center_offset = (g_settings.menu_pos == MENU_POS_CENTER) ? ConnectLineBox_Width : 0;
int max_possible = (int)frameBuffer->getScreenWidth() - ConnectLineBox_Width - center_offset - 20;
if (full_width > max_possible)
{ {
width = frameBuffer->getScreenWidth() - 2 * ConnectLineBox_Width - sb_width - SHADOW_OFFSET; width = max_possible - sb_width - SHADOW_OFFSET;
full_width = frameBuffer->getScreenWidth() - ConnectLineBox_Width; full_width = max_possible + center_offset; /* symmetry in MENU_POS_CENTER case */
} }
setMenuPos(full_width); setMenuPos(full_width);
@@ -934,17 +938,21 @@ void CMenuWidget::setMenuPos(const int& menu_width)
int scr_w = frameBuffer->getScreenWidth(); int scr_w = frameBuffer->getScreenWidth();
int scr_h = frameBuffer->getScreenHeight(); int scr_h = frameBuffer->getScreenHeight();
int real_h = full_height + hint_height;
//configured positions //configured positions
switch(g_settings.menu_pos) switch(g_settings.menu_pos)
{ {
case MENU_POS_CENTER: case MENU_POS_CENTER:
x = offx + scr_x + ((scr_w - menu_width ) >> 1 ); x = offx + scr_x + ((scr_w - menu_width ) >> 1 );
y = offy + scr_y + ((scr_h - full_height) >> 1 ); y = offy + scr_y + ((scr_h - real_h) >> 1 );
x += ConnectLineBox_Width;
break; break;
case MENU_POS_TOP_LEFT: case MENU_POS_TOP_LEFT:
y = offy + scr_y + 10; y = offy + scr_y + 10;
x = offx + scr_x + 10; x = offx + scr_x + 10;
x += ConnectLineBox_Width;
break; break;
case MENU_POS_TOP_RIGHT: case MENU_POS_TOP_RIGHT:
@@ -953,16 +961,16 @@ void CMenuWidget::setMenuPos(const int& menu_width)
break; break;
case MENU_POS_BOTTOM_LEFT: case MENU_POS_BOTTOM_LEFT:
y = /*offy +*/ scr_y + scr_h - full_height - 10; y = /*offy +*/ scr_y + scr_h - real_h - 10;
x = offx + scr_x + 10; x = offx + scr_x + 10;
x += ConnectLineBox_Width;
break; break;
case MENU_POS_BOTTOM_RIGHT: case MENU_POS_BOTTOM_RIGHT:
y = /*offy +*/ scr_y + scr_h - full_height - 10; y = /*offy +*/ scr_y + scr_h - real_h - 10;
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()