From e3c6001af03f09a37600a21ef31e1030d950d753 Mon Sep 17 00:00:00 2001 From: Isabell Pflug Date: Thu, 25 May 2023 14:28:56 +0200 Subject: [PATCH] :bug: Fixed default colors and button style --- ThinkPink/mainwindow.cpp | 3 ++- ThinkPink/samegame.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ThinkPink/mainwindow.cpp b/ThinkPink/mainwindow.cpp index eb09467..0515f5f 100644 --- a/ThinkPink/mainwindow.cpp +++ b/ThinkPink/mainwindow.cpp @@ -34,7 +34,7 @@ void MainWindow::initialiseGameGrid() { { QPushButton * button = new QPushButton(this); button->setFixedSize(button_size); - button->setStyleSheet("background-color: " + game->getCell(i,j) + "; border: none;"); + button->setStyleSheet("color: #FFFFFF; Font : 30pt; background-color: " + game->getCell(i,j) + "; border: none;"); ui->gameGridLayout->addWidget(button, j, i); // Set size text etc. for each button @@ -67,6 +67,7 @@ MainWindow::MainWindow(QWidget *parent) , max_height(544) { ui->setupUi(this); + this->setStyleSheet("color: #DB7093;"); game = new SameGame(rows, columns); initialiseGame(); diff --git a/ThinkPink/samegame.cpp b/ThinkPink/samegame.cpp index 678a5be..bec2788 100644 --- a/ThinkPink/samegame.cpp +++ b/ThinkPink/samegame.cpp @@ -19,7 +19,7 @@ void SameGame::initialiseGameMatrix(int rows, int columns) { } SameGame::SameGame(int rows, int columns) - : colors(settings->value("colors/colors", QStringList() << "0xBD005E" << "0xFFC0CB" << "0xDB7093" << "0xF7A8B8" << "0x660033").toStringList()) + : colors(settings->value("colors/colors", QStringList() << "#BD005E" << "#FFC0CB" << "#DB7093" << "#F7A8B8" << "#660033").toStringList()) // also ich finds echt cool! { initialiseGameMatrix(rows, columns);