From aa5c0c90c741460f50d00ec620e07d301b600334 Mon Sep 17 00:00:00 2001 From: huxingyi Date: Wed, 14 Oct 2020 22:12:05 +0930 Subject: [PATCH] Change main color to white [skip ci] --- src/documentwindow.cpp | 2 +- src/exportpreviewwidget.cpp | 2 +- src/poseeditwidget.cpp | 6 +++--- src/theme.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/documentwindow.cpp b/src/documentwindow.cpp index edc49b2e..c65a14fd 100644 --- a/src/documentwindow.cpp +++ b/src/documentwindow.cpp @@ -1445,7 +1445,7 @@ void DocumentWindow::initLockButton(QPushButton *button) button->setFont(font); button->setFixedSize(Theme::toolIconSize, Theme::toolIconSize); - button->setStyleSheet("QPushButton {color: #f7d9c8}"); + button->setStyleSheet("QPushButton {color: " + Theme::white.name() + "}"); button->setFocusPolicy(Qt::NoFocus); } diff --git a/src/exportpreviewwidget.cpp b/src/exportpreviewwidget.cpp index 07f951c0..ccc2a5f1 100644 --- a/src/exportpreviewwidget.cpp +++ b/src/exportpreviewwidget.cpp @@ -147,7 +147,7 @@ void ExportPreviewWidget::initAwesomeButton(QPushButton *button) { button->setFont(Theme::awesome()->font(Theme::toolIconFontSize)); button->setFixedSize(Theme::toolIconSize, Theme::toolIconSize); - button->setStyleSheet("QPushButton {color: #f7d9c8}"); + button->setStyleSheet("QPushButton {color: " + Theme::white.name() + "}"); button->setFocusPolicy(Qt::NoFocus); } diff --git a/src/poseeditwidget.cpp b/src/poseeditwidget.cpp index 8068db97..f872bbb9 100644 --- a/src/poseeditwidget.cpp +++ b/src/poseeditwidget.cpp @@ -305,16 +305,16 @@ void PoseEditWidget::initSideButton(QPushButton *button) button->setFont(font); button->setFixedSize(Theme::toolIconSize, Theme::toolIconSize); - button->setStyleSheet("QPushButton {color: #f7d9c8}"); + button->setStyleSheet("QPushButton {color: " + Theme::white.name() + "}"); button->setFocusPolicy(Qt::NoFocus); } void PoseEditWidget::updateSideButtonState(QPushButton *button, bool visible) { if (visible) - button->setStyleSheet("QPushButton {color: #f7d9c8}"); + button->setStyleSheet("QPushButton {color: " + Theme::white.name() + "}"); else - button->setStyleSheet("QPushButton {color: #252525}"); + button->setStyleSheet("QPushButton {color: " + Theme::black.name() + "}"); } void PoseEditWidget::showPoseSettingPopup(const QPoint &pos) diff --git a/src/theme.cpp b/src/theme.cpp index 13d41642..96eb7f07 100644 --- a/src/theme.cpp +++ b/src/theme.cpp @@ -23,7 +23,7 @@ QColor Theme::red = QColor(0xfc, 0x66, 0x21); QColor Theme::green = QColor(0xaa, 0xeb, 0xc4); //QColor Theme::blue = QColor(0x2a, 0x5a, 0xac); QColor Theme::blue = QColor(0x0d, 0xa9, 0xf1); -QColor Theme::white = QColor(0xf7, 0xd9, 0xc8); +QColor Theme::white = Qt::white; //QColor(0xf7, 0xd9, 0xc8); QColor Theme::black = QColor(0x25,0x25,0x25); QColor Theme::dark = QColor(0x19,0x19,0x19); QColor Theme::altDark = QColor(0x16,0x16,0x16);