CComponentsHeader: fix logo position with clock

This reverts "fix logo position with clock",
commit 9a6fed158c.
Was not the right way.

Id's are not in visual order, therefore it's better to calculate direct
with the ''width"" properties of possible following items clock
and context buttons.


Origin commit data
------------------
Commit: c2bc8b4f8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-26 (Wed, 26 Apr 2017)
This commit is contained in:
2017-04-26 07:51:38 +02:00
parent 9a6fed158c
commit 8ec580d8a6

View File

@@ -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;