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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
This commit is contained in:
vanhofen
2017-03-03 10:38:14 +01:00
parent a360c99a70 71d742e126
commit 9f3dad285f
18 changed files with 160 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/widget/progresswindow.cpp
View File

@@ -101,8 +101,7 @@ void CProgressWindow::Init( signal<void, size_t, size_t, string> *statusSignal,
//set window height
h_height = ccw_head->getHeight();
ccw_body->setHeight((OFFSET_INNER_MID + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight())*ccw_body->size());
ccw_body->setHeight(ccw_body->back()->getYPos()+ ccw_body->back()->getHeight()+ OFFSET_INNER_MID);
height = max(height, ccw_body->getHeight() + h_height);
//set position on screen
@@ -114,8 +113,8 @@ CProgressBar* CProgressWindow::getProgressItem()
CProgressBar *pBar = new CProgressBar();
pBar->allowPaint(false);
int y_tmp = 0;
for(size_t i = 0; i< ccw_body->size(); i++){
y_tmp += ccw_body->getCCItem(i)->getHeight();
for(size_t i = ccw_body->size()-1; i< ccw_body->size(); i++){
y_tmp += ccw_body->getCCItem(i)->getYPos() + ccw_body->getCCItem(i)->getHeight();
y_tmp += OFFSET_INNER_MID;
}
pBar->setDimensionsAll(OFFSET_INNER_MID, y_tmp, width-2*OFFSET_INNER_MID, g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight());