diff --git a/frontend/control/create-index-ask-dialog.cpp b/frontend/control/create-index-ask-dialog.cpp index dcf62d7..f0f4e58 100644 --- a/frontend/control/create-index-ask-dialog.cpp +++ b/frontend/control/create-index-ask-dialog.cpp @@ -21,7 +21,7 @@ #include "create-index-ask-dialog.h" #include -#include "kwindowsystem.h" +#include #define MAIN_SIZE QSize(380, 202) #define MAIN_SPACING 0 diff --git a/frontend/frontend.pro b/frontend/frontend.pro index a76c77f..e174172 100644 --- a/frontend/frontend.pro +++ b/frontend/frontend.pro @@ -7,7 +7,7 @@ DEFINES += VERSION='\\"$${VERSION}\\"' TARGET = ukui-search TEMPLATE = app -PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0 +PKGCONFIG += gio-2.0 glib-2.0 gio-unix-2.0 kysdk-waylandhelper CONFIG += c++11 link_pkgconfig no_keywords lrelease LIBS += -lxapian -lgsettings-qt -lquazip5 -lX11 #LIBS += -lukui-log4qt diff --git a/frontend/mainwindow.cpp b/frontend/mainwindow.cpp index 58fbb58..283d3e2 100644 --- a/frontend/mainwindow.cpp +++ b/frontend/mainwindow.cpp @@ -31,10 +31,12 @@ #include #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) #include -#include "kwindowsystem.h" +#include #endif -#include "global-settings.h" #include +#include "ukuistylehelper/ukuistylehelper.h" +#include "windowmanager/windowmanager.h" +#include "global-settings.h" #define MAIN_MARGINS 0, 0, 0, 0 #define TITLE_MARGINS 0,0,0,0 @@ -150,11 +152,11 @@ void MainWindow::initUi() { //创建索引询问弹窗 m_askDialog = new CreateIndexAskDialog(this); #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) - MotifWmHints ask_dialog_hints; - ask_dialog_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; - ask_dialog_hints.functions = MWM_FUNC_ALL; - ask_dialog_hints.decorations = MWM_DECOR_BORDER; - XAtomHelper::getInstance()->setWindowMotifHint(m_askDialog->winId(), ask_dialog_hints); +// MotifWmHints ask_dialog_hints; +// ask_dialog_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; +// ask_dialog_hints.functions = MWM_FUNC_ALL; +// ask_dialog_hints.decorations = MWM_DECOR_BORDER; +// XAtomHelper::getInstance()->setWindowMotifHint(m_askDialog->winId(), ask_dialog_hints); #endif } @@ -192,7 +194,6 @@ void MainWindow::bootOptionsFilter(QString opt) { if (this->isHidden()) { clearSearchResult(); centerToScreen(this); - this->show(); this->m_searchBarWidget->setFocus(); this->activateWindow(); } @@ -217,7 +218,6 @@ void MainWindow::trayIconActivatedSlot(QSystemTrayIcon::ActivationReason reason) if(!this->isVisible()) { clearSearchResult(); centerToScreen(this); - this->show(); // this->m_searchLineEdit->focusIn(); //打开主界面时输入框夺焦,可直接输入 this->raise(); this->activateWindow(); @@ -426,7 +426,12 @@ void MainWindow::centerToScreen(QWidget* widget) { // desk_x = width; // desk_y = height; // } - widget->move(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 3 + desk_rect.top()); + widget->show(); + kdk::WindowManager::setGeometry(this->windowHandle(),QRect(desk_x / 2 - x / 2 + desk_rect.left(), + desk_y / 3 + desk_rect.top(), + this->width(), + this->height())); +// widget->move(desk_x / 2 - x / 2 + desk_rect.left(), desk_y / 3 + desk_rect.top()); } void MainWindow::initGsettings() { @@ -465,6 +470,7 @@ void MainWindow::initTimer() { connect(m_askTimer, &QTimer::timeout, this, [ = ]() { if(this->isVisible()) { m_isAskDialogVisible = true; + kdk::UkuiStyleHelper::self()->removeHeader(m_askDialog); m_askDialog->show(); m_currentSearchAsked = true; }