mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/widget/navibar.cpp/h: fix icon scale

Browse Source 
Remove CComponentsPictureScalable class, is not longer required.
Scale for navi button icons should working now.

Note:
It is not sure if the setting of OFFSET_INNER_MID makes sense here,
because it is possible that a scaling could happen even though
the icon would be fit.
This commit is contained in:
Thilo Graf
2018-01-23 15:08:16 +01:00
parent bae07b95e7
commit c18613500a
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widget/navibar.cpp
View File

@@ -3,7 +3,7 @@
Copyright (C) 2001 by Steffen Hehn 'McClean' Copyright (C) 2001 by Steffen Hehn 'McClean'
Class for epg window navigation bar. Class for epg window navigation bar.
Copyright (C) 2017, Thilo Graf 'dbt' Copyright (C) 2017-2018, Thilo Graf 'dbt'
License: GPL License: GPL
@@ -68,10 +68,14 @@ void CNaviBar::initCCItems()
int mid_width = width * 40 / 100; // 40% int mid_width = width * 40 / 100; // 40%
int side_width = ((width - mid_width) / 2) - (2 * x_off); int side_width = ((width - mid_width) / 2) - (2 * x_off);
int h_text = height; int h_text = height;
int icon_h, icon_w;
// init left arrow // init left arrow
if (!nb_lpic){ if (!nb_lpic){
nb_lpic = new CComponentsPictureScalable(x_off,CC_CENTERED,NEUTRINO_ICON_BUTTON_LEFT); nb_lpic = new CComponentsPicture(x_off,CC_CENTERED, CFrameBuffer::getInstance()->getIconPath(NEUTRINO_ICON_BUTTON_LEFT));
nb_lpic->getRealSize(&icon_h, &icon_w);
if ((icon_h + 2*OFFSET_INNER_MIN) > (height + 2*OFFSET_INNER_MIN))
nb_lpic->setHeight(height - 2*OFFSET_INNER_MIN, true);
nb_lpic->doPaintBg(false); nb_lpic->doPaintBg(false);
this->addCCItem(nb_lpic); this->addCCItem(nb_lpic);
nb_lpic->enableSaveBg(); nb_lpic->enableSaveBg();
@@ -80,8 +84,10 @@ void CNaviBar::initCCItems()
// init right arrow // init right arrow
if (!nb_rpic){ if (!nb_rpic){
nb_rpic = new CComponentsPictureScalable(0,CC_CENTERED,NEUTRINO_ICON_BUTTON_RIGHT); nb_rpic = new CComponentsPicture(0,CC_CENTERED, CFrameBuffer::getInstance()->getIconPath(NEUTRINO_ICON_BUTTON_RIGHT));
nb_rpic->getRealSize(&icon_h, &icon_w);
if ((icon_h + 2*OFFSET_INNER_MIN) > (height + 2*OFFSET_INNER_MIN))
nb_rpic->setHeight(height - 2*OFFSET_INNER_MIN, true);
nb_rpic->doPaintBg(false); nb_rpic->doPaintBg(false);
this->addCCItem(nb_rpic); this->addCCItem(nb_rpic);
nb_rpic->enableSaveBg(); nb_rpic->enableSaveBg();

2
src/gui/widget/navibar.h
View File

@@ -38,7 +38,7 @@
class CNaviBar : public CComponentsFrmChain class CNaviBar : public CComponentsFrmChain
{ {
private: private:
CComponentsPictureScalable *nb_lpic, *nb_rpic; CComponentsPicture *nb_lpic, *nb_rpic;
CComponentsText *nb_lText, *nb_rText; CComponentsText *nb_lText, *nb_rText;
Font *nb_font; Font *nb_font;