Move IsWayland() checks into WaylandIntegration
This commit is contained in:
parent
4ed6918a5e
commit
49480001f7
|
@ -55,6 +55,7 @@ WaylandIntegration::WaylandIntegration() {
|
||||||
}
|
}
|
||||||
|
|
||||||
WaylandIntegration *WaylandIntegration::Instance() {
|
WaylandIntegration *WaylandIntegration::Instance() {
|
||||||
|
if (!IsWayland()) return nullptr;
|
||||||
static WaylandIntegration instance;
|
static WaylandIntegration instance;
|
||||||
return &instance;
|
return &instance;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||||
*/
|
*/
|
||||||
#include "platform/linux/linux_wayland_integration.h"
|
#include "platform/linux/linux_wayland_integration.h"
|
||||||
|
|
||||||
|
#include "base/platform/base_platform_info.h"
|
||||||
|
|
||||||
namespace Platform {
|
namespace Platform {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|
||||||
|
@ -14,6 +16,7 @@ WaylandIntegration::WaylandIntegration() {
|
||||||
}
|
}
|
||||||
|
|
||||||
WaylandIntegration *WaylandIntegration::Instance() {
|
WaylandIntegration *WaylandIntegration::Instance() {
|
||||||
|
if (!IsWayland()) return nullptr;
|
||||||
static WaylandIntegration instance;
|
static WaylandIntegration instance;
|
||||||
return &instance;
|
return &instance;
|
||||||
}
|
}
|
||||||
|
|
|
@ -809,8 +809,7 @@ bool SkipTaskbarSupported() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool StartSystemMove(QWindow *window) {
|
bool StartSystemMove(QWindow *window) {
|
||||||
if (IsWayland()) {
|
if (const auto integration = WaylandIntegration::Instance()) {
|
||||||
const auto integration = WaylandIntegration::Instance();
|
|
||||||
return integration->startMove(window);
|
return integration->startMove(window);
|
||||||
} else {
|
} else {
|
||||||
return StartXCBMoveResize(window, 16);
|
return StartXCBMoveResize(window, 16);
|
||||||
|
@ -818,8 +817,7 @@ bool StartSystemMove(QWindow *window) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool StartSystemResize(QWindow *window, Qt::Edges edges) {
|
bool StartSystemResize(QWindow *window, Qt::Edges edges) {
|
||||||
if (IsWayland()) {
|
if (const auto integration = WaylandIntegration::Instance()) {
|
||||||
const auto integration = WaylandIntegration::Instance();
|
|
||||||
return integration->startResize(window, edges);
|
return integration->startResize(window, edges);
|
||||||
} else {
|
} else {
|
||||||
return StartXCBMoveResize(window, edges);
|
return StartXCBMoveResize(window, edges);
|
||||||
|
@ -827,8 +825,7 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ShowWindowMenu(QWindow *window) {
|
bool ShowWindowMenu(QWindow *window) {
|
||||||
if (IsWayland()) {
|
if (const auto integration = WaylandIntegration::Instance()) {
|
||||||
const auto integration = WaylandIntegration::Instance();
|
|
||||||
return integration->showWindowMenu(window);
|
return integration->showWindowMenu(window);
|
||||||
} else {
|
} else {
|
||||||
return ShowXCBWindowMenu(window);
|
return ShowXCBWindowMenu(window);
|
||||||
|
|
Loading…
Reference in New Issue