Date:2014-08-12 07:16:25 (9 years 7 months ago)
Author:Maarten ter Huurne
Commit:3305cf289b8957936a2b529f9efcacb396f690a6
Message:Minor cleanups in Selector::exec

Declare variables where they are needed instead of way in advance.
Files: src/selector.cpp (3 diffs)

Change Details

src/selector.cpp
5252}
5353
5454int Selector::exec(int startSelection) {
55    bool close = false, result = true;
56    vector<string> screens, titles;
57
5855    FileLister fl(dir, link->getSelectorBrowser());
5956    fl.setFilter(link->getSelectorFilter());
6057    fl.browse();
...... 
8582
8683    bg.convertToDisplayFormat();
8784
88    uint i, firstElement = 0, iY;
85    unsigned int firstElement = 0;
86    unsigned int selected = constrain(startSelection, 0, fl.size() - 1);
8987
88    vector<string> screens, titles;
9089    prepare(&fl,&screens,&titles);
91    uint selected = constrain(startSelection,0,fl.size()-1);
9290
9391    //Add the folder icon manually to be sure to load it with alpha support since we are going to disable it for screenshots
9492    if (gmenu2x->sc.skinRes("imgs/folder.png")==NULL)
9593        gmenu2x->sc.addSkinRes("imgs/folder.png");
9694    gmenu2x->sc.defaultAlpha = false;
95
96    bool close = false, result = true;
9797    while (!close) {
9898        OutputSurface& s = *gmenu2x->s;
9999
...... 
114114        }
115115
116116        //Selection
117        iY = top + (selected - firstElement) * fontheight;
117        unsigned int iY = top + (selected - firstElement) * fontheight;
118118        if (selected<fl.size())
119119            s.box(1, iY, 309, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
120120
121121        //Files & Dirs
122122        s.setClipRect(0, top, 311, height);
123        for (i = firstElement; i < fl.size()
123        for (unsigned int i = firstElement; i < fl.size()
124124                    && i < firstElement + nb_elements; i++) {
125125            iY = i-firstElement;
126126            if (fl.isDirectory(i)) {

Archive Download the corresponding diff file



interactive