mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-10 23:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponentsHeader: use internal offset instead OFFSET_INNER_MID

Browse Source 
Internal offset is already defined.


Origin commit data
------------------
Commit: 80b735494b
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-02-07 (Wed, 07 Feb 2018)
This commit is contained in:
Thilo Graf
2018-02-07 15:50:00 +01:00
committed by vanhofen
parent e2661e4dcd
commit 5744111b34
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
Copyright (C) 2001 by Steffen Hehn 'McClean' Copyright (C) 2001 by Steffen Hehn 'McClean'
Classes for generic GUI-related components. Classes for generic GUI-related components.
Copyright (C) 2012, 2013, 2014 Thilo Graf 'dbt' Copyright (C) 2012-2018 Thilo Graf 'dbt'
Copyright (C) 2012, Michael Liebmann 'micha-bbg' Copyright (C) 2012, Michael Liebmann 'micha-bbg'
License: GPL License: GPL
@@ -309,9 +309,11 @@ void CComponentsHeader::initLogo()
*/ */
if (next_item){ if (next_item){
if (next_item->getItemType() == CC_ITEMTYPE_FRM_ICONFORM){ if (next_item->getItemType() == CC_ITEMTYPE_FRM_ICONFORM){
/* either clock is present /*
* or in chanellist edit mode * Either clock is present or buttons are enabled,
* possible button */ * different order of objects are required, not optimal
* but works at the moment.
*/
if (cch_cl_obj) if (cch_cl_obj)
next_item = cch_cl_obj; next_item = cch_cl_obj;
else else
@@ -323,7 +325,7 @@ void CComponentsHeader::initLogo()
* Adjust usable space for logo. * Adjust usable space for logo.
*/ */
int x_logo_left = prev_item ? prev_item->getXPos() + prev_item->getWidth() : cch_offset; int x_logo_left = prev_item ? prev_item->getXPos() + prev_item->getWidth() : cch_offset;
int x_logo_right = next_item ? next_item->getXPos() - OFFSET_INNER_MID : width - cch_offset; int x_logo_right = next_item ? next_item->getXPos() - cch_offset : width - cch_offset;
int logo_space = x_logo_right - x_logo_left; int logo_space = x_logo_right - x_logo_left;
/* /*