Skip to content

Commit 391e727

Browse files
overtakeovertake
committed
no message
1 parent 6619de4 commit 391e727

10 files changed

+20
-17
lines changed

‎Telegram-Mac/AppDelegate.swift

+3-2
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
643643
let previousScale = previousBackingScale.swap(backingScale)
644644
System.legacyMenu = settings.legacyMenu
645645
if previous?.palette != settings.palette || previous?.bubbled != settings.bubbled || previous?.wallpaper.wallpaper != settings.wallpaper.wallpaper || previous?.fontSize != settings.fontSize || previousScale != backingScale {
646-
return updateTheme(with: settings, animated: true && ((previous?.fontSize == settings.fontSize && previous?.palette != settings.palette) || previous?.bubbled != settings.bubbled || previous?.cloudTheme?.id != settings.cloudTheme?.id || previous?.palette.isDark != settings.palette.isDark))
646+
return updateTheme(with: settings, animated: ((previous?.fontSize == settings.fontSize && previous?.palette != settings.palette) || previous?.bubbled != settings.bubbled || previous?.cloudTheme?.id != settings.cloudTheme?.id || previous?.palette.isDark != settings.palette.isDark))
647647
} else {
648648
return nil
649649
}
@@ -667,7 +667,8 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
667667
//
668668

669669
NotificationCenter.default.addObserver(forName: NSWindow.didChangeBackingPropertiesNotification, object: window, queue: nil, using: { notification in
670-
backingProperties.set(System.backingScale)
670+
System.updateScaleFactor(window.backingScaleFactor)
671+
backingProperties.set(window.backingScaleFactor)
671672
})
672673

673674
let autoNightSignal = viewDidChangedAppearance.get() |> mapToSignal { _ in

‎Telegram-Mac/CoreExtension.swift

+3-1
Original file line numberDiff line numberDiff line change
@@ -3141,7 +3141,9 @@ enum FaqDestination {
31413141
func openFaq(context: AccountContext, dest: FaqDestination = .telegram) {
31423142
let language = appCurrentLanguage.languageCode[appCurrentLanguage.languageCode.index(appCurrentLanguage.languageCode.endIndex, offsetBy: -2) ..< appCurrentLanguage.languageCode.endIndex]
31433143

3144-
_ = showModalProgress(signal: webpagePreview(account: context.account, urls: [dest.url]) |> filter { $0 != .progress} |> deliverOnMainQueue, for: context.window).start(next: { result in
3144+
let url = dest.url + language
3145+
3146+
_ = showModalProgress(signal: webpagePreview(account: context.account, urls: [url]) |> filter { $0 != .progress} |> deliverOnMainQueue, for: context.window).start(next: { result in
31453147
switch result {
31463148
case let .result(webpage):
31473149
if let webpage = webpage {

‎Telegram-Mac/GlobalBadgeNode.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ private func generateStatusBarIcon(_ unreadCount: Int, color: NSColor) -> NSImag
271271

272272
let generated: CGImage?
273273
if unreadCount > 0 {
274-
generated = generateImage(NSMakeSize(max((textLayout.0.size.width + 4), (textLayout.0.size.height + 4)), (textLayout.0.size.height + 2)), scale: nil, rotatedContext: { size, ctx in
274+
generated = generateImage(NSMakeSize(max((textLayout.0.size.width + 4), (textLayout.0.size.height + 4)), (textLayout.0.size.height + 2)), rotatedContext: { size, ctx in
275275
let rect = NSMakeRect(0, 0, size.width, size.height)
276276
ctx.clear(rect)
277277

‎Telegram-Mac/GroupCallStatusBar.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import TGUIKit
1212
import ColorPalette
1313

1414
private func generateStatus(alpha: CGFloat) -> NSImage {
15-
let image = generateImage(NSMakeSize(24, 20), scale: nil, rotatedContext: { size, ctx in
15+
let image = generateImage(NSMakeSize(24, 20), rotatedContext: { size, ctx in
1616
ctx.clear(size.bounds)
1717
ctx.setFillColor(darkPalette.redUI.withAlphaComponent(alpha).cgColor)
1818
ctx.fillEllipse(in: NSMakeRect(6, 5, 10, 10))

‎Telegram-Mac/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</dict>
3636
</array>
3737
<key>CFBundleVersion</key>
38-
<string>265254</string>
38+
<string>265302</string>
3939
<key>ITSAppUsesNonExemptEncryption</key>
4040
<false/>
4141
<key>LSApplicationCategoryType</key>

‎TelegramShare/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleShortVersionString</key>
2222
<string>$(MARKETING_VERSION)</string>
2323
<key>CFBundleVersion</key>
24-
<string>265254</string>
24+
<string>265302</string>
2525
<key>ITSAppUsesNonExemptEncryption</key>
2626
<false/>
2727
<key>LSMinimumSystemVersion</key>

‎packages/TGUIKit/Sources/Button.swift

+1-6
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,9 @@ open class Button: Control {
103103
return true
104104
}
105105

106-
open override func viewDidChangeBackingProperties() {
107-
super.viewDidChangeBackingProperties()
108-
updateLayout()
109-
}
110-
106+
111107
open override func setFrameSize(_ newSize: NSSize) {
112108
super.setFrameSize(newSize)
113-
updateLayout()
114109
}
115110

116111
public func updateLayout() -> Void {

‎packages/TGUIKit/Sources/Extensions.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ public extension NSImage {
12281228

12291229
func precomposed(_ colors:[NSColor], flipVertical:Bool = false, flipHorizontal:Bool = false, scale: CGFloat = System.backingScale) -> CGImage {
12301230

1231-
let drawContext:DrawingContext = DrawingContext(size: self.size, scale: scale, clear: true)
1231+
let drawContext:DrawingContext = DrawingContext(size: NSMakeSize(self.size.width, self.size.height), scale: scale, clear: true)
12321232

12331233

12341234
let make:(CGContext) -> Void = { [weak self] ctx in
@@ -1404,7 +1404,7 @@ public extension CGImage {
14041404
}
14051405

14061406
var systemSize:NSSize {
1407-
return NSMakeSize(CGFloat(width) / System.backingScale, CGFloat(height) / System.backingScale)
1407+
return NSMakeSize(CGFloat(width) / scale, CGFloat(height) / scale)
14081408
}
14091409

14101410
var backingBounds: NSRect {

‎packages/TGUIKit/Sources/ImageButton.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ open class ImageButton: Button {
189189
self.layer?.disableActions()
190190
layer?.removeAllAnimations()
191191
imageView.animates = false
192-
imageView.layer?.disableActions()
192+
// imageView.layer?.disableActions()
193193
}
194194

195195
open override func setFrameOrigin(_ newOrigin: NSPoint) {
@@ -213,6 +213,11 @@ open class ImageButton: Button {
213213
return true
214214
}
215215

216+
open override func layout() {
217+
super.layout()
218+
updateLayout()
219+
}
220+
216221
public override func updateLayout() {
217222
if let image = self.imageView.image {
218223
switch imageView.contentGravity {

‎packages/TGUIKit/Sources/ImageView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ open class ImageView: NSView {
102102
layer?.masksToBounds = true
103103
}
104104

105+
105106
required public init?(coder: NSCoder) {
106107
fatalError("init(coder:) has not been implemented")
107108
}
@@ -114,7 +115,6 @@ open class ImageView: NSView {
114115

115116
override open func viewDidChangeBackingProperties() {
116117
if let window = self.window {
117-
self.layer?.contentsScale = window.backingScaleFactor
118118
}
119119
}
120120

0 commit comments

Comments
 (0)