rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the button icons have correct colors

Browse Source
This commit is contained in:
vurpo 2017-10-02 02:22:40 +03:00 committed by Max Sandholm
parent 9cce414d22
commit 4fc663db7c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TextInputWidget.cc
View File

@ -182,12 +182,14 @@ TextInputWidget::TextInputWidget(QWidget *parent)
send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png"); send_file_icon.addFile(":/icons/icons/ui/paper-clip-outline.png");
sendFileBtn_ = new FlatButton(this); sendFileBtn_ = new FlatButton(this);
sendFileBtn_->setForegroundColor(palette().color(QPalette::Text));
sendFileBtn_->setIcon(send_file_icon); sendFileBtn_->setIcon(send_file_icon);
sendFileBtn_->setIconSize(QSize(24, 24)); sendFileBtn_->setIconSize(QSize(24, 24));
spinner_ = new LoadingIndicator(this); spinner_ = new LoadingIndicator(this);
spinner_->setFixedHeight(32); spinner_->setFixedHeight(32);
spinner_->setFixedWidth(32); spinner_->setFixedWidth(32);
spinner_->setColor(palette().color(QPalette::Text));
spinner_->hide(); spinner_->hide();
QFont font; QFont font;
@ -201,10 +203,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
input_->setStyleSheet("border: none; padding-top: 5px; background-color: rgba(0,0,0,0);"); input_->setStyleSheet("border: none; padding-top: 5px; background-color: rgba(0,0,0,0);");
sendMessageBtn_ = new FlatButton(this); sendMessageBtn_ = new FlatButton(this);
<<<<<<< HEAD sendMessageBtn_->setForegroundColor(palette().color(QPalette::Text));
=======
// sendMessageBtn_->setForegroundColor(QColor("#acc7dc"));
>>>>>>> Remove a bunch of hardcoded colors
QIcon send_message_icon; QIcon send_message_icon;
send_message_icon.addFile(":/icons/icons/ui/cursor.png"); send_message_icon.addFile(":/icons/icons/ui/cursor.png");
@ -212,6 +211,7 @@ TextInputWidget::TextInputWidget(QWidget *parent)
sendMessageBtn_->setIconSize(QSize(24, 24)); sendMessageBtn_->setIconSize(QSize(24, 24));
emojiBtn_ = new EmojiPickButton(this); emojiBtn_ = new EmojiPickButton(this);
emojiBtn_->setForegroundColor(palette().color(QPalette::Text));
QIcon emoji_icon; QIcon emoji_icon;
emoji_icon.addFile(":/icons/icons/ui/smile.png"); emoji_icon.addFile(":/icons/icons/ui/smile.png");

1
src/TopRoomBar.cc
View File

@ -70,6 +70,7 @@ TopRoomBar::TopRoomBar(QWidget *parent)
textLayout_->addWidget(topicLabel_); textLayout_->addWidget(topicLabel_);
settingsBtn_ = new FlatButton(this); settingsBtn_ = new FlatButton(this);
settingsBtn_->setForegroundColor(palette().color(QPalette::ToolTipText));
settingsBtn_->setFixedSize(buttonSize_, buttonSize_); settingsBtn_->setFixedSize(buttonSize_, buttonSize_);
settingsBtn_->setCornerRadius(buttonSize_ / 2); settingsBtn_->setCornerRadius(buttonSize_ / 2);

1
src/UserInfoWidget.cc
View File

@ -77,6 +77,7 @@ UserInfoWidget::UserInfoWidget(QWidget *parent)
buttonLayout_->setMargin(0); buttonLayout_->setMargin(0);
logoutButton_ = new FlatButton(this); logoutButton_ = new FlatButton(this);
logoutButton_->setForegroundColor(palette().color(QPalette::Text));
logoutButton_->setCornerRadius(logoutButtonSize_ / 2); logoutButton_->setCornerRadius(logoutButtonSize_ / 2);
QIcon icon; QIcon icon;