Make the gui use Application::hide_gui rather then hide_me

Now that Application::hide_me actually does what the name suggests
(hide the entire client, ie all client windows), the gui using it to
not show the gui layer leads to the entire client disappearing when
one presses close in the GUI or dismisses a GUI dialog. This patch makes
the GUI code call hide_gui instead of hide_me, fixing this.
This commit is contained in:
Hans de Goede 2010-10-18 14:43:06 +02:00
parent bbc079955a
commit df6df8e587
3 changed files with 3 additions and 5 deletions

View File

@ -1786,8 +1786,6 @@ void Application::show_me(bool full_screen)
void Application::hide_me()
{
// hide_gui();
// FIXME: this instead?
if (_full_screen) {
exit_full_screen();
}

View File

@ -254,6 +254,7 @@ public:
#ifdef USE_GUI
bool is_disconnect_allowed();
void hide_gui();
#endif
const std::string& get_host();
@ -318,7 +319,6 @@ private:
void attach_gui_barriers();
void detach_gui_barriers();
void show_gui();
void hide_gui();
void create_gui_barrier(RedScreen& screen, int id);
void destroyed_gui_barrier(int id);
void destroyed_gui_barriers();

View File

@ -420,7 +420,7 @@ void GUI::Dialog::handle_message_click(int id)
}
if (_close_on_message_click) {
application().hide_me();
application().hide_gui();
}
}
@ -840,7 +840,7 @@ public:
bool SettingsDialog::handle_close(const CEGUI::EventArgs& e)
{
DBG(0, "");
application().hide_me();
application().hide_gui();
return true;
}