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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 0a75d324ea 51c85e1c58
commit 7dcc90f09f
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1209,13 +1209,13 @@ void CMenuWidget::calcSize()
if(total_pages > 1)
sb_width=SCROLLBAR_WIDTH;
full_width = /*ConnectLineBox_Width+*/width+sb_width+OFFSET_SHADOW;
full_width = /*DETAILSLINE_WIDTH+*/width+sb_width+OFFSET_SHADOW;
full_height = height+RADIUS_LARGE+OFFSET_SHADOW*2 /*+hint_height+OFFSET_INTER*/;
/* + ConnectLineBox_Width for the hintbox connection line
/* + DETAILSLINE_WIDTH for the hintbox connection line
* + 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;
int center_offset = (g_settings.menu_pos == MENU_POS_CENTER) ? DETAILSLINE_WIDTH : 0;
int max_possible = (int)frameBuffer->getScreenWidth() - DETAILSLINE_WIDTH - center_offset - 20;
if (full_width > max_possible)
{
width = max_possible - sb_width - OFFSET_SHADOW;
@@ -1295,13 +1295,13 @@ void CMenuWidget::setMenuPos(const int& menu_width)
case MENU_POS_CENTER:
x = offx + scr_x + ((scr_w - menu_width ) >> 1 );
y = offy + scr_y + ((scr_h - real_h) >> 1 );
x += g_settings.show_menu_hints_line ? ConnectLineBox_Width : 0; //NI
x += g_settings.show_menu_hints_line ? DETAILSLINE_WIDTH : 0; //NI
break;
case MENU_POS_TOP_LEFT:
y = offy + scr_y + 10;
x = offx + scr_x + 10;
x += g_settings.show_menu_hints_line ? ConnectLineBox_Width : 0; //NI
x += g_settings.show_menu_hints_line ? DETAILSLINE_WIDTH : 0; //NI
break;
case MENU_POS_TOP_RIGHT:
@@ -1312,7 +1312,7 @@ void CMenuWidget::setMenuPos(const int& menu_width)
case MENU_POS_BOTTOM_LEFT:
y = /*offy +*/ scr_y + scr_h - real_h - 10;
x = offx + scr_x + 10;
x += g_settings.show_menu_hints_line ? ConnectLineBox_Width : 0; //NI
x += g_settings.show_menu_hints_line ? DETAILSLINE_WIDTH : 0; //NI
break;
case MENU_POS_BOTTOM_RIGHT:
@@ -1412,14 +1412,14 @@ void CMenuWidget::saveScreen()
saveScreen_x = x;
background = new fb_pixel_t [saveScreen_height * saveScreen_width];
if(background)
frameBuffer->SaveScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
frameBuffer->SaveScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
void CMenuWidget::restoreScreen()
{
if(background) {
if(savescreen)
frameBuffer->RestoreScreen(saveScreen_x /*-ConnectLineBox_Width*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
frameBuffer->RestoreScreen(saveScreen_x /*-DETAILSLINE_WIDTH*/, saveScreen_y, saveScreen_width, saveScreen_height, background);
}
}
@@ -1476,7 +1476,7 @@ void CMenuWidget::paintHint(int pos)
int iheight = item->getHeight();
int rad = RADIUS_LARGE;
int xpos = x - ConnectLineBox_Width;
int xpos = x - DETAILSLINE_WIDTH;
int ypos2 = y + height + fbutton_height + rad + OFFSET_SHADOW + OFFSET_INTER;
int iwidth = width+sb_width;
@@ -1489,7 +1489,7 @@ void CMenuWidget::paintHint(int pos)
//init details line
if (details_line == NULL)
details_line = new CComponentsDetailLine();
details_line = new CComponentsDetailsLine();
details_line->setXPos(xpos);
details_line->setYPos(ypos1a);