RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:37:34 +00:00
Code Issues Activity Actions

Solitaire: Add a GUI::Statusbar to the Solitaire window

Browse source 
This will display the score (instead of updating the window title) and
any hovered action text.
This commit is contained in:
Timothy Flynn 2021-05-05 12:52:17 -04:00 • committed by Andreas Kling
parent 59193dd6b3
commit b2576b7e45
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/Solitaire/Solitaire.gml
View file

@ -9,4 +9,8 @@
fill_with_background_color: true fill_with_background_color: true
background_color: "green" background_color: "green"
} }
@GUI::Statusbar {
name: "statusbar"
}
} }

22
Userland/Games/Solitaire/main.cpp
View file

@ -11,6 +11,7 @@
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Menu.h> #include <LibGUI/Menu.h>
#include <LibGUI/Menubar.h> #include <LibGUI/Menubar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -36,9 +37,7 @@ int main(int argc, char** argv)
} }
auto window = GUI::Window::construct(); auto window = GUI::Window::construct();
window->set_title("Solitaire");
window->set_resizable(false);
window->resize(Solitaire::Game::width, Solitaire::Game::height);
auto& widget = window->set_main_widget<GUI::Widget>(); auto& widget = window->set_main_widget<GUI::Widget>();
widget.load_from_gml(solitaire_gml); widget.load_from_gml(solitaire_gml);
@ -46,8 +45,21 @@ int main(int argc, char** argv)
auto& game = *widget.find_descendant_of_type_named<Solitaire::Game>("game"); auto& game = *widget.find_descendant_of_type_named<Solitaire::Game>("game");
game.set_focus(true); game.set_focus(true);
auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
app->on_action_enter = [&](GUI::Action& action) {
auto text = action.status_tip();
if (text.is_empty())
text = Gfx::parse_ampersand_string(action.text());
statusbar.set_override_text(move(text));
};
app->on_action_leave = [&](GUI::Action&) {
statusbar.set_override_text({});
};
game.on_score_update = [&](uint32_t score) { game.on_score_update = [&](uint32_t score) {
window->set_title(String::formatted("Score: {} - Solitaire", score)); statusbar.set_text(String::formatted("Score: {}", score));
}; };
auto menubar = GUI::Menubar::construct(); auto menubar = GUI::Menubar::construct();
@ -62,6 +74,8 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help"); auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window)); help_menu.add_action(GUI::CommonActions::make_about_action("Solitaire", app_icon, window));
window->set_resizable(false);
window->resize(Solitaire::Game::width, Solitaire::Game::height + statusbar.max_height());
window->set_menubar(move(menubar)); window->set_menubar(move(menubar));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->show(); window->show();