From 95e17968d1a96b8dcc27bac0a6efe5d7da86a9bc Mon Sep 17 00:00:00 2001 From: DreamSourceLab Date: Sun, 27 May 2018 12:06:16 +0800 Subject: [PATCH] Fix the double border issue #130 --- DSView/pv/dialogs/dsdialog.cpp | 3 +-- DSView/pv/dialogs/dsmessagebox.cpp | 6 ++---- DSView/pv/mainframe.cpp | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp index 29986d3a..359a4971 100644 --- a/DSView/pv/dialogs/dsdialog.cpp +++ b/DSView/pv/dialogs/dsdialog.cpp @@ -36,8 +36,7 @@ DSDialog::DSDialog(QWidget *parent, bool hasClose) : QDialog(parent), _moving(false) { - setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog | Qt::WindowSystemMenuHint | - Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); setAttribute(Qt::WA_TranslucentBackground); build_main(hasClose); diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp index 4ef58fc5..70445d7e 100644 --- a/DSView/pv/dialogs/dsmessagebox.cpp +++ b/DSView/pv/dialogs/dsmessagebox.cpp @@ -36,8 +36,7 @@ DSMessageBox::DSMessageBox(QWidget *parent) : QDialog(parent), _moving(false) { - setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog | Qt::WindowSystemMenuHint | - Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); setAttribute(Qt::WA_TranslucentBackground); _main = new QWidget(this); QVBoxLayout *mlayout = new QVBoxLayout(_main); @@ -51,8 +50,7 @@ DSMessageBox::DSMessageBox(QWidget *parent) : _main->setGraphicsEffect(bodyShadow); _msg = new QMessageBox(this); - _msg->setWindowFlags(Qt::FramelessWindowHint | Qt::Widget | Qt::WindowSystemMenuHint | - Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + _msg->setWindowFlags(Qt::Dialog | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); _titlebar = new toolbars::TitleBar(false, this); _titlebar->setTitle(tr("Message")); diff --git a/DSView/pv/mainframe.cpp b/DSView/pv/mainframe.cpp index c984884c..7a2af57c 100644 --- a/DSView/pv/mainframe.cpp +++ b/DSView/pv/mainframe.cpp @@ -45,8 +45,7 @@ MainFrame::MainFrame(DeviceManager &device_manager, setAttribute(Qt::WA_TranslucentBackground); // Make this a borderless window which can't // be resized or moved via the window system - setWindowFlags(Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | - Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint); + setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowSystemMenuHint); setMinimumHeight(minHeight); setMinimumWidth(minWidth); //resize(1024, 768);