fix: work for qss repaint in hidpi

Change-Id: I3018513ed1cb0d4f2b47af94877b5b20821cba1d
linuxdeepin · Dec 15, 2017 · 49f5b1b · 49f5b1b
1 parent e158581
commit 49f5b1b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 9 deletions.
diff --git a/music-player/resource/theme/dark/InfoDialog.theme b/music-player/resource/theme/dark/InfoDialog.theme
@@ -19,7 +19,7 @@
     color: black;
 }
 #InfoSplit{
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-top: 1px solid rgba(0, 0, 0, 10%);
 }
 #InfoKey{
     border: 1px solid transparent;

diff --git a/music-player/resource/theme/dark/LyricWidget.theme b/music-player/resource/theme/dark/LyricWidget.theme
@@ -1,5 +1,5 @@
 #LyricWidget {
-    background-color: rgba(0,0,0,50%);
+    qproperty-backgroundColor: rgba(0,0,0,50%);
     qproperty-defaultCover: ":/common/image/cover_max.svg";
 }
 

diff --git a/music-player/resource/theme/dark/PlaylistWidget.theme b/music-player/resource/theme/dark/PlaylistWidget.theme
@@ -1,5 +1,5 @@
 #PlaylistWidget{
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 10%);
     border-top: none;
     background-color: rgba(37, 37, 37, 0.9);
 }

diff --git a/music-player/resource/theme/light/InfoDialog.theme b/music-player/resource/theme/light/InfoDialog.theme
@@ -18,7 +18,7 @@
     qproperty-alignment: AlignCenter;
 }
 #InfoSplit{
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-top: 1px solid rgba(0, 0, 0, 10%);
 }
 #InfoKey{
     border: 1px solid transparent;

diff --git a/music-player/resource/theme/light/LyricWidget.theme b/music-player/resource/theme/light/LyricWidget.theme
@@ -1,5 +1,5 @@
 #LyricWidget {
-    background-color: rgba(0,0,0,30%);
+    qproperty-backgroundColor: rgba(0,0,0,30%);
     qproperty-defaultCover: ":/common/image/cover_max.svg";
 }
 

diff --git a/music-player/resource/theme/light/PlaylistWidget.theme b/music-player/resource/theme/light/PlaylistWidget.theme
@@ -1,5 +1,5 @@
 #PlaylistWidget{
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 10%);
     border-top: none;
     background-color: rgba(255, 255, 255, 0.9);
 }

diff --git a/music-player/resource/theme/light/SearchEdit.theme b/music-player/resource/theme/light/SearchEdit.theme
@@ -2,7 +2,7 @@ Dtk--Widget--DSearchEdit {
     border-radius: 4.0px;
     padding: 1px;
     padding-bottom: 0px;
-    background: rgba(0, 0, 0, 0.1);
+    background: rgba(0, 0, 0, 10%);
 }
 
 Dtk--Widget--DSearchEdit #SearchIcon {

diff --git a/music-player/resource/theme/light/SearchResult.theme b/music-player/resource/theme/light/SearchResult.theme
@@ -1,5 +1,5 @@
 SearchResult{
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 10%);
     border-radius: 4px;
     background-color: rgba(255, 255,255, 1);
 }

diff --git a/music-player/view/lyricwidget.cpp b/music-player/view/lyricwidget.cpp
@@ -77,6 +77,7 @@ class LyricWidgetPrivate
     QStringListModel    *m_model            = nullptr;
 
     QString             defaultCover;
+    QColor              backgroundColor;
 
     LyricWidget *q_ptr;
     Q_DECLARE_PUBLIC(LyricWidget)
@@ -137,7 +138,7 @@ void LyricWidgetPrivate::setLyricLines(QString str)
     m_model->setStringList(lyric);
     lyricview->setModel(m_model);
 
-    QModelIndex index = m_model->index(emptyLineOffset , 0, lyricview->rootIndex());
+    QModelIndex index = m_model->index(emptyLineOffset, 0, lyricview->rootIndex());
     lyricview->selectionModel()->clearSelection();
     lyricview->selectionModel()->select(index, QItemSelectionModel::Select);
     lyricview->scrollTo(index, QListView::PositionAtCenter);
@@ -336,6 +337,12 @@ void LyricWidget::checkHiddenSearch(QPoint mousePos)
     }
 }
 
+QColor LyricWidget::backgroundColor() const
+{
+    Q_D(const LyricWidget);
+    return d->backgroundColor;
+}
+
 
 void LyricWidget::paintEvent(QPaintEvent *e)
 {
@@ -419,6 +426,13 @@ void LyricWidget::onMusicStop(PlaylistPtr /*playlist*/, const MetaPtr /*meta*/)
 void LyricWidget::onProgressChanged(qint64 value, qint64 /*length*/)
 {
     Q_D(LyricWidget);
+
+    qDebug() << d->backgroundColor;
+    QPalette p = palette();
+    p.setColor(QPalette::Background, d->backgroundColor);
+    setPalette(p);
+
+
     auto len = d->m_lyriclist.m_lyricElements.length();
 
     if (!d->m_lyriclist.hasTime) {
@@ -491,6 +505,12 @@ void LyricWidget::onUpdateMetaCodec(const MetaPtr /*meta*/)
 //    }
 }
 
+void LyricWidget::setBackgroundColor(QColor backgroundColor)
+{
+    Q_D(LyricWidget);
+    d->backgroundColor = backgroundColor;
+}
+
 void LyricWidget::onContextSearchFinished(const QString &context, const QList<DMusic::SearchMeta> &metalist)
 {
     Q_D(LyricWidget);

diff --git a/music-player/view/lyricwidget.h b/music-player/view/lyricwidget.h
@@ -31,15 +31,18 @@ class LyricWidget : public QFrame
 {
     Q_OBJECT
     Q_PROPERTY(QString defaultCover READ defaultCover WRITE setDefaultCover)
+    Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
 
 public:
     explicit LyricWidget(QWidget *parent = 0);
     ~LyricWidget();
 
     void updateUI();
     QString defaultCover() const;
+    QColor backgroundColor() const;
     void checkHiddenSearch(QPoint mousePos);
 
+
 signals:
     void toggleLyricView();
     void requestContextSearch(const QString &context);
@@ -61,6 +64,7 @@ public slots:
                                  const QList<DMusic::SearchMeta> &metalist);
 
     void setDefaultCover(QString defaultCover);
+    void setBackgroundColor(QColor backgroundColor);
     void onUpdateMetaCodec(const MetaPtr meta);
 
 protected: