fix(frontend):wlcom环境适配多屏显示功能

This commit is contained in:
iaom 2024-07-24 16:25:27 +08:00
parent aa169869e8
commit 7950388444
2 changed files with 6 additions and 3 deletions

View File

@ -15,6 +15,7 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core DBus Widgets Xml Concurrent Sql Li
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core DBus Widgets Xml Concurrent Sql LinguistTools X11Extras REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core DBus Widgets Xml Concurrent Sql LinguistTools X11Extras REQUIRED)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
find_package(KF5WindowSystem) find_package(KF5WindowSystem)
find_package(ukui-quick COMPONENTS platform REQUIRED)
set(UKUI_SEARCH_EXTERNAL_LIBS "") set(UKUI_SEARCH_EXTERNAL_LIBS "")
set(UKUI_SEARCH_PC_PKGS gio-2.0 glib-2.0 gio-unix-2.0 kysdk-waylandhelper xapian-core gsettings-qt) set(UKUI_SEARCH_PC_PKGS gio-2.0 glib-2.0 gio-unix-2.0 kysdk-waylandhelper xapian-core gsettings-qt)
@ -97,6 +98,7 @@ target_link_libraries(frontend PRIVATE
kysdk-waylandhelper kysdk-waylandhelper
qtsingleapplication qtsingleapplication
tcmalloc_minimal tcmalloc_minimal
ukui-quick::platform
) )
target_include_directories(frontend PRIVATE target_include_directories(frontend PRIVATE

View File

@ -33,8 +33,9 @@
#include <KWindowSystem> #include <KWindowSystem>
#include <QtX11Extras/QX11Info> #include <QtX11Extras/QX11Info>
#include <gperftools/malloc_extension.h> #include <gperftools/malloc_extension.h>
#include "ukuistylehelper/ukuistylehelper.h" #include <ukuistylehelper/ukuistylehelper.h>
#include "windowmanager/windowmanager.h" #include <windowmanager/windowmanager.h>
#include <window-helper.h>
#include "global-settings.h" #include "global-settings.h"
#include "action-transmiter.h" #include "action-transmiter.h"
#include "icon-loader.h" #include "icon-loader.h"
@ -268,7 +269,7 @@ void MainWindow::centerToScreen(QWidget* widget) {
if(!widget) if(!widget)
return; return;
KWindowSystem::setState(this->winId(),NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher); KWindowSystem::setState(this->winId(),NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher);
QRect desk_rect = qApp->screenAt(QCursor::pos())->geometry(); QRect desk_rect = UkuiQuick::WindowProxy::currentScreen()->geometry();
int desk_x = desk_rect.width(); int desk_x = desk_rect.width();
int desk_y = desk_rect.height(); int desk_y = desk_rect.height();
int x = widget->width(); int x = widget->width();