feat: use native window on mac

Change-Id: I63493ab44b4a20f705e2fd3e798ad47f2eb9e9f8
linuxdeepin · Nov 28, 2017 · b940476 · b940476
1 parent 290fbae
commit b940476
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/app/app.pro b/src/app/app.pro
@@ -36,10 +36,13 @@ SOURCES += \
     bmwindow.cpp \
     main.cpp
 
-linux {
-
+unix {
 INCLUDEPATH += $$PWD/linux
 HEADERS += $$PWD/linux/bmwindow.h
+}
+
+linux {
+
 
 binary.path = $${PREFIX}/bin
 binary.files = $${OUT_PWD}/deepin-boot-maker
@@ -57,7 +60,7 @@ INSTALLS += binary desktop hicolor dman
 
 }
 
-!linux {
+win {
     INCLUDEPATH += $$PWD/other
     HEADERS += $$PWD/other/bmwindow.h
 }

diff --git a/src/app/bmwindow.cpp b/src/app/bmwindow.cpp
@@ -122,11 +122,20 @@ BMWindow::BMWindow(QWidget *parent)
     qApp->setApplicationDescription(descriptionText);
 
     auto title = titlebar();
-    auto flags = title->windowFlags() & ~Qt::WindowMaximizeButtonHint;
+    auto flags = windowFlags() & ~Qt::WindowMaximizeButtonHint;
 #ifndef Q_OS_LINUX
     flags = flags & ~Qt::WindowSystemMenuHint;
 #endif
     setWindowFlags(flags);
+    // TODO: read it from parent
+#ifdef Q_OS_MAC
+    titlebar()->setWindowFlags(flags);
+
+    QPalette pal(palette());
+    pal.setColor(QPalette::Background, Qt::white);
+    setAutoFillBackground(true);
+    setPalette(pal);
+#endif
 
     title->setTitle("");
     title->setIcon(QIcon(":/theme/light/image/deepin-boot-maker.svg"));
@@ -135,7 +144,7 @@ BMWindow::BMWindow(QWidget *parent)
     mainLayout->setMargin(0);
     mainLayout->setSpacing(0);
 
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
     auto centralWidget = new QWidget;
     centralWidget->setLayout(mainLayout);
     setCentralWidget(centralWidget);