procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Use Platform::IsWayland from lib_base

Browse source
This commit is contained in:
Ilya Fedin 2020-06-03 09:43:59 +04:00 committed by John Preston
parent d92b5eebcc
commit d45e74619d
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/core/application.cpp
View file

@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/ui_integration.h"
#include "chat_helpers/emoji_keywords.h"
#include "storage/localstorage.h"
#include "base/platform/base_platform_info.h"
#include "platform/platform_specific.h"
#include "mainwindow.h"
#include "dialogs/dialogs_entry.h"
@ -772,9 +773,13 @@ void Application::notifyFileDialogShown(bool shown) {
}
QWidget *Application::getModalParent() {
return QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive)
#ifdef Q_OS_LINUX
return Platform::IsWayland()
? App::wnd()
: nullptr;
#endif // Q_OS_LINUX
return nullptr;
}

6
Telegram/SourceFiles/platform/linux/linux_libs.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#include "platform/linux/linux_libs.h"
#include "base/platform/base_platform_info.h"
#include "platform/linux/linux_gdk_helper.h"
#include "platform/linux/linux_desktop_environment.h"
#include "platform/linux/specific_linux.h"
@ -15,8 +16,6 @@ extern "C" {
#include <X11/Xlib.h>
}
#include <QtGui/QGuiApplication>
namespace Platform {
namespace Libs {
namespace {
@ -144,8 +143,7 @@ bool setupGtkBase(QLibrary &lib_gtk) {
// Otherwise we get segfault in Ubuntu 17.04 in gtk_init_check() call.
// See https://github.com/telegramdesktop/tdesktop/issues/3176
// See https://github.com/telegramdesktop/tdesktop/issues/3162
if(QGuiApplication::platformName().startsWith(qsl("wayland"), Qt::CaseInsensitive)
&& !lib_gtk.fileName().contains("gtk-x11-2.0")) {
if(Platform::IsWayland() && !lib_gtk.fileName().contains("gtk-x11-2.0")) {
DEBUG_LOG(("Limit allowed GDK backends to wayland"));
gdk_set_allowed_backends("wayland");
} else {

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 2f9ae1250f36881ffb985b1e0af24be53481a9df
Subproject commit 486003d41751c1c775513598c8a4154cd294a136

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit e27395cf1878662f177f7aaea48a82e044da6b53
Subproject commit 6451ae50741a13b6b8e48835da654e24f34695aa