mirror of
https://github.com/Oibaf66/frodo-wii.git
synced 2024-11-29 06:54:22 +01:00
No deactivation, push main view on activation
This commit is contained in:
parent
fcf5d06256
commit
d9a1ce3de9
@ -221,7 +221,6 @@ bool Gui::setTheme(const char *path)
|
|||||||
this->tv = new ThemeView();
|
this->tv = new ThemeView();
|
||||||
this->bkv = new BindKeysView();
|
this->bkv = new BindKeysView();
|
||||||
this->giv = new GameInfoView();
|
this->giv = new GameInfoView();
|
||||||
this->pushView(mv);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VirtualKeyboard::kbd->updateTheme();
|
VirtualKeyboard::kbd->updateTheme();
|
||||||
@ -342,13 +341,7 @@ void Gui::activate()
|
|||||||
this->is_active = true;
|
this->is_active = true;
|
||||||
/* FIXME! TMP! TMP! */
|
/* FIXME! TMP! TMP! */
|
||||||
this->np = new Prefs();
|
this->np = new Prefs();
|
||||||
}
|
this->pushView(this->mv);
|
||||||
|
|
||||||
void Gui::deActivate()
|
|
||||||
{
|
|
||||||
/* FIXME! TMP! TMP! */
|
|
||||||
delete this->np;
|
|
||||||
this->is_active = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_Surface *Gui::loadThemeImage(const char *dir, const char *what)
|
SDL_Surface *Gui::loadThemeImage(const char *dir, const char *what)
|
||||||
|
@ -39,8 +39,6 @@ public:
|
|||||||
|
|
||||||
void activate();
|
void activate();
|
||||||
|
|
||||||
void deActivate();
|
|
||||||
|
|
||||||
void runLogic(void);
|
void runLogic(void);
|
||||||
|
|
||||||
void pushEvent(SDL_Event *ev);
|
void pushEvent(SDL_Event *ev);
|
||||||
|
Loading…
Reference in New Issue
Block a user