Merge pull request #1434 from 1445643474/zeno-727

fix bug about frmeless dialog
zenustech · Sep 18, 2023 · 70409cf · 70409cf
2 parents 2719e5c + c2c2322
commit 70409cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/ui/zenoedit/dialog/zcheckupdatedlg.cpp b/ui/zenoedit/dialog/zcheckupdatedlg.cpp
@@ -60,8 +60,8 @@ void ZCheckUpdateDlg::updateView(bool bVisible)
     m_ui->m_remindBtn->setVisible(bVisible);
     m_ui->m_updateBtn->setVisible(bVisible);
 
-    QSize size = bVisible ? QSize(560, 600): QSize(500, 200);
-    this->setFixedSize(ZenoStyle::dpiScaledSize(size));
+    QSize size = bVisible ? QSize(560, 600): QSize(500, 180);
+    m_ui->m_mainWidget->setFixedSize(ZenoStyle::dpiScaledSize(size));
 }
 
 void ZCheckUpdateDlg::requestLatestVersion()

diff --git a/ui/zenoedit/dialog/zcheckupdatedlg.ui b/ui/zenoedit/dialog/zcheckupdatedlg.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>625</width>
-    <height>620</height>
+    <width>441</width>
+    <height>177</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/ui/zenoedit/res/stylesheet/pushbutton.qss b/ui/zenoedit/res/stylesheet/pushbutton.qss
@@ -344,11 +344,11 @@ QPushButton[cssClass="select_subgraph"]
 QPushButton#closebtn
 {
 	background-color: transparent;
-    background-image: url(:/icons/closebtn.svg);
+    border-image: url(:/icons/closebtn.svg);
 	border:0;
 }
 
 QPushButton#closebtn:hover
 {
-	background-image: url(:/icons/closebtn_on.svg);
+	border-image: url(:/icons/closebtn_on.svg);
 }
diff --git a/ui/zenoui/comctrl/dialog/zframelessdialog.cpp b/ui/zenoui/comctrl/dialog/zframelessdialog.cpp
@@ -41,7 +41,7 @@ void ZFramelessDialog::initTitleWidget()
 
     QPushButton* pBtnClose = new QPushButton(this);
     pBtnClose->setObjectName("closebtn");
-    pBtnClose->setFixedSize(ZenoStyle::dpiScaledSize(QSize(24, 24)));
+    pBtnClose->setFixedSize(ZenoStyle::dpiScaledSize(QSize(20, 20)));
     connect(pBtnClose, &QPushButton::clicked, this, &ZFramelessDialog::close);
 
     QHBoxLayout* pTitleLayout = new QHBoxLayout;
@@ -50,14 +50,16 @@ void ZFramelessDialog::initTitleWidget()
     pTitleLayout->addWidget(m_pLbTitle, 0, Qt::AlignCenter);
     pTitleLayout->addStretch();
     pTitleLayout->addWidget(pBtnClose, 0, Qt::AlignCenter);
-    pTitleLayout->setContentsMargins(12, 12, 12, 12);
+    qreal margin = ZenoStyle::dpiScaled(8);
+    pTitleLayout->setContentsMargins(margin, margin, margin, margin);
 
     QWidget* pTitleWidget = new QWidget(this);
     pTitleWidget->setLayout(pTitleLayout);
     pTitleWidget->setAutoFillBackground(true);
     QPalette pal = palette();
     pal.setColor(QPalette::Window, QColor("#121417"));
     pTitleWidget->setPalette(pal);
+    pTitleWidget->setFixedHeight(ZenoStyle::dpiScaled(36));
 
     QVBoxLayout* pLayout = new QVBoxLayout(this);
     pLayout->addWidget(pTitleWidget);