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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f06fa4d0e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 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-25 00:24:09 +02:00
parent 8eb8363f97 d35f8b74df
commit c2cc0f4f54
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm_button.cpp
View File

@@ -100,7 +100,7 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const
width = w; width = w;
height = h; height = h;
shadow = shadow_mode; shadow = shadow_mode;
shadow_w = SHADOW_OFFSET/2; //buttons are mostly small elements, so these elements should have a reasonable shadow width shadow_w = shadow ? SHADOW_OFFSET/2 : 0; //buttons are mostly small elements, so these elements should have a reasonable shadow width
cc_body_gradient_enable = CC_COLGRAD_OFF/*g_settings.gradiant*/; //TODO: gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient cc_body_gradient_enable = CC_COLGRAD_OFF/*g_settings.gradiant*/; //TODO: gradient is prepared for use but disabled at the moment till some other parts of gui parts are provide gradient
setColBodyGradient(cc_body_gradient_enable/*CColorGradient::gradientLight2Dark*/, CFrameBuffer::gradientVertical, CColorGradient::light); setColBodyGradient(cc_body_gradient_enable/*CColorGradient::gradientLight2Dark*/, CFrameBuffer::gradientVertical, CColorGradient::light);
@@ -127,8 +127,8 @@ void CComponentsButton::initVarButton( const int& x_pos, const int& y_pos, const
cc_btn_result = -1; cc_btn_result = -1;
cc_btn_alias = -1; cc_btn_alias = -1;
initParent(parent);
initCCBtnItems(); initCCBtnItems();
initParent(parent);
} }
void CComponentsButton::initIcon() void CComponentsButton::initIcon()

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

@@ -68,7 +68,6 @@ void CComponentsFooter::initVarFooter( const int& x_pos, const int& y_pos, const
width = w == 0 ? frameBuffer->getScreenWidth(true) : w; width = w == 0 ? frameBuffer->getScreenWidth(true) : w;
//init footer height //init footer height
cch_font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT];
height = max(h, cch_font->getHeight()); height = max(h, cch_font->getHeight());
shadow = shadow_mode; shadow = shadow_mode;

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

@@ -86,6 +86,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
fb_pixel_t color_shadow) fb_pixel_t color_shadow)
{ {
cc_item_type = CC_ITEMTYPE_FRM_HEADER; cc_item_type = CC_ITEMTYPE_FRM_HEADER;
clear();
cc_txt_save_screen = false; cc_txt_save_screen = false;
x = x_old = x_pos; x = x_old = x_pos;
y = y_old = y_pos; y = y_old = y_pos;
@@ -194,7 +195,7 @@ void CComponentsHeader::setIcon(const char* icon_name)
void CComponentsHeader::setIcon(const std::string& icon_name) void CComponentsHeader::setIcon(const std::string& icon_name)
{ {
cch_icon_name = icon_name; cch_icon_name = icon_name;
initIcon(); initIcon();
} }
@@ -203,10 +204,8 @@ void CComponentsHeader::initIcon()
//init cch_icon_obj only if an icon available //init cch_icon_obj only if an icon available
if (cch_icon_name.empty()) { if (cch_icon_name.empty()) {
cch_icon_w = 0; cch_icon_w = 0;
if (cch_icon_obj){ if (cch_icon_obj)
delete cch_icon_obj; removeCCItem(cch_icon_obj);
cch_icon_obj = NULL;
}
return; return;
} }

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

@@ -273,7 +273,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
} }
CComponentsShapeSquare col(stringstartposOption, y + 2, dx - stringstartposOption + x - 2, item_height - 4, NULL, false, right_frame_col, right_bg_col); CComponentsShapeSquare col(stringstartposOption, y + 2, dx - stringstartposOption + x - 2, item_height - 4, NULL, false, right_frame_col, right_bg_col);
col.setFrameThickness(1); //NI col.setFrameThickness(1); //NI
col.setCorner(RADIUS_LARGE); col.setCorner(RADIUS_SMALL);
col.paint(false); col.paint(false);
} }
if (*right_text) { if (*right_text) {