MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move IsWayland() checks into WaylandIntegration

Browse Source
This commit is contained in:
mid-kid 2020-11-13 17:05:54 +01:00 committed by John Preston
parent 4ed6918a5e
commit 49480001f7
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
View File

@ -55,6 +55,7 @@ WaylandIntegration::WaylandIntegration() {
}
WaylandIntegration *WaylandIntegration::Instance() {
if (!IsWayland()) return nullptr;
static WaylandIntegration instance;
return &instance;
}

3
Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp
View File

@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/linux/linux_wayland_integration.h"
#include "base/platform/base_platform_info.h"
namespace Platform {
namespace internal {
@ -14,6 +16,7 @@ WaylandIntegration::WaylandIntegration() {
}
WaylandIntegration *WaylandIntegration::Instance() {
if (!IsWayland()) return nullptr;
static WaylandIntegration instance;
return &instance;
}

9
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@ -809,8 +809,7 @@ bool SkipTaskbarSupported() {
}
bool StartSystemMove(QWindow *window) {
if (IsWayland()) {
const auto integration = WaylandIntegration::Instance();
if (const auto integration = WaylandIntegration::Instance()) {
return integration->startMove(window);
} else {
return StartXCBMoveResize(window, 16);
@ -818,8 +817,7 @@ bool StartSystemMove(QWindow *window) {
}
bool StartSystemResize(QWindow *window, Qt::Edges edges) {
if (IsWayland()) {
const auto integration = WaylandIntegration::Instance();
if (const auto integration = WaylandIntegration::Instance()) {
return integration->startResize(window, edges);
} else {
return StartXCBMoveResize(window, edges);
@ -827,8 +825,7 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
}
bool ShowWindowMenu(QWindow *window) {
if (IsWayland()) {
const auto integration = WaylandIntegration::Instance();
if (const auto integration = WaylandIntegration::Instance()) {
return integration->showWindowMenu(window);
} else {
return ShowXCBWindowMenu(window);