From c709dc154fc07fcf0a9b314a161907afd1afa301 Mon Sep 17 00:00:00 2001
From: Sam Atkins <atkinssj@serenityos.org>
Date: Sat, 20 Aug 2022 14:17:58 +0100
Subject: [PATCH] Hearts: Migrate to CardGame

---
 Userland/Games/Hearts/Game.cpp   | 4 ++--
 Userland/Games/Hearts/Game.h     | 5 +++--
 Userland/Games/Hearts/Hearts.gml | 1 -
 Userland/Games/Hearts/main.cpp   | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp
index b991f93915..348c24967a 100644
--- a/Userland/Games/Hearts/Game.cpp
+++ b/Userland/Games/Hearts/Game.cpp
@@ -894,8 +894,8 @@ void Game::paint_event(GUI::PaintEvent& event)
     painter.add_clip_rect(frame_inner_rect());
     painter.add_clip_rect(event.rect());
 
-    static Gfx::Color s_background_color = palette().color(background_role());
-    painter.clear_rect(frame_inner_rect(), s_background_color);
+    Gfx::Color background_color = this->background_color();
+    painter.clear_rect(frame_inner_rect(), background_color);
 
     for (auto& player : m_players) {
         auto& font = painter.font().bold_variant();
diff --git a/Userland/Games/Hearts/Game.h b/Userland/Games/Hearts/Game.h
index c3d39c8c28..6d5582f110 100644
--- a/Userland/Games/Hearts/Game.h
+++ b/Userland/Games/Hearts/Game.h
@@ -2,6 +2,7 @@
  * Copyright (c) 2020, Till Mayer <till.mayer@web.de>
  * Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org>
  * Copyright (c) 2022, the SerenityOS developers.
+ * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -10,14 +11,14 @@
 
 #include "Player.h"
 #include <LibCards/Card.h>
+#include <LibCards/CardGame.h>
 #include <LibCore/Timer.h>
-#include <LibGUI/Frame.h>
 
 using Cards::Card;
 
 namespace Hearts {
 
-class Game final : public GUI::Frame {
+class Game final : public Cards::CardGame {
     C_OBJECT(Game)
 public:
     static constexpr int width = 640;
diff --git a/Userland/Games/Hearts/Hearts.gml b/Userland/Games/Hearts/Hearts.gml
index 0922093889..9bfce41fd9 100644
--- a/Userland/Games/Hearts/Hearts.gml
+++ b/Userland/Games/Hearts/Hearts.gml
@@ -5,7 +5,6 @@
     @Hearts::Game {
         name: "game"
         fill_with_background_color: true
-        background_color: "green"
     }
 
     @GUI::Statusbar {
diff --git a/Userland/Games/Hearts/main.cpp b/Userland/Games/Hearts/main.cpp
index 1b6c555cdf..636a3feb6c 100644
--- a/Userland/Games/Hearts/main.cpp
+++ b/Userland/Games/Hearts/main.cpp
@@ -2,6 +2,7 @@
  * Copyright (c) 2020, Till Mayer <till.mayer@web.de>
  * Copyright (c) 2021, Gunnar Beutner <gbeutner@serenityos.org>
  * Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
+ * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org>
  *
  * 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_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"));