From 013199e7e5a01f89ebabf326b2ec6eac758a6b1a Mon Sep 17 00:00:00 2001
From: "ATTIOT\\zhengcy" <zcy@xmu.edu.cn>
Date: Tue, 11 May 2021 15:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=A1=A8=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=BC=80=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Qss.cpp             | 18 ++++++++----------
 css/QssTitleBar.css |  2 +-
 qsswraper.pri       |  1 -
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Qss.cpp b/Qss.cpp
index b9004a7..bc06fcb 100644
--- a/Qss.cpp
+++ b/Qss.cpp
@@ -1,4 +1,4 @@
-#include "Qss.h"
+#include "Qss.h"
 #include <QPushButton>
 #include <QLabel>
 #include <QBoxLayout>
@@ -56,15 +56,14 @@ QssTtitleBar::QssTtitleBar(QWidget *parent ,
     m_maxBtn->setToolTip(QString::fromLocal8Bit(""));
     m_maxBtn->setVisible(m_type & QTitleBar_Button_Max);
 
-//    m_iconBtn = new QPushButton(this);
-//    m_iconBtn->setObjectName("titlebaricon");
 
     m_titlebarTitle = new QLabel(this);
     m_titlebarTitle->setObjectName("title");
+
     QHBoxLayout* hBox = new QHBoxLayout(this);
 
-    //hBox->setMargin(0);
-    //hBox->addWidget(m_iconBtn);
+    hBox->setContentsMargins(0,0,0,0);
+
     hBox->addStretch(20);
     hBox->addWidget(m_titlebarTitle);
     hBox->addStretch(19);
@@ -74,7 +73,6 @@ QssTtitleBar::QssTtitleBar(QWidget *parent ,
     hBox->addWidget(m_maxBtn);
     hBox->addWidget(m_closeBtn);
 
-    hBox->setSpacing(0);
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     connect(m_closeBtn, SIGNAL(clicked()), parent, SLOT(close()));
@@ -82,11 +80,10 @@ QssTtitleBar::QssTtitleBar(QWidget *parent ,
     connect(m_maxBtn, SIGNAL(clicked()), this, SLOT(onMaxOrRestore()));
     connect(m_restoreBtn, SIGNAL(clicked()), this, SLOT(onMaxOrRestore()));
 
-//    m_iconBtn->installEventFilter(this);//m_iconLab
     installEventFilter(this);
 
     m_rcValid = QApplication::desktop()->availableGeometry();
-    this->setFixedHeight(25);
+
     setWindowFlags(windowFlags()|Qt::MSWindowsFixedSizeDialogHint);
     this->setGeometry(parent->geometry().x(),parent->geometry().y(),0,0);
     m_rcNormal = parentWidget()->geometry();
@@ -99,6 +96,7 @@ QssTtitleBar::QssTtitleBar(QWidget *parent ,
     QTextStream in(&file);
     QString css = in.readAll();
     this->setStyleSheet(css);
+    m_titlebarTitle->setMinimumHeight(this->height());
 
 }
 
@@ -284,7 +282,8 @@ QssMainWindow::QssMainWindow(QWidget *parent/* = 0*/, Qt::WindowFlags flags/* =
     }
     QTextStream in(&file);
     QString css = in.readAll();
-    //this->setStyleSheet(css);
+    qDebug()<<css;
+    m_frame->setStyleSheet(css);
     return;
 }
 
@@ -569,7 +568,6 @@ bool QssMainWindow::eventFilter(QObject * obj, QEvent * ev){
     }
     else if (obj == m_titleBar)
     {
-        qDebug()<<"resize";
         QCoreApplication::sendEvent(this,new QEvent(QEvent::Type::Resize));
         if (ev->type() == QEvent::Enter)
         {
diff --git a/css/QssTitleBar.css b/css/QssTitleBar.css
index caa0fcf..aac2bc4 100644
--- a/css/QssTitleBar.css
+++ b/css/QssTitleBar.css
@@ -58,7 +58,7 @@ QWidget#qssTitleBar >QPushButton#titlebarmaxbtn:enabled:hover{
 }
 QWidget#qssTitleBar > QLabel#title{
     color: white;
-    font-size:15px;
+    font-size: 17px;
     font-family:'黑体', Courier, monospace;
 }
 
diff --git a/qsswraper.pri b/qsswraper.pri
index 6131296..817a84c 100644
--- a/qsswraper.pri
+++ b/qsswraper.pri
@@ -4,7 +4,6 @@ DEPENDPATH += $$PWD
 HEADERS                +=  $$PWD/Qss.h
 SOURCES                += $$PWD/Qss.cpp
 
-RESOURCES += $$PWD/qss.qrc
 FORMS += $$PWD/forms/qsstoast.ui \
         $$PWD/forms/process.ui