qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 13:48:06 +02:00
Code

Minor cleanups in Selector::exec

Browse Source 
Declare variables where they are needed instead of way in advance.
This commit is contained in:
Maarten ter Huurne 2014-08-12 07:16:25 +02:00
parent b15175b05b
commit 3305cf289b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/selector.cpp
View File

@ -52,9 +52,6 @@ Selector::Selector(GMenu2X *gmenu2x, LinkApp *link, const string &selectorDir) :
} }
int Selector::exec(int startSelection) { int Selector::exec(int startSelection) {
bool close = false, result = true;
vector<string> screens, titles;
FileLister fl(dir, link->getSelectorBrowser()); FileLister fl(dir, link->getSelectorBrowser());
fl.setFilter(link->getSelectorFilter()); fl.setFilter(link->getSelectorFilter());
fl.browse(); fl.browse();
@ -85,15 +82,18 @@ int Selector::exec(int startSelection) {
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();
uint i, firstElement = 0, iY; unsigned int firstElement = 0;
unsigned int selected = constrain(startSelection, 0, fl.size() - 1);
vector<string> screens, titles;
prepare(&fl,&screens,&titles); prepare(&fl,&screens,&titles);
uint selected = constrain(startSelection,0,fl.size()-1);
//Add the folder icon manually to be sure to load it with alpha support since we are going to disable it for screenshots //Add the folder icon manually to be sure to load it with alpha support since we are going to disable it for screenshots
if (gmenu2x->sc.skinRes("imgs/folder.png")==NULL) if (gmenu2x->sc.skinRes("imgs/folder.png")==NULL)
gmenu2x->sc.addSkinRes("imgs/folder.png"); gmenu2x->sc.addSkinRes("imgs/folder.png");
gmenu2x->sc.defaultAlpha = false; gmenu2x->sc.defaultAlpha = false;
bool close = false, result = true;
while (!close) { while (!close) {
OutputSurface& s = *gmenu2x->s; OutputSurface& s = *gmenu2x->s;
@ -114,13 +114,13 @@ int Selector::exec(int startSelection) {
} }
//Selection //Selection
iY = top + (selected - firstElement) * fontheight; unsigned int iY = top + (selected - firstElement) * fontheight;
if (selected<fl.size()) if (selected<fl.size())
s.box(1, iY, 309, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]); s.box(1, iY, 309, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
//Files & Dirs //Files & Dirs
s.setClipRect(0, top, 311, height); s.setClipRect(0, top, 311, height);
for (i = firstElement; i < fl.size() for (unsigned int i = firstElement; i < fl.size()
&& i < firstElement + nb_elements; i++) { && i < firstElement + nb_elements; i++) {
iY = i-firstElement; iY = i-firstElement;
if (fl.isDirectory(i)) { if (fl.isDirectory(i)) {