From 2a703ff52a2a3351efe3ad3fa039b4827fe0397d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Sun, 23 Oct 2022 21:42:56 +0300 Subject: [PATCH] Various fixes --- submodules/Display/Source/DeviceMetrics.swift | 7 +++++++ submodules/Display/Source/WindowContent.swift | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/submodules/Display/Source/DeviceMetrics.swift b/submodules/Display/Source/DeviceMetrics.swift index 65ba09f228..4b52a1605d 100644 --- a/submodules/Display/Source/DeviceMetrics.swift +++ b/submodules/Display/Source/DeviceMetrics.swift @@ -338,4 +338,11 @@ public enum DeviceMetrics: CaseIterable, Equatable { return false } } + + public var showAppBadge: Bool { + if case .iPhoneX = self { + return false + } + return self.hasTopNotch + } } diff --git a/submodules/Display/Source/WindowContent.swift b/submodules/Display/Source/WindowContent.swift index 64ecf7536e..4b26926b33 100644 --- a/submodules/Display/Source/WindowContent.swift +++ b/submodules/Display/Source/WindowContent.swift @@ -683,10 +683,10 @@ public class Window1 { } private func updateBadgeVisibility() { - let badgeIsHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height + let badgeIsHidden = !self.deviceMetrics.showAppBadge || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height if badgeIsHidden != self.badgeView.isHidden && !badgeIsHidden { Queue.mainQueue().after(0.4) { - let badgeShouldBeHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height + let badgeShouldBeHidden = !self.deviceMetrics.showAppBadge || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height if badgeShouldBeHidden == badgeIsHidden { self.badgeView.isHidden = badgeIsHidden }