mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- cc_frm_header: try to fix next_item detection

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2022-06-11 13:48:10 +02:00
committed by Thilo Graf
parent 1beebda581
commit 23e01f43d7
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,20 +323,12 @@ void CComponentsHeader::initLogo()
*/ */
if (next_item) if (next_item)
{ {
if (next_item->getItemType() == CC_ITEMTYPE_FRM_CLOCK) if (cch_pb_obj)
{ next_item = cch_pb_obj;
/* else if (cch_cl_obj)
* Either clock is present or buttons are enabled, next_item = cch_cl_obj;
* different order of objects are required, not optimal else
* but works at the moment. next_item = cch_btn_obj;
*/
if (cch_pb_obj)
next_item = cch_pb_obj;
else if (cch_cl_obj)
next_item = cch_cl_obj;
else
next_item = cch_btn_obj;
}
} }
/* /*
@@ -383,8 +375,10 @@ void CComponentsHeader::initLogo()
if (cch_caption_align & CC_TITLE_RIGHT) if (cch_caption_align & CC_TITLE_RIGHT)
{ {
if (next_item) if (next_item)
{
if (x_logo + w_logo >= next_item->getXPos()) if (x_logo + w_logo >= next_item->getXPos())
x_logo = next_item->getXPos() - logo_space/2 - w_logo/2; x_logo = next_item->getXPos() - logo_space/2 - w_logo/2;
}
} }
} }