Skip to content

Commit 4c89870

Browse files
committed
Various fixes
1 parent 87035b3 commit 4c89870

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputActionButtonsNode.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,10 @@ final class AttachmentTextInputActionButtonsNode: ASDisplayNode, ChatSendMessage
152152
}
153153
titleOffset -= 2.0
154154
buttonInset = 14.0
155+
self.iconNode.isHidden = true
155156
} else {
156157
segments.append(.text(0, NSAttributedString(string: text, font: Font.semibold(17.0), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)))
158+
self.iconNode.isHidden = false
157159
}
158160
self.textNode.segments = segments
159161

submodules/TelegramUI/Components/GlassBarButtonComponent/Sources/GlassBarButtonComponent.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public final class GlassBarButtonComponent: Component {
6464
private let containerView: UIView
6565
private let genericContainerView: UIView
6666
private let genericBackgroundView: SimpleGlassView
67-
private let glassContainerView: GlassBackgroundContainerView
67+
private let glassContainerView: UIView
6868
private var glassBackgroundView: GlassBackgroundView?
6969
private var componentView: ComponentView<Empty>?
7070

@@ -74,7 +74,7 @@ public final class GlassBarButtonComponent: Component {
7474
self.containerView = UIView()
7575
self.genericContainerView = UIView()
7676
self.genericBackgroundView = SimpleGlassView()
77-
self.glassContainerView = GlassBackgroundContainerView()
77+
self.glassContainerView = UIView()
7878

7979
super.init(frame: frame)
8080

@@ -189,9 +189,9 @@ public final class GlassBarButtonComponent: Component {
189189
transition.setAlpha(view: self.genericContainerView, alpha: genericAlpha)
190190
transition.setFrame(view: self.genericContainerView, frame: bounds)
191191

192-
transition.setAlpha(view: self.glassContainerView, alpha: glassAlpha)
192+
//transition.setAlpha(view: self.glassContainerView, alpha: glassAlpha)
193193
transition.setFrame(view: self.glassContainerView, frame: bounds)
194-
self.glassContainerView.update(size: bounds.size, isDark: component.isDark, transition: transition)
194+
//self.glassContainerView.update(size: bounds.size, isDark: component.isDark, transition: transition)
195195

196196
transition.setFrame(view: self.genericBackgroundView, frame: bounds)
197197

@@ -204,7 +204,7 @@ public final class GlassBarButtonComponent: Component {
204204
glassBackgroundTransition = .immediate
205205
glassBackgroundView = GlassBackgroundView()
206206
glassBackgroundView.isUserInteractionEnabled = false
207-
self.glassContainerView.contentView.addSubview(glassBackgroundView)
207+
self.glassContainerView.addSubview(glassBackgroundView)
208208
self.glassBackgroundView = glassBackgroundView
209209

210210
transition.animateAlpha(view: glassBackgroundView, from: 0.0, to: 1.0)

0 commit comments

Comments
 (0)