openkylin
/
ukui-panel
mirror of https://gitee.com/openkylin/ukui-panel.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

适配SDK位置接口 && wayland下屏蔽给窗管发送的图标位置更新的接口

This commit is contained in:
buxiaoqing 2023-03-06 14:33:50 +08:00
parent 04b4d95b88
commit 72aa28e745
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panel/ukuipanel.cpp
View File

@ -52,8 +52,6 @@
#include <KWindowSystem/KWindowSystem>
#include <KWindowSystem/NETWM>
//#include <glib.h>
//#include <gio/gio.h>
#include <QGSettings>
// Turn on this to show the time required to load each plugin during startup
// #define DEBUG_PLUGIN_LOADTIME
@ -61,7 +59,7 @@
#include "common_fun/ukuipanel_infomation.h"
#include "common_fun/dbus-adaptor.h"
#include "common_fun/panel_commission.h"
#include "windowmanager/windowmanager.h"
/************************************************
Returns the Position by the string.
@ -617,7 +615,7 @@ void UKUIPanel::setPanelGeometry(bool animate)
m_animation->start();
} else {
setMargins();
setGeometry(rect);
kdk::WindowManager::setGeometry(this->windowHandle(), rect);
}
}
QDBusMessage message =QDBusMessage::createSignal("/panel/position", "org.ukui.panel", "UKuiPanelPosition");

6
plugin-taskbar/ukuitaskbutton.cpp
View File

@ -212,6 +212,10 @@ void UKUITaskButton::setGroupIcon(QIcon ico)
void UKUITaskButton::refreshIconGeometry(QRect const & geom)
{
QString platform = QGuiApplication::platformName();
if(platform.startsWith(QLatin1String("wayland"),Qt::CaseInsensitive)) {
return;
}
NETWinInfo info(QX11Info::connection(),
m_sdkWindow.toInt(),
(WId) QX11Info::appRootWindow(),
@ -219,7 +223,7 @@ void UKUITaskButton::refreshIconGeometry(QRect const & geom)
0);
NETRect const curr = info.iconGeometry();
if (curr.pos.x != geom.x() || curr.pos.y != geom.y()
|| curr.size.width != geom.width() || curr.size.height != geom.height()) {
|| curr.size.width != geom.width() || curr.size.height != geom.height()) {
NETRect nrect;
nrect.pos.x = geom.x();
nrect.pos.y = geom.y();