From a540ec3519d1bd3585bb65595e7ba0d4b19fe5e5 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Wed, 5 May 2021 10:02:35 -0400
Subject: [PATCH] Solitaire: Convert Solitaire GUI to a frame

Looks a bit nicer as a frame with inset edges.
---
 Userland/Games/Solitaire/Game.cpp | 12 +++++++-----
 Userland/Games/Solitaire/Game.h   |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Userland/Games/Solitaire/Game.cpp b/Userland/Games/Solitaire/Game.cpp
index 66c6bcd538..dd0e2e07e3 100644
--- a/Userland/Games/Solitaire/Game.cpp
+++ b/Userland/Games/Solitaire/Game.cpp
@@ -135,7 +135,7 @@ void Game::keydown_event(GUI::KeyEvent& event)
 
 void Game::mousedown_event(GUI::MouseEvent& event)
 {
-    GUI::Widget::mousedown_event(event);
+    GUI::Frame::mousedown_event(event);
 
     if (m_new_game_animation || m_game_over_animation)
         return;
@@ -188,7 +188,7 @@ void Game::mousedown_event(GUI::MouseEvent& event)
 
 void Game::mouseup_event(GUI::MouseEvent& event)
 {
-    GUI::Widget::mouseup_event(event);
+    GUI::Frame::mouseup_event(event);
 
     if (!m_focused_stack || m_focused_cards.is_empty() || m_game_over_animation || m_new_game_animation)
         return;
@@ -241,7 +241,7 @@ void Game::mouseup_event(GUI::MouseEvent& event)
 
 void Game::mousemove_event(GUI::MouseEvent& event)
 {
-    GUI::Widget::mousemove_event(event);
+    GUI::Frame::mousemove_event(event);
 
     if (!m_mouse_down || m_game_over_animation || m_new_game_animation)
         return;
@@ -261,7 +261,7 @@ void Game::mousemove_event(GUI::MouseEvent& event)
 
 void Game::doubleclick_event(GUI::MouseEvent& event)
 {
-    GUI::Widget::doubleclick_event(event);
+    GUI::Frame::doubleclick_event(event);
 
     if (m_game_over_animation) {
         start_game_over_animation();
@@ -340,13 +340,15 @@ void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
 
 void Game::paint_event(GUI::PaintEvent& event)
 {
-    GUI::Widget::paint_event(event);
+    GUI::Frame::paint_event(event);
 
     m_has_to_repaint = false;
     if (m_game_over_animation && m_repaint_all)
         return;
 
     GUI::Painter painter(*this);
+    painter.add_clip_rect(frame_inner_rect());
+    painter.add_clip_rect(event.rect());
 
     if (m_repaint_all) {
         painter.fill_rect(event.rect(), s_background_color);
diff --git a/Userland/Games/Solitaire/Game.h b/Userland/Games/Solitaire/Game.h
index 179a478db3..011c2368d5 100644
--- a/Userland/Games/Solitaire/Game.h
+++ b/Userland/Games/Solitaire/Game.h
@@ -7,12 +7,12 @@
 #pragma once
 
 #include "CardStack.h"
+#include <LibGUI/Frame.h>
 #include <LibGUI/Painter.h>
-#include <LibGUI/Widget.h>
 
 namespace Solitaire {
 
-class Game final : public GUI::Widget {
+class Game final : public GUI::Frame {
     C_OBJECT(Game)
 public:
     static constexpr int width = 640;