mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 09:51:22 +02:00
Merge remote-tracking branch 'tuxbox/master'
This commit is contained in:
@@ -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();
|
||||
|
@@ -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();
|
||||
|
@@ -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);
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user