kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-21 10:50:30 +03:00
Code Issues Projects Releases Wiki Activity

remove gtk_frame_extents from window geometries

Browse Source 
--under x11 environment remove the gtk_frame_extents that
are used for shadows under plasma environment

BUG:417856
This commit is contained in:
Michail Vourlakos 2020-03-06 21:45:54 +02:00
parent ef3a59e836
commit d3b5e2c4eb
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/wm/xwindowinterface.cpp
View File

@ -332,6 +332,23 @@ void XWindowInterface::setActiveEdge(QWindow *view, bool active) const
xcb_change_property(c, XCB_PROP_MODE_REPLACE, window->winId(), atom->atom, XCB_ATOM_CARDINAL, 32, 1, &value);
}
#if KF5_VERSION_MINOR >= 65
QRect XWindowInterface::visibleGeometry(const WindowId &wid, const QRect &frameGeometry) const
{
NETWinInfo ni(QX11Info::connection(), wid.toUInt(), QX11Info::appRootWindow(), 0, NET::WM2GTKFrameExtents);
NETStrut struts = ni.gtkFrameExtents();
QMargins margins(struts.left, struts.top, struts.right, struts.bottom);
QRect visibleGeometry = frameGeometry;
if (!margins.isNull()) {
visibleGeometry -= margins;
}
return visibleGeometry;
}
#endif
WindowInfoWrap XWindowInterface::requestInfoActive() const
{
return requestInfo(KWindowSystem::activeWindow());
@ -367,7 +384,11 @@ WindowInfoWrap XWindowInterface::requestInfo(WindowId wid) const
winfoWrap.setIsShaded(winfo.hasState(NET::Shaded));
winfoWrap.setIsOnAllDesktops(winfo.onAllDesktops());
winfoWrap.setIsOnAllActivities(winfo.activities().empty());
#if KF5_VERSION_MINOR >= 65
winfoWrap.setGeometry(visibleGeometry(wid, winfo.frameGeometry()));
#else
winfoWrap.setGeometry(winfo.frameGeometry());
#endif
winfoWrap.setIsKeepAbove(winfo.hasState(NET::KeepAbove));
winfoWrap.setIsKeepBelow(winfo.hasState(NET::KeepBelow));
winfoWrap.setHasSkipTaskbar(winfo.hasState(NET::SkipTaskbar));

5
app/wm/xwindowinterface.h
View File

@ -22,6 +22,7 @@
#define XWINDOWINTERFACE_H
// local
#include <config-latte.h>
#include "abstractwindowinterface.h"
#include "windowinfowrap.h"
@ -86,6 +87,10 @@ private:
bool isValidWindow(const KWindowInfo &winfo) const;
bool isFullScreenWindow(WindowId wid) const;
#if KF5_VERSION_MINOR >= 65
QRect visibleGeometry(const WindowId &wid, const QRect &frameGeometry) const;
#endif
bool isAcceptableWindow(WId wid);
void windowAddedProxy(WId wid);
void windowChangedProxy(WId wid, NET::Properties prop1, NET::Properties2 prop2);