void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 15:13:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Platform::IsWayland could be used on any platform now

Browse source
This commit is contained in:
Ilya Fedin 2020-06-22 05:15:19 +04:00 • committed by John Preston
parent 9a65481e9d
commit 68fde210c6
3 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,13 +773,9 @@ void Application::notifyFileDialogShown(bool shown) {
} }
QWidget *Application::getModalParent() { QWidget *Application::getModalParent() {
#if defined Q_OS_UNIX && !defined Q_OS_MAC
return Platform::IsWayland() return Platform::IsWayland()
? App::wnd() ? App::wnd()
: nullptr; : nullptr;
#endif // Q_OS_UNIX && !Q_OS_MAC
return nullptr;
} }

11
Telegram/SourceFiles/settings/settings_notifications.cpp
View file

@ -633,12 +633,7 @@ void SetupNotificationsContent(
return QString(); return QString();
} else if (Platform::IsWindows()) { } else if (Platform::IsWindows()) {
return tr::lng_settings_use_windows(tr::now); return tr::lng_settings_use_windows(tr::now);
} else if (Platform::IsLinux()) { } else if (Platform::IsLinux() && !Platform::IsWayland()) {
#if defined Q_OS_UNIX && !defined Q_OS_MAC
if (Platform::IsWayland()) {
return QString();
}
#endif // Q_OS_UNIX && !Q_OS_MAC
return tr::lng_settings_use_native_notifications(tr::now); return tr::lng_settings_use_native_notifications(tr::now);
} }
return QString(); return QString();
@ -656,9 +651,9 @@ void SetupNotificationsContent(
}(); }();
const auto advancedSlide = !Platform::IsMac10_8OrGreater() const auto advancedSlide = !Platform::IsMac10_8OrGreater()
#if defined Q_OS_UNIX && !defined Q_OS_MAC && !defined TDESKTOP_DISABLE_DBUS_INTEGRATION #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
&& !Platform::IsWayland() && !Platform::IsWayland()
#endif // Q_OS_UNIX && !Q_OS_MAC && !TDESKTOP_DISABLE_DBUS_INTEGRATION #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
? container->add( ? container->add(
object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>( object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
container, container,

2
Telegram/lib_base

@ -1 +1 @@
Subproject commit 18868e1634d4f12727af93da1500108fc689981c Subproject commit 3017da83c15e5e27244ab66526fea8cc3bddb7cf