mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 15:45:12 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse Source
This commit is contained in:
RadRussianRus
2020-06-26 07:25:00 +03:00
parent 856d72ce90 bede709f6b
commit 0943d58ea7
120 changed files with 1095 additions and 1019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -499,11 +499,11 @@ void NotificationsCount::SampleWidget::destroyDelayed() {
_deleted = true;
// Ubuntu has a lag if deleteLater() called immediately.
#if defined Q_OS_LINUX32 || defined Q_OS_LINUX64
#if defined Q_OS_UNIX && !defined Q_OS_MAC
QTimer::singleShot(1000, [this] { delete this; });
#else // Q_OS_LINUX32 || Q_OS_LINUX64
#else // Q_OS_UNIX && !Q_OS_MAC
deleteLater();
#endif // Q_OS_LINUX32 || Q_OS_LINUX64
#endif // Q_OS_UNIX && !Q_OS_MAC
}
void SetupAdvancedNotifications(
@@ -633,7 +633,7 @@ void SetupNotificationsContent(
return QString();
} else if (Platform::IsWindows()) {
return tr::lng_settings_use_windows(tr::now);
} else if (Platform::IsLinux()) {
} else if (Platform::IsLinux() && !Platform::IsWayland()) {
return tr::lng_settings_use_native_notifications(tr::now);
}
return QString();
@@ -651,6 +651,9 @@ void SetupNotificationsContent(
}();
const auto advancedSlide = !Platform::IsMac10_8OrGreater()
#ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
&& !Platform::IsWayland()
#endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
? container->add(
object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
container,