mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source
This commit is contained in:
Thilo Graf
2017-04-23 17:06:58 +02:00
parent 5cc587b8a8 330171c90b
commit a11f5e07c2
7 changed files with 48 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/channellist.cpp
View File

@@ -2119,6 +2119,7 @@ void CChannelList::paintHead()
}
header->setDimensionsAll(x, y, full_width, theight);
header->setCorner(RADIUS_LARGE, CORNER_TOP);
if (bouquet && bouquet->zapitBouquet && bouquet->zapitBouquet->bLocked != g_settings.parentallock_defaultlocked)
header->setIcon(NEUTRINO_ICON_LOCK);

1
src/gui/color.h
View File

@@ -124,6 +124,7 @@
#define COL_FRAME_PLUS_0 COL_FRAME
#define COL_SCROLLBAR COL_MENUCONTENT_PLUS_1
#define COL_SCROLLBAR_PLUS_0 COL_SCROLLBAR
#define COL_SCROLLBAR_ACTIVE COL_MENUCONTENT_PLUS_3
#define COL_SCROLLBAR_ACTIVE_PLUS_0 COL_SCROLLBAR_ACTIVE
#define COL_SCROLLBAR_PASSIVE COL_MENUCONTENT_PLUS_2

13
src/gui/components/cc_frm_header.cpp
View File

@@ -274,7 +274,7 @@ void CComponentsHeader::initIcon()
void CComponentsHeader::initLogo()
{
cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_SMALL : cch_logo.dy_max;
cch_logo.dy_max = cch_logo.dy_max == -1 ? height - 2*OFFSET_INNER_MIN : cch_logo.dy_max;
if(!cch_logo_obj)
cch_logo_obj = new CComponentsChannelLogoScalable(width/2, height/2 - cch_logo.dy_max/2, cch_logo.Name, cch_logo.Id, this);
@@ -307,8 +307,15 @@ void CComponentsHeader::initLogo()
x_logo = x_logo_right;
if (cch_logo.Align == CC_LOGO_LEFT)
x_logo = x_logo_left;
if (cch_logo.Align == CC_LOGO_CENTER)
x_logo = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
if (cch_logo.Align == CC_LOGO_CENTER){
x_logo = width/2 - cch_logo_obj->getWidth()/2;
//fallback if previous item and logo are overlapping
if (getCCItem(prev_id)){
int x_tmp = x_logo_left + logo_space/2 - cch_logo_obj->getWidth()/2;
if (x_logo <= x_logo_left)
x_logo = x_tmp;
}
}
cch_logo_obj->setXPos(x_logo);
cch_logo_obj->setYPos(height/2 - cch_logo_obj->getHeight()/2);

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

@@ -79,11 +79,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
* usual paraemters:
* @param[in] parent optional, exepts type pointer to a parent CComponentsForm object, default NULL
* @param[in] shadow_mode optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_shadow optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
*/
CComponentsScrollBar( const int &x_pos,
const int &y_pos,
@@ -92,11 +92,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
const int& count = 1,
CComponentsForm *parent = NULL,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_SCROLLBAR,
fb_pixel_t color_body = COL_SCROLLBAR,
fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE);
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0);
// ~CComponentsScrollBar(); //inherited from CComponentsForm
/**Set current page number
@@ -158,11 +158,11 @@ class CComponentsScrollBar : public CComponentsFrmChain
* usual paraemters:
* @param[in] parent optional, exepts type pointer to a parent CComponentsForm object, default NULL
* @param[in] shadow_mode optional, exepts type int defined by shadow mode enums, default CC_SHADOW_OFF
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
* @param[in] color_frame optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_body optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PLUS_0
* @param[in] color_shadow optional, exepts type fb_pixel_t, default COL_SHADOW_PLUS_0
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE
* @param[in] color_select optional, exepts type fb_pixel_t, default COL_SCROLLBAR_ACTIVE_PLUS_0
* @param[in] color_passive optional, exepts type fb_pixel_t, default COL_SCROLLBAR_PASSIVE_PLUS_0
*/
void paintScrollBar( const int &x_pos,
const int &y_pos,
@@ -171,10 +171,10 @@ void paintScrollBar( const int &x_pos,
const int& count,
const int& current_num,
int shadow_mode = CC_SHADOW_OFF,
fb_pixel_t color_frame = COL_SCROLLBAR,
fb_pixel_t color_body = COL_SCROLLBAR,
fb_pixel_t color_frame = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_body = COL_SCROLLBAR_PLUS_0,
fb_pixel_t color_shadow = COL_SHADOW_PLUS_0,
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE);
fb_pixel_t color_select = COL_SCROLLBAR_ACTIVE_PLUS_0,
fb_pixel_t color_passive = COL_SCROLLBAR_PASSIVE_PLUS_0);
#endif

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 72
#define LUA_API_VERSION_MINOR 73

