ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8341247b5df17485928a325cd314c18ad1b9f6f1' into bazel

Browse Source 
# Conflicts:
#	.gitignore
#	BUCK
#	Makefile
#	Telegram/Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements
#	submodules/AsyncDisplayKit/Source/ASDisplayNode.h
#	submodules/AsyncDisplayKit/Source/Private/ASDisplayNode+FrameworkPrivate.h
#	submodules/Display/Display/ListView.swift
#	submodules/Display/Display/Navigation/NavigationController.swift
#	submodules/Display/Display/NavigationBar.swift
#	submodules/Display/Display/NavigationButtonNode.swift
#	submodules/Display/Display/TabBarNode.swift
#	submodules/Display/Display/ViewController.swift
#	submodules/Display/Source/ContextContentContainerNode.swift
#	submodules/Display/Source/ContextContentSourceNode.swift
#	submodules/Display/Source/ContextControllerSourceNode.swift
#	submodules/Display/Source/ContextGesture.swift
#	submodules/TelegramUI/Sources/Resources/Animations/ChatListEmpty.tgs
#	submodules/TelegramUI/Sources/Resources/Animations/ChatListFilterEmpty.tgs
#	submodules/TelegramUI/TelegramUI/ChatController.swift
#	submodules/TelegramUI/TelegramUI/FetchVideoMediaResource.swift
#	submodules/ffmpeg/FFMpeg/FFMpegRemuxer.m
This commit is contained in:
Ali
2020-02-26 20:35:26 +04:00
parent 20389946a6 8341247b5d
commit 9948945f7b
265 changed files with 14276 additions and 24783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
submodules/Display/Source/NavigationButtonNode.swift
View File

@@ -65,6 +65,7 @@ private final class NavigationButtonItemNode: ImmediateTextNode {
if let value = value {
if self.imageNode == nil {
let imageNode = ASImageNode()
imageNode.displayWithoutProcessing = true
imageNode.displaysAsynchronously = false
self.imageNode = imageNode
if false, value.size == CGSize(width: 30.0, height: 30.0) {
@@ -279,9 +280,16 @@ private final class NavigationButtonItemNode: ImmediateTextNode {
}
}
public var isEnabled: Bool = true {
didSet(value) {
self.attributedText = NSAttributedString(string: text, attributes: self.attributesForCurrentState())
public override var isEnabled: Bool {
get {
return super.isEnabled
}
set(value) {
if self.isEnabled != value {
super.isEnabled = value
self.attributedText = NSAttributedString(string: text, attributes: self.attributesForCurrentState())
}
}
}
}