mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 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-20 21:40:42 +01:00
parent f1b0f2be3f 98fb189edc
commit ba43886fb8
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libtuxtxt/tuxtxt_common.h
View File

@@ -309,7 +309,7 @@ void tuxtxt_decode_adip() /* additional information table */
#endif #endif
} /* next adip page i */ } /* next adip page i */
while (!tuxtxt_cache.adippg[tuxtxt_cache.maxadippg] && (tuxtxt_cache.maxadippg >= 0)) /* and shrink table */ while ((tuxtxt_cache.maxadippg >= 0) && !tuxtxt_cache.adippg[tuxtxt_cache.maxadippg]) /* and shrink table */
tuxtxt_cache.maxadippg--; tuxtxt_cache.maxadippg--;
} }
/****************************************************************************** /******************************************************************************

1
src/gui/components/cc_frm_scrollbar.cpp
View File

@@ -25,7 +25,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include "cc_frm_scrollbar.h" #include "cc_frm_scrollbar.h"
#include "system/debug.h" #include "system/debug.h"

4
src/gui/components/cc_frm_scrollbar.h
View File

@@ -24,6 +24,8 @@
#ifndef __CC_FORM_SCROLLBAR_H__ #ifndef __CC_FORM_SCROLLBAR_H__
#define __CC_FORM_SCROLLBAR_H__ #define __CC_FORM_SCROLLBAR_H__
#include <global.h>
#include "cc_frm_chain.h" #include "cc_frm_chain.h"
#include "cc_item_picture.h" #include "cc_item_picture.h"
@@ -77,7 +79,7 @@ class CComponentsScrollBar : public CComponentsFrmChain
*/ */
CComponentsScrollBar( const int &x_pos, CComponentsScrollBar( const int &x_pos,
const int &y_pos, const int &y_pos,
const int &w = 15, const int &w = SCROLLBAR_WIDTH,
const int &h = 0, const int &h = 0,
const int& count = 1, const int& count = 1,
CComponentsForm *parent = NULL, CComponentsForm *parent = NULL,

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

@@ -1212,7 +1212,7 @@ void CMenuWidget::calcSize()
//scrollbar width //scrollbar width
sb_width=0; sb_width=0;
if(total_pages > 1) if(total_pages > 1)
sb_width=15; sb_width=SCROLLBAR_WIDTH;
full_width = /*ConnectLineBox_Width+*/width+sb_width+OFFSET_SHADOW; full_width = /*ConnectLineBox_Width+*/width+sb_width+OFFSET_SHADOW;
full_height = height+RADIUS_LARGE+OFFSET_SHADOW*2 /*+hint_height+OFFSET_INTER*/; full_height = height+RADIUS_LARGE+OFFSET_SHADOW*2 /*+hint_height+OFFSET_INTER*/;
@@ -1343,9 +1343,9 @@ void CMenuWidget::paintItems()
if(total_pages>1) if(total_pages>1)
{ {
int item_height=height-(item_start_y-y); int item_height=height-(item_start_y-y);
paintScrollBar(x+ width, item_start_y, 15, item_height, total_pages, current_page); 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 /* background of menu items, paint every time because different items can have
// * different height and this might leave artifacts otherwise after changing pages */ * different height and this might leave artifacts otherwise after changing pages */
frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0); frameBuffer->paintBoxRel(x,item_start_y, width,item_height, COL_MENUCONTENT_PLUS_0);
} }

2
src/system/settings.h
View File

@@ -972,6 +972,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_MIN 2 #define OFFSET_INNER_MIN 2
#define OFFSET_INNER_NONE 0 #define OFFSET_INNER_NONE 0
#define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN
struct SglobalInfo struct SglobalInfo
{ {
unsigned char box_Type; unsigned char box_Type;