2
src/gui/lua/luainstance.cpp
View File

@@ -175,6 +175,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTINACTIVE", MAGIC_COLOR | (COL_MENUCONTENTINACTIVE) },
{ "MENUFOOT", MAGIC_COLOR | (COL_MENUFOOT) },
{ "FRAME", MAGIC_COLOR | (COL_FRAME) },
{ "SCROLLBAR", MAGIC_COLOR | (COL_SCROLLBAR) },
{ "SCROLLBAR_ACTIVE", MAGIC_COLOR | (COL_SCROLLBAR_ACTIVE) },
{ "SCROLLBAR_PASSIVE", MAGIC_COLOR | (COL_SCROLLBAR_PASSIVE) },
{ "PROGRESSBAR_ACTIVE", MAGIC_COLOR | (COL_PROGRESSBAR_ACTIVE) },
@@ -226,6 +227,7 @@ static void set_lua_variables(lua_State *L)
{ "MENUCONTENTINACTIVE_PLUS_0", (lua_Unsigned) (COL_MENUCONTENTINACTIVE_PLUS_0) },
{ "MENUFOOT_PLUS_0", (lua_Unsigned) (COL_MENUFOOT_PLUS_0) },
{ "FRAME_PLUS_0", (lua_Unsigned) (COL_FRAME_PLUS_0) },
{ "SCROLLBAR_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PLUS_0) },
{ "SCROLLBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_ACTIVE_PLUS_0) },
{ "SCROLLBAR_PASSIVE_PLUS_0", (lua_Unsigned) (COL_SCROLLBAR_PASSIVE_PLUS_0) },
{ "PROGRESSBAR_ACTIVE_PLUS_0", (lua_Unsigned) (COL_PROGRESSBAR_ACTIVE_PLUS_0) },

7
src/gui/upnpbrowser.cpp
View File

@@ -941,6 +941,7 @@ void CUpnpBrowserGui::paintDeviceInfo()
tmp += m_devices[m_selecteddevice].modelurl;
topbox.setDimensionsAll(m_x, m_y, m_width, m_topbox_height);
topbox.setCorner(RADIUS_LARGE);
topbox.setText(tmp, CTextBox::AUTO_WIDTH);
topbox.paint0();
}
@@ -991,7 +992,7 @@ void CUpnpBrowserGui::paintDevices()
header.addContextButton(NEUTRINO_ICON_BUTTON_MUTE_SMALL);
else
header.removeContextButtons();
//header.enableShadow();
header.setCorner(RADIUS_LARGE, CORNER_TOP);
header.paint(CC_SAVE_SCREEN_NO);
// Items
@@ -1012,6 +1013,7 @@ void CUpnpBrowserGui::paintDevices()
m_frameBuffer->paintBoxRel(m_x + m_width, m_item_y + OFFSET_SHADOW, OFFSET_SHADOW, sb, COL_SHADOW_PLUS_0);
// Foot
footer.setCorner(RADIUS_LARGE, CORNER_BOTTOM);
footer.paintButtons(m_x, m_footer_y, m_width, m_footer_height, 1, &RescanButton, m_width/2);
paintItem2DetailsLine(-1); // clear it
@@ -1148,6 +1150,7 @@ void CUpnpBrowserGui::paintItemInfo(UPnPEntry *entry)
}
}
topbox.setCorner(RADIUS_LARGE);
topbox.setText(tmp, CTextBox::AUTO_WIDTH);
topbox.paint0();
}
@@ -1197,7 +1200,9 @@ void CUpnpBrowserGui::paintDetails(UPnPEntry *entry, bool use_playing)
char tmp_time[] = "000:00";
int timebox_width = timebox.getFont()->getRenderWidth(tmp_time) + OFFSET_INNER_MID*2;
infobox.setDimensionsAll(m_x, m_infobox_y, m_width - OFFSET_SHADOW - OFFSET_INTER - timebox_width, m_infobox_height);
infobox.setCorner(RADIUS_LARGE);
timebox.setDimensionsAll(m_x + m_width - timebox_width, infobox.getYPos(), timebox_width, m_infobox_height);
timebox.setCorner(RADIUS_LARGE);
printf("paintDetails: use_playing %d shown %d\n", use_playing, m_playing_entry_is_shown);
if ((!use_playing) && entry->isdir){