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

* Correct restore the screen to exit menu

Browse Source
This commit is contained in:
micha-bbg
2012-07-20 21:28:18 +02:00
parent 1a654403cc
commit ecadf79a8f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@
#include <cctype> #include <cctype>
#define ConnectLineBox_Width 16 #define ConnectLineBox_Width 16
#define INFO_BOX_Y_OFFSET 2
/* the following generic menu items are integrated into multiple menus at the same time */ /* the following generic menu items are integrated into multiple menus at the same time */
CMenuSeparator CGenericMenuSeparator; CMenuSeparator CGenericMenuSeparator;
@@ -858,7 +859,7 @@ void CMenuWidget::calcSize()
sb_width=15; sb_width=15;
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; full_height = height+RADIUS_LARGE+SHADOW_OFFSET*2+hint_height+INFO_BOX_Y_OFFSET;
setMenuPos(width - sb_width); setMenuPos(width - sb_width);
} }
@@ -1049,7 +1050,7 @@ void CMenuWidget::paintHint(int pos)
int rad = RADIUS_LARGE; int rad = RADIUS_LARGE;
int xpos = x - ConnectLineBox_Width; int xpos = x - ConnectLineBox_Width;
int ypos2 = y + height + rad + SHADOW_OFFSET + 2; int ypos2 = y + height + rad + SHADOW_OFFSET + INFO_BOX_Y_OFFSET;
int iwidth = width+sb_width; int iwidth = width+sb_width;
if (hint_painted) { if (hint_painted) {
@@ -1081,7 +1082,7 @@ printf("paintHint: icon %s text %s\n", item->hintIcon.c_str(), g_Locale->getText
//details line //details line
int ypos1 = item->getYPosition(); int ypos1 = item->getYPosition();
int ypos1a = ypos1 + (iheight/2)-2; int ypos1a = ypos1 + (iheight/2)-2;
int ypos2a = ypos2 + (hint_height/2)-2; int ypos2a = ypos2 + (hint_height/2) - INFO_BOX_Y_OFFSET;
int markh = hint_height > rad*2 ? hint_height - rad*2 : hint_height; int markh = hint_height > rad*2 ? hint_height - rad*2 : hint_height;
int imarkh = iheight/2+1; int imarkh = iheight/2+1;