Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-01-30 21:36:09 +01:00
23 changed files with 122 additions and 77 deletions

View File

@@ -88,8 +88,6 @@ CComponentsDetailLine::~CComponentsDetailLine()
//paint details line with current parameters
void CComponentsDetailLine::paint(bool do_save_bg)
{
cc_save_bg = do_save_bg;
hide();
if (hasChanges())
clearFbData();

View File

@@ -157,7 +157,7 @@ void CComponentsWindow::initVarWindow( const int& x_pos, const int& y_pos, const
ccw_col_head = COL_MENUHEAD_PLUS_0;
ccw_col_head_text = COL_MENUHEAD_TEXT;
ccw_col_footer = COL_MENUFOOT_PLUS_0;
cc_parent = NULL;
page_scroll_mode = PG_SCROLL_M_OFF; //permanent disabled here, only in body used!
initCCWItems();

View File

@@ -50,6 +50,7 @@ CComponentsItem::CComponentsItem(CComponentsForm* parent)
cc_item_selected = false;
cc_page_number = 0;
cc_has_focus = true;
cc_parent = NULL;
initParent(parent);
}

View File

@@ -386,6 +386,8 @@ CComponentsChannelLogo::CComponentsChannelLogo( const int &x_pos, const int &y_p
void CComponentsChannelLogo::init(const uint64_t& channelId, const std::string& channelName, bool allow_scale)
{
channel_name = "";
channel_id = 0;
alt_pic_name = "";
setChannel(channelId, channelName);
do_scale = allow_scale;