From d0352d6aa00cf79f5034853f8c1cc7b5c1a3dfbb Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 2 Feb 2018 20:24:18 +0100 Subject: [PATCH] fix overpaint buttons in channellist edit mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/74d27b1552566ff95a60998b29b4a90dd04b890d Author: max_10 Date: 2018-02-02 (Fri, 02 Feb 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_header.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp index 471ed6827..8679699d3 100644 --- a/src/gui/components/cc_frm_header.cpp +++ b/src/gui/components/cc_frm_header.cpp @@ -309,14 +309,20 @@ void CComponentsHeader::initLogo() */ if (next_item){ if (next_item->getItemType() == CC_ITEMTYPE_FRM_ICONFORM) - next_item = cch_cl_obj; + /* either clock is present + * or in chanellist edit mode + * possible button */ + if (cch_cl_obj) + next_item = cch_cl_obj; + else + next_item = cch_btn_obj; } /* * Adjust usable space for logo. */ int x_logo_left = prev_item ? prev_item->getXPos() + prev_item->getWidth() : cch_offset; - int x_logo_right = next_item ? next_item->getXPos() : width - cch_offset; + int x_logo_right = next_item ? next_item->getXPos() - OFFSET_INNER_MID : width - cch_offset; int logo_space = x_logo_right - x_logo_left; /*