mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 08:55:59 +00:00
Code Issues Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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

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