kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use new Platform::IsX11

Browse source
This commit is contained in:
Ilya Fedin 2021-02-24 20:42:36 +04:00 • committed by John Preston
parent 7d18c8687b
commit db65fca0aa
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ui/platform/linux/ui_utility_linux.cpp
View file

@ -161,23 +161,27 @@ bool TranslucentWindowsSupported(QPoint globalPosition) {
if (::Platform::IsWayland()) { if (::Platform::IsWayland()) {
return true; return true;
} }
if (const auto native = QGuiApplication::platformNativeInterface()) {
if (const auto desktop = QApplication::desktop()) { if (::Platform::IsX11()) {
if (const auto screen = base::QScreenNearestTo(globalPosition)) { if (const auto native = QGuiApplication::platformNativeInterface()) {
if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) { if (const auto desktop = QApplication::desktop()) {
return true; if (const auto screen = base::QScreenNearestTo(globalPosition)) {
if (native->nativeResourceForScreen(QByteArray("compositingEnabled"), screen)) {
return true;
}
const auto index = QGuiApplication::screens().indexOf(screen);
static auto WarnedAbout = base::flat_set<int>();
if (!WarnedAbout.contains(index)) {
WarnedAbout.emplace(index);
UI_LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
}
} else {
UI_LOG(("WARNING: Could not get screen for position %1,%2").arg(globalPosition.x()).arg(globalPosition.y()));
} }
const auto index = QGuiApplication::screens().indexOf(screen);
static auto WarnedAbout = base::flat_set<int>();
if (!WarnedAbout.contains(index)) {
WarnedAbout.emplace(index);
UI_LOG(("WARNING: Compositing is disabled for screen index %1 (for position %2,%3)").arg(index).arg(globalPosition.x()).arg(globalPosition.y()));
}
} else {
UI_LOG(("WARNING: Could not get screen for position %1,%2").arg(globalPosition.x()).arg(globalPosition.y()));
} }
} }
} }
return false; return false;
} }
@ -193,7 +197,7 @@ bool WindowExtentsSupported() {
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
namespace XCB = base::Platform::XCB; namespace XCB = base::Platform::XCB;
if (!::Platform::IsWayland() if (::Platform::IsX11()
&& XCB::IsSupportedByWM(kXCBFrameExtentsAtomName.utf16())) { && XCB::IsSupportedByWM(kXCBFrameExtentsAtomName.utf16())) {
return true; return true;
} }
@ -210,13 +214,15 @@ bool SetWindowExtents(QWindow *window, const QMargins &extents) {
#else // DESKTOP_APP_QT_PATCHED #else // DESKTOP_APP_QT_PATCHED
return false; return false;
#endif // !DESKTOP_APP_QT_PATCHED #endif // !DESKTOP_APP_QT_PATCHED
} else { } else if (::Platform::IsX11()) {
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
return SetXCBFrameExtents(window, extents); return SetXCBFrameExtents(window, extents);
#else // !DESKTOP_APP_DISABLE_X11_INTEGRATION #else // !DESKTOP_APP_DISABLE_X11_INTEGRATION
return false; return false;
#endif // DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // DESKTOP_APP_DISABLE_X11_INTEGRATION
} }
return false;
} }
bool UnsetWindowExtents(QWindow *window) { bool UnsetWindowExtents(QWindow *window) {
@ -227,13 +233,15 @@ bool UnsetWindowExtents(QWindow *window) {
#else // DESKTOP_APP_QT_PATCHED #else // DESKTOP_APP_QT_PATCHED
return false; return false;
#endif // !DESKTOP_APP_QT_PATCHED #endif // !DESKTOP_APP_QT_PATCHED
} else { } else if (::Platform::IsX11()) {
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION #ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
return UnsetXCBFrameExtents(window); return UnsetXCBFrameExtents(window);
#else // !DESKTOP_APP_DISABLE_X11_INTEGRATION #else // !DESKTOP_APP_DISABLE_X11_INTEGRATION
return false; return false;
#endif // DESKTOP_APP_DISABLE_X11_INTEGRATION #endif // DESKTOP_APP_DISABLE_X11_INTEGRATION
} }
return false;
} }
bool ShowWindowMenu(QWindow *window) { bool ShowWindowMenu(QWindow *window) {