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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a8f7b4d3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-13 (Tue, 13 Sep 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-13 12:26:20 +02:00
parent 74bde17a63 19584ed330
commit 74213795ac
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer.cpp
View File

@@ -1387,9 +1387,11 @@ void CFrameBuffer::paintBoxFrame(const int x, const int y, const int dx, const i
return; return;
if (dx == 0 || dy == 0) { if (dx == 0 || dy == 0) {
printf("paintBoxFrame: radius %d, start x %d y %d end x %d y %d\n", radius, x, y, x+dx, y+dy); dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __func__, __LINE__, radius, x, y, x+dx, y+dy);
return; return;
} }
if (radius < 0)
dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: WARNING! radius < 0 [%d] FIXIT\n", __func__, __LINE__, radius);
setCornerFlags(type); setCornerFlags(type);
int rad_tl = 0, rad_tr = 0, rad_bl = 0, rad_br = 0; int rad_tl = 0, rad_tr = 0, rad_bl = 0, rad_br = 0;

2
src/gui/components/cc_draw.h
View File

@@ -254,6 +254,8 @@ class CCDraw : public COSDFader, public CComponentsSignals
virtual void enableShadow(int mode = CC_SHADOW_ON, const int& shadow_width = -1, bool force_paint = false); virtual void enableShadow(int mode = CC_SHADOW_ON, const int& shadow_width = -1, bool force_paint = false);
///switch shadow off ///switch shadow off
virtual void disableShadow(){enableShadow(CC_SHADOW_OFF);} virtual void disableShadow(){enableShadow(CC_SHADOW_OFF);}
///return current schadow width
int getShadowWidth(){return shadow_w;}
///paint caching for body and shadow, see also cc_paint_cache NOTE: has no effect if paint_bg = false ///paint caching for body and shadow, see also cc_paint_cache NOTE: has no effect if paint_bg = false
virtual void enablePaintCache(bool enable = true); virtual void enablePaintCache(bool enable = true);

14
src/gui/components/cc_frm_footer.cpp
View File

@@ -133,15 +133,15 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
//generate and add button objects passed from button label content with default width to chain object. //generate and add button objects passed from button label content with default width to chain object.
for (size_t i= 0; i< label_count; i++){ for (size_t i= 0; i< label_count; i++){
string txt = content[i].text; string txt = content[i].text;
string btn_name = string(content[i].button); string icon_name = string(content[i].button);
//ignore item, if no text and icon are defined; //ignore item, if no text and icon are defined;
if (txt.empty() && btn_name.empty()){ if (txt.empty() && icon_name.empty()){
dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%d], no icon and text defined!\n", __func__, __LINE__, i); dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%d], no icon and text defined!\n", __func__, __LINE__, i);
continue; continue;
} }
CComponentsButton *btn = new CComponentsButton(0, CC_CENTERED, w_btn_min, (btn_contour ? height-2*fr_thickness : height), txt, btn_name); CComponentsButton *btn = new CComponentsButton(0, CC_CENTERED, w_btn_min, (btn_contour ? height-2*fr_thickness : height), txt, icon_name);
btn->setButtonFont(ccf_btn_font); btn->setButtonFont(ccf_btn_font);
btn->doPaintBg(btn_contour); btn->doPaintBg(btn_contour);
btn->enableFrame(btn_contour); btn->enableFrame(btn_contour);
@@ -153,13 +153,13 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
//set button frames to icon color, predefined for available color buttons //set button frames to icon color, predefined for available color buttons
if (btn_auto_frame_col){ if (btn_auto_frame_col){
fb_pixel_t f_col = btn->getColorFrame(); fb_pixel_t f_col = btn->getColorFrame();
if (btn_name == NEUTRINO_ICON_BUTTON_RED) if (icon_name == NEUTRINO_ICON_BUTTON_RED)
f_col = COL_DARK_RED; f_col = COL_DARK_RED;
if (btn_name == NEUTRINO_ICON_BUTTON_GREEN) if (icon_name == NEUTRINO_ICON_BUTTON_GREEN)
f_col = COL_DARK_GREEN; f_col = COL_DARK_GREEN;
if (btn_name == NEUTRINO_ICON_BUTTON_YELLOW) if (icon_name == NEUTRINO_ICON_BUTTON_YELLOW)
f_col = COL_OLIVE; f_col = COL_OLIVE;
if (btn_name == NEUTRINO_ICON_BUTTON_BLUE) if (icon_name == NEUTRINO_ICON_BUTTON_BLUE)
f_col = COL_DARK_BLUE; f_col = COL_DARK_BLUE;
btn->setColorFrame(f_col); btn->setColorFrame(f_col);
} }