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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-29 15:15:34 +01:00
parent 5ffe34cea9 c82c519ae2
commit 45d33bdf00
51 changed files with 509 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1211,7 +1211,7 @@ void CMenuWidget::calcSize()
//scrollbar width
sb_width=0;
if(total_pages > 1)
sb_width=15;
sb_width=SCROLLBAR_WIDTH;
full_width = /*ConnectLineBox_Width+*/width+sb_width+OFFSET_SHADOW;
full_height = height+RADIUS_LARGE+OFFSET_SHADOW*2 /*+hint_height+OFFSET_INTER*/;
@@ -1265,6 +1265,7 @@ void CMenuWidget::paint()
header->enableShadow(CC_SHADOW_RIGHT | CC_SHADOW_CORNER_TOP_RIGHT | CC_SHADOW_CORNER_BOTTOM_RIGHT);
header->setOffset(10);
}
header->setCaption(getName());
header->setColorAll(COL_FRAME_PLUS_0, COL_MENUHEAD_PLUS_0, COL_SHADOW_PLUS_0);
header->setCaptionColor(COL_MENUHEAD_TEXT);
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0);
@@ -1342,9 +1343,9 @@ void CMenuWidget::paintItems()
if(total_pages>1)
{
int item_height=height-(item_start_y-y);
paintScrollBar(x+ width, item_start_y, 15, item_height, total_pages, current_page);
// /* background of menu items, paint every time because different items can have
// * different height and this might leave artifacts otherwise after changing pages */
paintScrollBar(x+ width, item_start_y, sb_width, item_height, total_pages, current_page);
/* background of menu items, paint every time because different items can have
* different height and this might leave artifacts otherwise after changing pages */
frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0);
}