Browse Source

Merge pull request #4748

anthony.bilinski (1):
      fix(ui): Set tooltip colour and background for all tooltips
reviewable/pr4756/r2
sudden6 8 years ago
parent
commit
923fd48c33
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 1
      res.qrc
  2. 1
      src/widget/widget.cpp
  3. 6
      ui/settings/mainContent.css
  4. 7
      ui/window/general.css

1
res.qrc

@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
<file>ui/videoButton/videoButton.svg</file>
<file>ui/volButton/volButton.css</file>
<file>ui/volButton/volButton.svg</file>
<file>ui/window/general.css</file>
<file>ui/window/statusPanel.css</file>
<file>ui/window/window.css</file>
<file>ui/chatArea/info.svg</file>

1
src/widget/widget.cpp

@ -2149,6 +2149,7 @@ void Widget::clearAllReceipts() @@ -2149,6 +2149,7 @@ void Widget::clearAllReceipts()
void Widget::reloadTheme()
{
this->setStyleSheet(Style::getStylesheet(":/ui/window/general.css"));
QString statusPanelStyle = Style::getStylesheet(":/ui/window/statusPanel.css");
ui->tooliconsZone->setStyleSheet(Style::getStylesheet(":/ui/tooliconsZone/tooliconsZone.css"));
ui->statusPanel->setStyleSheet(statusPanelStyle);

6
ui/settings/mainContent.css

@ -49,12 +49,6 @@ QPushButton @@ -49,12 +49,6 @@ QPushButton
background: white;
}
QToolTip
{
color: black;
background: #ffffdc;
}
QGroupBox
{
color: black;

7
ui/window/general.css

@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
QToolTip
{
/* explicit border width is required https://bugreports.qt.io/browse/QTBUG-41313 */
border: 0px;
color: black;
background: #ffffdc;
}
Loading…
Cancel
Save