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

Hearts: Migrate to CardGame

Browse source
This commit is contained in:
Sam Atkins 2022-08-20 14:17:58 +01:00 • committed by Andreas Kling
parent f9f25271b3
commit c709dc154f
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/Hearts/Game.cpp
View file

@ -894,8 +894,8 @@ void Game::paint_event(GUI::PaintEvent& event)
painter.add_clip_rect(frame_inner_rect()); painter.add_clip_rect(frame_inner_rect());
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
static Gfx::Color s_background_color = palette().color(background_role()); Gfx::Color background_color = this->background_color();
painter.clear_rect(frame_inner_rect(), s_background_color); painter.clear_rect(frame_inner_rect(), background_color);
for (auto& player : m_players) { for (auto& player : m_players) {
auto& font = painter.font().bold_variant(); auto& font = painter.font().bold_variant();

5
Userland/Games/Hearts/Game.h
View file

@ -2,6 +2,7 @@
* Copyright (c) 2020, Till Mayer <till.mayer@web.de> * Copyright (c) 2020, Till Mayer <till.mayer@web.de>
* Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org> * Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -10,14 +11,14 @@
#include "Player.h" #include "Player.h"
#include <LibCards/Card.h> #include <LibCards/Card.h>
#include <LibCards/CardGame.h>
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGUI/Frame.h>
using Cards::Card; using Cards::Card;
namespace Hearts { namespace Hearts {
class Game final : public GUI::Frame { class Game final : public Cards::CardGame {
C_OBJECT(Game) C_OBJECT(Game)
public: public:
static constexpr int width = 640; static constexpr int width = 640;

1
Userland/Games/Hearts/Hearts.gml
View file

@ -5,7 +5,6 @@
@Hearts::Game { @Hearts::Game {
name: "game" name: "game"
fill_with_background_color: true fill_with_background_color: true
background_color: "green"
} }
@GUI::Statusbar { @GUI::Statusbar {

4
Userland/Games/Hearts/main.cpp
View file

@ -2,6 +2,7 @@
* Copyright (c) 2020, Till Mayer <till.mayer@web.de> * Copyright (c) 2020, Till Mayer <till.mayer@web.de>
* Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org> * Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org> * Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -31,7 +32,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app = TRY(GUI::Application::try_create(arguments)); auto app = TRY(GUI::Application::try_create(arguments));
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-hearts"sv)); auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-hearts"sv));
Config::pledge_domain("Hearts"); Config::pledge_domains({ "Games", "Hearts" });
Config::monitor_domain("Games");
TRY(Core::System::pledge("stdio recvfd sendfd rpath unix")); TRY(Core::System::pledge("stdio recvfd sendfd rpath unix"));