mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

cc_frm.cpp, cc_frm_button.cpp: remove unread stored variables

Browse Source
This commit is contained in:
Thilo Graf
2017-08-28 12:16:45 +02:00
parent 758081a0ac
commit fe6a24351b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/components/cc_frm.cpp
View File

@@ -378,7 +378,7 @@ void CComponentsForm::paintCCItems()
size_t items_count = v_cc_items.size(); size_t items_count = v_cc_items.size();
//using of real x/y values to paint items if this text object is bound in a parent form //using of real x/y values to paint items if this text object is bound in a parent form
int this_x = x, auto_x = x, this_y = y, auto_y = y, this_w = width; int this_x = x, auto_x = x, this_y = y, auto_y = y, this_w = 0;
int w_parent_frame = 0; int w_parent_frame = 0;
if (cc_parent){ if (cc_parent){
this_x = auto_x = cc_xr; this_x = auto_x = cc_xr;
@@ -441,7 +441,7 @@ void CComponentsForm::paintCCItems()
} }
//move item x-position, if we have a frame on parent, TODO: other constellations not considered at the moment //move item x-position, if we have a frame on parent, TODO: other constellations not considered at the moment
w_parent_frame = xpos <= fr_thickness ? fr_thickness : 0; w_parent_frame = xpos <= fr_thickness ? fr_thickness : w_parent_frame;
//set required x-position to item: //set required x-position to item:
//append vertical //append vertical
@@ -461,7 +461,7 @@ void CComponentsForm::paintCCItems()
} }
//move item y-position, if we have a frame on parent, TODO: other constellations not considered at the moment //move item y-position, if we have a frame on parent, TODO: other constellations not considered at the moment
w_parent_frame = ypos <= fr_thickness ? fr_thickness : 0; w_parent_frame = ypos <= fr_thickness ? fr_thickness : w_parent_frame;
//set required y-position to item //set required y-position to item
//append hor //append hor

5
src/gui/components/cc_frm_button.cpp
View File

@@ -147,14 +147,15 @@ void CComponentsButton::initIcon()
if (pos == string::npos) if (pos == string::npos)
cc_btn_icon = frameBuffer->getIconPath(cc_btn_icon); cc_btn_icon = frameBuffer->getIconPath(cc_btn_icon);
int y_icon = 0;
int h_icon = 0;
if (cc_btn_icon_obj == NULL){ if (cc_btn_icon_obj == NULL){
cc_btn_icon_obj = new CComponentsPictureScalable(fr_thickness, 0, cc_btn_icon, this); 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->SetTransparent(CFrameBuffer::TM_BLACK);
cc_btn_icon_obj->doPaintBg(false); cc_btn_icon_obj->doPaintBg(false);
} }
int y_icon = cc_btn_icon_obj->getYPos(); h_icon = cc_btn_icon_obj->getHeight();
int h_icon = cc_btn_icon_obj->getHeight();
//get required icon height //get required icon height
int h_max = height-2*fr_thickness; int h_max = height-2*fr_thickness;