From 6f630248ff51a3d23987bdb6590eacb89512530c Mon Sep 17 00:00:00 2001
From: DreamSourceLab <support@dreamsourcelab.com>
Date: Fri, 25 May 2018 20:16:16 +0800
Subject: [PATCH] Add more clear border of main window

---
 DSView/main.cpp              |  2 +-
 DSView/pv/mainframe.cpp      |  4 ++--
 DSView/pv/mainframe.h        |  2 +-
 DSView/pv/widgets/border.cpp | 26 ++++++++++++++++----------
 DSView/pv/widgets/border.h   |  7 +++++++
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/DSView/main.cpp b/DSView/main.cpp
index 2d2a0002..5b0ff18a 100644
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
 	struct sr_context *sr_ctx = NULL;
 	const char *open_file = NULL;
 
-    DSApplication a(argc, argv);
+    QApplication a(argc, argv);
 
     // Set some application metadata
     QApplication::setApplicationVersion(DS_VERSION_STRING);
diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp
index 4e003094..c984884c 100644
--- a/DSView/pv/mainframe.cpp
+++ b/DSView/pv/mainframe.cpp
@@ -47,8 +47,8 @@ MainFrame::MainFrame(DeviceManager &device_manager,
     // be resized or moved via the window system
     setWindowFlags(Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
                    Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint);
-    setMinimumHeight(680);
-    setMinimumWidth(800);
+    setMinimumHeight(minHeight);
+    setMinimumWidth(minWidth);
     //resize(1024, 768);
 
     // Set the window icon
diff --git a/DSView/pv/mainframe.h b/DSView/pv/mainframe.h
index 5d54ee58..08ea92de 100644
--- a/DSView/pv/mainframe.h
+++ b/DSView/pv/mainframe.h
@@ -46,7 +46,7 @@ public:
     static const int minHeight = 680;
 
 public:
-    static const int Margin = 8;
+    static const int Margin = 5;
 
     enum borderTypes{
         None,
diff --git a/DSView/pv/widgets/border.cpp b/DSView/pv/widgets/border.cpp
index 42fc3bd5..11e707c1 100644
--- a/DSView/pv/widgets/border.cpp
+++ b/DSView/pv/widgets/border.cpp
@@ -29,6 +29,12 @@
 namespace pv {
 namespace widgets {
 
+const QColor Border::color_border0 = QColor(80, 80, 80, 255);
+const QColor Border::color_border1 = QColor(48, 47, 47, 200);
+const QColor Border::color_border2 = QColor(48, 47, 47, 150);
+const QColor Border::color_border3 = QColor(48, 47, 47, 100);
+const QColor Border::color_border4 = QColor(48, 47, 47, 10);
+
 Border::Border(int type, QWidget *parent) :
     QWidget(parent),
     _type(type)
@@ -43,18 +49,18 @@ void Border::paintEvent(QPaintEvent *)
     painter.setPen(Qt::NoPen);
     painter.setRenderHint(QPainter::Antialiasing, true);
     QLinearGradient linearGrad(QPointF(width(), height()), QPointF(0, 0));
-    linearGrad.setColorAt(0, QColor(48, 47, 47, 255));
-    linearGrad.setColorAt(0.25, QColor(48, 47, 47, 255));
-    linearGrad.setColorAt(0.5, QColor(48, 47, 47, 255));
-    linearGrad.setColorAt(0.75, QColor(48, 47, 47, 100));
-    linearGrad.setColorAt(1, QColor(48, 47, 47, 10));
+    linearGrad.setColorAt(0, color_border0);
+    linearGrad.setColorAt(0.25, color_border1);
+    linearGrad.setColorAt(0.5, color_border2);
+    linearGrad.setColorAt(0.75, color_border3);
+    linearGrad.setColorAt(1, color_border4);
 
     QRadialGradient radialGrad(QPointF(0, 0), width());
-    radialGrad.setColorAt(0, QColor(48, 47, 47, 255));
-    radialGrad.setColorAt(0.25, QColor(48, 47, 47, 255));
-    radialGrad.setColorAt(0.5, QColor(48, 47, 47, 255));
-    radialGrad.setColorAt(0.75, QColor(48, 47, 47, 100));
-    radialGrad.setColorAt(1, QColor(48, 47, 47, 10));
+    radialGrad.setColorAt(0, color_border0);
+    radialGrad.setColorAt(0.25, color_border1);
+    radialGrad.setColorAt(0.5, color_border2);
+    radialGrad.setColorAt(0.75, color_border3);
+    radialGrad.setColorAt(1, color_border4);
 
     if (_type == pv::MainFrame::TopLeft) {
         QRectF rectangle(0, 0, width()*2, height()*2);
diff --git a/DSView/pv/widgets/border.h b/DSView/pv/widgets/border.h
index 6e850a85..51cde656 100644
--- a/DSView/pv/widgets/border.h
+++ b/DSView/pv/widgets/border.h
@@ -30,6 +30,13 @@ namespace widgets {
 class Border : public QWidget
 {
     Q_OBJECT
+private:
+    static const QColor color_border0;
+    static const QColor color_border1;
+    static const QColor color_border2;
+    static const QColor color_border3;
+    static const QColor color_border4;
+
 public:
     explicit Border(int type, QWidget *parent = 0);