mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76574279a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -294,12 +294,15 @@ void CComponentsHeader::initLogo()
|
||||
|
||||
// set id of logo item depends of neighbor items
|
||||
int logo_id = getCCItemId(cch_logo_obj);
|
||||
int next_id = logo_id + 1;
|
||||
int prev_id = logo_id - 1;
|
||||
|
||||
//right end
|
||||
int x_logo_right = getCCItem(next_id) ? getCCItem(next_id)->getXPos() - cch_logo_obj->getWidth() : width - cch_logo_obj->getWidth()-OFFSET_INNER_MID;
|
||||
x_logo_right -= cch_cl_enable ? cch_cl_obj->getWidth() : 0;
|
||||
int x_logo_right = width - cch_logo_obj->getWidth();
|
||||
if (cch_btn_obj)
|
||||
x_logo_right -= cch_btn_obj->getWidth();
|
||||
if (cch_cl_obj)
|
||||
x_logo_right -= cch_cl_obj->getWidth();
|
||||
|
||||
//left end
|
||||
int x_logo_left = getCCItem(prev_id) ? getCCItem(prev_id)->getXPos() + getCCItem(prev_id)->getWidth() : 0;
|
||||
|
||||
|
Reference in New Issue
Block a user