fix: fix border pos

Change-Id: I78ee21129c0b314c8f394a0b71cb7adc6ec670ef
linuxdeepin · Sep 22, 2017 · 6fa9cc9 · 6fa9cc9
1 parent ef20047
commit 6fa9cc9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/music-player/resource/theme/light/SearchEdit.theme b/music-player/resource/theme/light/SearchEdit.theme
@@ -1,5 +1,8 @@
 Dtk--Widget--DSearchEdit {
     border-radius: 4.0px;
+    padding: 1px;
+    padding-bottom: 0px;
+    background: rgba(0, 0, 0, 0.1);
 }
 
 Dtk--Widget--DSearchEdit #SearchIcon {
@@ -18,17 +21,14 @@ Dtk--Widget--DSearchEdit #ClearIcon {
 Dtk--Widget--DSearchEdit #Edit {
     color:#303030;
     font-size:12px;
-    border-radius:0;
     padding-right:15px;
-    border: 5px solid;
-    border-color: transparent;
+    border: none;
     background-color:transparent;
 }
 
 Dtk--Widget--DSearchEdit QFrame#DEditInsideFrame {
-    border: 1px solid;
-    border-radius: 4px;
-    border-color: rgba(0, 0, 0, 0.08);
+    border: 0px solid rgba(0, 0, 255, 0.0);
+    border-radius: 3px;
     background-color: white;
 }
 

diff --git a/music-player/view/titlebar.cpp b/music-player/view/titlebar.cpp
@@ -130,18 +130,17 @@ void Titlebar::paintEvent(QPaintEvent *)
 
     auto radius = 0;
     QPainter titlePainter(this);
-    titlePainter.setRenderHint(QPainter::Antialiasing);
-    titlePainter.setRenderHint(QPainter::HighQualityAntialiasing);
+    titlePainter.setRenderHints(QPainter::Antialiasing);
 
     auto titleBarHeight = this->height() ;
     QRectF winRect = rect();
     QPointF titleTopLeft(winRect.x(), winRect.y());
 
     QRectF topLeftRect(titleTopLeft,
-                       QPoint(winRect.x() + 2 * radius, winRect.y() + 2 * radius));
-    QRectF topRightRect(QPoint(winRect.x() + winRect.width(), winRect.y()),
-                        QPoint(winRect.x() + winRect.width() - 2 * radius,
-                               winRect.y() + 2 * radius));
+                       QPointF(winRect.x() + 2 * radius, winRect.y() + 2 * radius));
+    QRectF topRightRect(QPointF(winRect.x() + winRect.width(), winRect.y()),
+                        QPointF(winRect.x() + winRect.width() - 2 * radius,
+                                winRect.y() + 2 * radius));
 
     QPainterPath titleBorder;
     titleBorder.moveTo(winRect.x() + radius, winRect.y());
@@ -150,19 +149,19 @@ void Titlebar::paintEvent(QPaintEvent *)
     titleBorder.lineTo(winRect.x() + winRect.width(), winRect.y() + radius);
     titleBorder.lineTo(winRect.x() + winRect.width(), winRect.y() + titleBarHeight);
     titleBorder.lineTo(winRect.x(), winRect.y() + titleBarHeight);
-    titleBorder.lineTo(winRect.x() , winRect.y() + radius);
+    titleBorder.lineTo(winRect.x(), winRect.y() + radius);
     titleBorder.arcTo(topLeftRect, 180.0, -90.0);
     titleBorder.closeSubpath();
 
     titlePainter.fillPath(titleBorder, QBrush(d->titleBackground));
-    QLine line(titleTopLeft.x(), winRect.y() + titleBarHeight ,
-               winRect.x() + winRect.width(), winRect.y() + titleBarHeight);
+    QLineF line(titleTopLeft.x(), winRect.y() + titleBarHeight,
+                winRect.x() + winRect.width(), winRect.y() + titleBarHeight);
 
     titlePainter.setPen(QPen(d->borderBottom, 1.0));
     titlePainter.drawLine(line);
 
-    QLine lineOut(titleTopLeft.x()+radius, winRect.y() +  1,
-                  winRect.x() + winRect.width()-radius, winRect.y() + 1);
+    QLineF lineOut(titleTopLeft.x() + radius, winRect.y(),
+                   winRect.x() + winRect.width() - radius, winRect.y());
     titlePainter.setPen(QPen(d->borderShadowTop, 1.0));
     titlePainter.drawLine(lineOut);
 }