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 | ||
---|---|---|
52 | 52 | } |
53 | 53 | |
54 | 54 | int Selector::exec(int startSelection) { |
55 | bool close = false, result = true; | |
56 | vector<string> screens, titles; | |
57 | ||
58 | 55 | FileLister fl(dir, link->getSelectorBrowser()); |
59 | 56 | fl.setFilter(link->getSelectorFilter()); |
60 | 57 | fl.browse(); |
... | ... | |
85 | 82 | |
86 | 83 | bg.convertToDisplayFormat(); |
87 | 84 | |
88 | uint i, firstElement = 0, iY; | |
85 | unsigned int firstElement = 0; | |
86 | unsigned int selected = constrain(startSelection, 0, fl.size() - 1); | |
89 | 87 | |
88 | vector<string> screens, titles; | |
90 | 89 | prepare(&fl,&screens,&titles); |
91 | uint selected = constrain(startSelection,0,fl.size()-1); | |
92 | 90 | |
93 | 91 | //Add the folder icon manually to be sure to load it with alpha support since we are going to disable it for screenshots |
94 | 92 | if (gmenu2x->sc.skinRes("imgs/folder.png")==NULL) |
95 | 93 | gmenu2x->sc.addSkinRes("imgs/folder.png"); |
96 | 94 | gmenu2x->sc.defaultAlpha = false; |
95 | ||
96 | bool close = false, result = true; | |
97 | 97 | while (!close) { |
98 | 98 | OutputSurface& s = *gmenu2x->s; |
99 | 99 | |
... | ... | |
114 | 114 | } |
115 | 115 | |
116 | 116 | //Selection |
117 | iY = top + (selected - firstElement) * fontheight; | |
117 | unsigned int iY = top + (selected - firstElement) * fontheight; | |
118 | 118 | if (selected<fl.size()) |
119 | 119 | s.box(1, iY, 309, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]); |
120 | 120 | |
121 | 121 | //Files & Dirs |
122 | 122 | s.setClipRect(0, top, 311, height); |
123 | for (i = firstElement; i < fl.size() | |
123 | for (unsigned int i = firstElement; i < fl.size() | |
124 | 124 | && i < firstElement + nb_elements; i++) { |
125 | 125 | iY = i-firstElement; |
126 | 126 | if (fl.isDirectory(i)) { |
Branches:
install_locations
master
opkrun
packages