qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Don't pass around naked Surface pointers when drawing

Browse Source 
Use references instead.
This commit is contained in:
Maarten ter Huurne
2014-08-10 04:26:59 +02:00
parent 20c5ec4eb6
commit aff5f53f7d
34 changed files with 255 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/wallpaperdialog.cpp
View File

@@ -88,41 +88,43 @@ bool WallpaperDialog::exec()
unsigned int nb_elements = height / fontheight;
while (!close) {
Surface& s = *gmenu2x->s;
if (selected > firstElement + nb_elements - 1)
firstElement = selected - nb_elements + 1;
if (selected < firstElement)
firstElement = selected;
//Wallpaper
gmenu2x->sc[((string)"skin:wallpapers/" + wallpapers[selected]).c_str()]->blit(gmenu2x->s, 0, 0);
gmenu2x->sc[((string)"skin:wallpapers/" + wallpapers[selected]).c_str()]->blit(s, 0, 0);
gmenu2x->drawTopBar(gmenu2x->s);
gmenu2x->drawBottomBar(gmenu2x->s);
gmenu2x->drawTopBar(s);
gmenu2x->drawBottomBar(s);
drawTitleIcon(gmenu2x->s, "icons/wallpaper.png", true);
writeTitle(gmenu2x->s, gmenu2x->tr["Wallpaper selection"]);
writeSubTitle(gmenu2x->s, gmenu2x->tr["Select a wallpaper from the list"]);
drawTitleIcon(s, "icons/wallpaper.png", true);
writeTitle(s, gmenu2x->tr["Wallpaper selection"]);
writeSubTitle(s, gmenu2x->tr["Select a wallpaper from the list"]);
buttonbox.paint(gmenu2x->s, 5);
buttonbox.paint(s, 5);
//Selection
iY = selected - firstElement;
iY = top + (iY * fontheight);
gmenu2x->s->box(2, iY, 308, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
s.box(2, iY, 308, fontheight, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
//Files & Directories
gmenu2x->s->setClipRect(0, top, 311, height);
s.setClipRect(0, top, 311, height);
for (i = firstElement; i < wallpapers.size()
&& i < firstElement + nb_elements; i++) {
iY = i-firstElement;
gmenu2x->font->write(gmenu2x->s, wallpapers[i], 5,
gmenu2x->font->write(s, wallpapers[i], 5,
top + (iY * fontheight),
Font::HAlignLeft, Font::VAlignTop);
}
gmenu2x->s->clearClipRect();
s.clearClipRect();
gmenu2x->drawScrollBar(nb_elements, wallpapers.size(), firstElement);
gmenu2x->s->flip();
s.flip();
switch(gmenu2x->input.waitForPressedButton()) {
case InputManager::CANCEL: