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

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

Browse Source 
Origin commit data
------------------
Commit: fdb24232f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
This commit is contained in:
vanhofen
2016-12-12 10:29:42 +01:00
parent 984b4378c1 d8e3657d27
commit 10bf4e8837
32 changed files with 349 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/components/cc_draw.cpp
View File

@@ -668,13 +668,18 @@ void CCDraw::kill(const fb_pixel_t& bg_color, const int& corner_radius, const in
int r = v_fbdata[i].r;
if (corner_radius > -1)
r = corner_radius;
frameBuffer->paintBoxRel(v_fbdata[i].x,
v_fbdata[i].y,
v_fbdata[i].dx,
v_fbdata[i].dy,
bg_color,
r,
corner_type);
if (v_fbdata[i].dx > 0 && v_fbdata[i].dy > 0){
frameBuffer->paintBoxRel(v_fbdata[i].x,
v_fbdata[i].y,
v_fbdata[i].dx,
v_fbdata[i].dy,
bg_color,
r,
corner_type);
}else
dprintf(DEBUG_NORMAL, "\033[33m[CCDraw][%s - %d], WARNING! render with bad dimensions [dx = %d dy = %d]\033[0m\n", __func__, __LINE__, v_fbdata[i].dx, v_fbdata[i].dy );
if (v_fbdata[i].frame_thickness)
frameBuffer->paintBoxFrame(v_fbdata[i].x,
v_fbdata[i].y,

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

@@ -275,14 +275,14 @@ void CComponentsHeader::addContextButton(const int& buttons)
addContextButton(NEUTRINO_ICON_BUTTON_OKAY);
if (buttons & CC_BTN_MUTE)
addContextButton(NEUTRINO_ICON_BUTTON_MUTE);
if (buttons & CC_BTN_TOP)
addContextButton(NEUTRINO_ICON_BUTTON_TOP);
if (buttons & CC_BTN_UP)
addContextButton(NEUTRINO_ICON_BUTTON_UP);
if (buttons & CC_BTN_DOWN)
addContextButton(NEUTRINO_ICON_BUTTON_DOWN);
if (buttons & CC_BTN_RIGHT)
addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
if (buttons & CC_BTN_LEFT)
addContextButton(NEUTRINO_ICON_BUTTON_LEFT);
if (buttons & CC_BTN_RIGHT)
addContextButton(NEUTRINO_ICON_BUTTON_RIGHT);
if (buttons & CC_BTN_FORWARD)
addContextButton(NEUTRINO_ICON_BUTTON_FORWARD);
if (buttons & CC_BTN_BACKWARD)

6
src/gui/components/cc_frm_header.h
View File

@@ -182,10 +182,10 @@ class CComponentsHeader : public CComponentsForm, public CCTextScreen
CC_BTN_MUTE_ZAP_INACTIVE = 0x200,
CC_BTN_OKAY = 0x400,
CC_BTN_MUTE = 0x800,
CC_BTN_TOP = 0x1000,
CC_BTN_UP = 0x1000,
CC_BTN_DOWN = 0x2000,
CC_BTN_RIGHT = 0x4000,
CC_BTN_LEFT = 0x8000,
CC_BTN_LEFT = 0x4000,
CC_BTN_RIGHT = 0x8000,
CC_BTN_FORWARD = 0x10000,
CC_BTN_BACKWARD = 0x20000,
CC_BTN_PAUSE = 0x40000,

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

@@ -82,7 +82,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count)
sb_up_obj = sb_down_obj = NULL;
sb_segments_obj = NULL;
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_TOP) ;
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
sb_down_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);
sb_segments_count = count;