mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
src/gui/components/cc_frm_footer.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)
This commit is contained in:
@@ -147,14 +147,15 @@ void CComponentsButton::initIcon()
|
||||
if (pos == string::npos)
|
||||
cc_btn_icon = frameBuffer->getIconPath(cc_btn_icon);
|
||||
|
||||
int y_icon = 0;
|
||||
int h_icon = 0;
|
||||
if (cc_btn_icon_obj == NULL){
|
||||
cc_btn_icon_obj = new CComponentsPictureScalable(fr_thickness, 0, cc_btn_icon, this);
|
||||
cc_btn_icon_obj->SetTransparent(CFrameBuffer::TM_BLACK);
|
||||
cc_btn_icon_obj->doPaintBg(false);
|
||||
}
|
||||
|
||||
int y_icon = cc_btn_icon_obj->getYPos();
|
||||
int h_icon = cc_btn_icon_obj->getHeight();
|
||||
h_icon = cc_btn_icon_obj->getHeight();
|
||||
|
||||
//get required icon height
|
||||
int h_max = height-2*fr_thickness;
|
||||
|
Reference in New Issue
Block a user