From 10b54d08c338ad77f628743d977a022c6108c97e Mon Sep 17 00:00:00 2001
From: spiasecki <spiasecki@student.ethz.ch>
Date: Thu, 26 May 2022 13:03:28 +0200
Subject: [PATCH] Changing size back + color swap
---
source/client/GameController.cpp | 2 +-
source/client/panels/BetPanel.cpp | 4 ++--
source/client/windows/GameWindow.cpp | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/client/GameController.cpp b/source/client/GameController.cpp
index 55c0677..cd6f0cf 100644
--- a/source/client/GameController.cpp
+++ b/source/client/GameController.cpp
@@ -24,7 +24,7 @@ void GameController::init(GameWindow* gameWindow) {
GameController::_gameWindow = gameWindow;
// resizing after start makes panels appear without manual resizing
- GameController::_gameWindow->SetSize(wxSize(1250, 900));
+ GameController::_gameWindow->SetSize(wxSize(1010, 730));
// Set up main panels
GameController::_connectionPanel = new ConnectionPanel(gameWindow);
diff --git a/source/client/panels/BetPanel.cpp b/source/client/panels/BetPanel.cpp
index a7f1836..925a648 100644
--- a/source/client/panels/BetPanel.cpp
+++ b/source/client/panels/BetPanel.cpp
@@ -16,8 +16,8 @@ BetPanel::BetPanel(wxWindow* parent, game_state* gameState, player* me) : wxPane
}
// color of background
- wxColor green = wxColor(50, 168, 54);
- this->SetBackgroundColour(green);
+ wxColor lightGreen = wxColor(50, 205, 50);
+ this->SetBackgroundColour(lightGreen);
wxBoxSizer* verticalLayout = new wxBoxSizer(wxVERTICAL);
diff --git a/source/client/windows/GameWindow.cpp b/source/client/windows/GameWindow.cpp
index 2292470..750f60a 100644
--- a/source/client/windows/GameWindow.cpp
+++ b/source/client/windows/GameWindow.cpp
@@ -15,11 +15,11 @@ GameWindow::GameWindow(const wxString& title, const wxPoint& pos, const wxSize&
this->_statusBar = this->CreateStatusBar(1);
// Set background
- wxColor lightGreen = wxColor(50, 205, 50);
- this->SetBackgroundColour(lightGreen);
+ wxColor green = wxColor(50, 168, 54);
+ this->SetBackgroundColour(green);
// Set the minimum size of the window. The user won't be able to resize the window to a size smaller than this
- this->SetMinSize(wxSize(1200, 850));
+ this->SetMinSize(wxSize(1000, 720));
}
--
GitLab