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: fix paintCCItems() y position calculation

Browse Source
This commit is contained in:
Stefan Seyfried
2018-02-17 22:25:57 +01:00
committed by Thilo Graf
parent 5ed4057533
commit 405d77565d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,6 +432,13 @@ void CComponentsForm::paintCCItems()
//get current dimension of item //get current dimension of item
int w_item = cc_item->getWidth() - (xpos <= fr_thickness ? fr_thickness : 0); int w_item = cc_item->getWidth() - (xpos <= fr_thickness ? fr_thickness : 0);
int h_item = cc_item->getHeight() - (ypos <= fr_thickness ? fr_thickness : 0); int h_item = cc_item->getHeight() - (ypos <= fr_thickness ? fr_thickness : 0);
/* this happens for example with opkg manager's "package info" screen on a SD framebuffer (704x576)
* later CC_CENTERED auto_y calculation is wrong then */
if (cc_item->getHeight() > height) {
cc_item->setHeight(height);
// TODO: the fr_thickness is probably wrong for ypos < 0 (CC_CENTERED / CC_APPEND)
h_item = cc_item->getHeight() - (ypos <= fr_thickness ? fr_thickness : 0);
}
//check item for corrupt position, skip current item if found problems //check item for corrupt position, skip current item if found problems
if (ypos > height || xpos > this_w){ if (ypos > height || xpos > this_w){
@@ -468,6 +475,7 @@ void CComponentsForm::paintCCItems()
//append hor //append hor
if (ypos == CC_APPEND){ if (ypos == CC_APPEND){
auto_y += append_y_offset; auto_y += append_y_offset;
// FIXME: ypos is probably wrong here, because it is -1
cc_item->setRealYPos(auto_y + ypos + w_parent_frame); cc_item->setRealYPos(auto_y + ypos + w_parent_frame);
auto_y += h_item; auto_y += h_item;
} }