gfgit
/
lxqt-mobile-appswitcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port to KX11Extras 

Many X11 specific functions in KWindowSystem got deprecated
and the correct replacement is KX11Etras
This commit is contained in:
gfgit 2024-01-02 19:42:08 +01:00
parent 28d6ace780
commit 5e5fe08b76
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app-model.cpp
View File

@ -30,7 +30,8 @@
#include <QDebug>
#include <QDesktopWidget>
#include <QScreen>
#include <kwindowsystem.h>
#include <KX11Extras>
#include <KWindowInfo>
AppModel::AppModel(QObject* parent)
: QAbstractListModel(parent)
@ -44,12 +45,12 @@ void AppModel::create()
bool byDesk = Settings::instance().filterCurrentDesktop();
bool byScreen = Settings::instance().filterCurrentScreen();
for (WId wid : KWindowSystem::stackingOrder()) {
for (WId wid : KX11Extras::stackingOrder()) {
KWindowInfo info(wid, NET::WMVisibleName | NET::WMState | NET::XAWMState | NET::WMWindowType);
NET::WindowType type = info.windowType(NET::AllTypesMask);
if (!info.hasState(NET::SkipTaskbar) && (type == NET::Normal || type == NET::Dialog || type == NET::Unknown) &&
filter(wid, byDesk, byScreen)) {
m_list.prepend({wid, info.visibleName(), KWindowSystem::icon(wid, iconSize, iconSize, true)});
m_list.prepend({wid, info.visibleName(), KX11Extras::icon(wid, iconSize, iconSize, true)});
}
}
}
@ -79,7 +80,7 @@ bool AppModel::filter(WId window, bool byDesk, bool byScreen) const
{
KWindowInfo info(window, NET::WMDesktop | NET::WMFrameExtents);
if (byDesk) {
if (KWindowSystem::currentDesktop() != info.desktop() && info.desktop() != NET::OnAllDesktops) {
if (KX11Extras::currentDesktop() != info.desktop() && info.desktop() != NET::OnAllDesktops) {
return false;
}
}

9
src/app-switcher.cpp
View File

@ -35,7 +35,8 @@
#include <QKeyEvent>
#include <QScreen>
#include <QTimer>
#include <kwindowsystem.h>
#include <KX11Extras>
#include <KWindowInfo>
// Should be after Qt headers
#include "app-switcher.h"
@ -140,11 +141,11 @@ void AppSwitcher::activateWindow(WId id)
{
KWindowInfo info(id, NET::WMDesktop);
if (KWindowSystem::currentDesktop() != info.desktop()) {
KWindowSystem::setCurrentDesktop(info.desktop());
if (KX11Extras::currentDesktop() != info.desktop()) {
KX11Extras::setCurrentDesktop(info.desktop());
}
KWindowSystem::forceActiveWindow(id);
KX11Extras::forceActiveWindow(id);
}
void AppSwitcher::keyReleaseEvent(QKeyEvent* event)