mirror of
git://projects.qi-hardware.com/gmenu2x.git
synced 2024-11-26 19:50:35 +02:00
Made Surface argument to drawTopBar/drawBottomBar() mandatory
This commit is contained in:
parent
69b2b795a2
commit
1ffae36004
@ -1208,8 +1208,6 @@ void GMenu2X::drawScrollBar(uint pageSize, uint totalSize, uint pagePos) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GMenu2X::drawTopBar(Surface *s) {
|
void GMenu2X::drawTopBar(Surface *s) {
|
||||||
if (s==NULL) s = this->s;
|
|
||||||
|
|
||||||
Surface *bar = sc.skinRes("imgs/topbar.png", false);
|
Surface *bar = sc.skinRes("imgs/topbar.png", false);
|
||||||
if (bar != NULL)
|
if (bar != NULL)
|
||||||
bar->blit(s, 0, 0);
|
bar->blit(s, 0, 0);
|
||||||
@ -1219,8 +1217,6 @@ void GMenu2X::drawTopBar(Surface *s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GMenu2X::drawBottomBar(Surface *s) {
|
void GMenu2X::drawBottomBar(Surface *s) {
|
||||||
if (s==NULL) s = this->s;
|
|
||||||
|
|
||||||
Surface *bar = sc.skinRes("imgs/bottombar.png", false);
|
Surface *bar = sc.skinRes("imgs/bottombar.png", false);
|
||||||
if (bar != NULL)
|
if (bar != NULL)
|
||||||
bar->blit(s, 0, resY-bar->height());
|
bar->blit(s, 0, resY-bar->height());
|
||||||
|
@ -192,8 +192,8 @@ public:
|
|||||||
int drawButtonRight(Surface *s, const std::string &btn, const std::string &text, int x=5, int y=-10);
|
int drawButtonRight(Surface *s, const std::string &btn, const std::string &text, int x=5, int y=-10);
|
||||||
void drawScrollBar(uint pageSize, uint totalSize, uint pagePos);
|
void drawScrollBar(uint pageSize, uint totalSize, uint pagePos);
|
||||||
|
|
||||||
void drawTopBar(Surface *s=NULL);
|
void drawTopBar(Surface *s);
|
||||||
void drawBottomBar(Surface *s=NULL);
|
void drawBottomBar(Surface *s);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GMENU2X_H
|
#endif // GMENU2X_H
|
||||||
|
@ -466,7 +466,7 @@ void LinkApp::showManual() {
|
|||||||
bg->blit(gmenu2x->s, 0, 0);
|
bg->blit(gmenu2x->s, 0, 0);
|
||||||
pngman->blit(gmenu2x->s, -page*320, 0);
|
pngman->blit(gmenu2x->s, -page*320, 0);
|
||||||
|
|
||||||
gmenu2x->drawBottomBar();
|
gmenu2x->drawBottomBar(gmenu2x->s);
|
||||||
gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"],
|
gmenu2x->drawButton(gmenu2x->s, "start", gmenu2x->tr["Exit"],
|
||||||
gmenu2x->drawButton(gmenu2x->s, "cancel", "",
|
gmenu2x->drawButton(gmenu2x->s, "cancel", "",
|
||||||
gmenu2x->drawButton(gmenu2x->s, "right", gmenu2x->tr["Change page"],
|
gmenu2x->drawButton(gmenu2x->s, "right", gmenu2x->tr["Change page"],
|
||||||
|
Loading…
Reference in New Issue
Block a user