diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2012-03-22 17:07:36 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:52 +0100 |
| commit | e53dba73eca8238775df52e4177d83eb0a473de2 (patch) | |
| tree | 52bf6e5800bc7e777769b5e57692cbb5719fb6e8 /src/menu/application.cpp | |
| parent | 1c39e66f571fb9767257740ee74889ce0eb78993 (diff) | |
| download | usdx-e53dba73eca8238775df52e4177d83eb0a473de2.tar.gz usdx-e53dba73eca8238775df52e4177d83eb0a473de2.tar.xz usdx-e53dba73eca8238775df52e4177d83eb0a473de2.zip | |
menu: keep frame in container
before the current frame was stored in application, now every
container could keep a frame and paint it before all other content
Diffstat (limited to 'src/menu/application.cpp')
| -rw-r--r-- | src/menu/application.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/menu/application.cpp b/src/menu/application.cpp index 28862a8c..7e6c9216 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -70,25 +70,6 @@ namespace usdx return instance; } - void Application::draw(void) - { - if (frame) { - frame->repaint(); - } - - Container::draw(); - } - - const Frame *Application::get_current_frame(void) const - { - return frame; - } - - void Application::set_current_frame(Frame* new_frame) - { - frame = new_frame; - } - void Application::main_loop(SDL_Surface* display) { SDL_Event event; @@ -97,8 +78,7 @@ namespace usdx DrawableControl *p = new SoftwareMousePointer(this, &event_manager); p->repaint(); - LoadingFrame frame; - set_current_frame(&frame); + LoadingFrame frame(this); running = true; while (running) { |