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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-01-11 01:59:22 +04:00
parent e08e7b2ecb
commit e1ff1cd98b
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/DrawingUI/Sources/DrawingPenTool.swift
View File

@ -279,7 +279,7 @@ final class PenTool: DrawingElement {
let segmentsBounds = boundingRect(from: 0, to: self.segments.count).insetBy(dx: -20.0, dy: -20.0) let segmentsBounds = boundingRect(from: 0, to: self.segments.count).insetBy(dx: -20.0, dy: -20.0)
var combinedBounds = segmentsBounds var combinedBounds = segmentsBounds
if self.hasArrow, let arrowLeftPath, let arrowRightPath { if self.hasArrow, let arrowLeftPath, let arrowRightPath {
combinedBounds = combinedBounds.union(arrowLeftPath.bounds).union(arrowRightPath.bounds).insetBy(dx: -20.0, dy: -20.0) combinedBounds = combinedBounds.union(arrowLeftPath.bounds.insetBy(dx: -renderArrowLineWidth, dy: -renderArrowLineWidth)).union(arrowRightPath.bounds.insetBy(dx: -renderArrowLineWidth, dy: -renderArrowLineWidth)).insetBy(dx: -20.0, dy: -20.0)
} }
return normalizeDrawingRect(combinedBounds, drawingSize: self.drawingSize) return normalizeDrawingRect(combinedBounds, drawingSize: self.drawingSize)
} }

24
submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
View File

@ -902,7 +902,7 @@ final class AvatarEditorScreenComponent: Component {
if state.isSearchActive { if state.isSearchActive {
keyboardTitle = "Emoji or Sticker" keyboardTitle = "Emoji or Sticker"
keyboardSwitchTitle = "" keyboardSwitchTitle = " "
} else if state.keyboardContentId == AnyHashable("emoji") { } else if state.keyboardContentId == AnyHashable("emoji") {
keyboardTitle = "Emoji" keyboardTitle = "Emoji"
keyboardSwitchTitle = "Switch to Stickers" keyboardSwitchTitle = "Switch to Stickers"
@ -910,12 +910,12 @@ final class AvatarEditorScreenComponent: Component {
keyboardTitle = "Stickers" keyboardTitle = "Stickers"
keyboardSwitchTitle = "Switch to Emoji" keyboardSwitchTitle = "Switch to Emoji"
} else { } else {
keyboardTitle = "" keyboardTitle = " "
keyboardSwitchTitle = "" keyboardSwitchTitle = " "
} }
let keyboardTitleSize = self.keyboardTitleView.update( let keyboardTitleSize = self.keyboardTitleView.update(
transition: transition, transition: .immediate,
component: AnyComponent(MultilineTextComponent( component: AnyComponent(MultilineTextComponent(
text: .markdown( text: .markdown(
text: keyboardTitle.uppercased(), attributes: MarkdownAttributes( text: keyboardTitle.uppercased(), attributes: MarkdownAttributes(
@ -935,12 +935,17 @@ final class AvatarEditorScreenComponent: Component {
if keyboardTitleView.superview == nil { if keyboardTitleView.superview == nil {
self.addSubview(keyboardTitleView) self.addSubview(keyboardTitleView)
} }
transition.setFrame(view: keyboardTitleView, frame: keyboardTitleFrame) keyboardTitleView.bounds = CGRect(origin: .zero, size: keyboardTitleFrame.size)
if keyboardTitleFrame.center.y == keyboardTitleView.center.y {
keyboardTitleView.center = keyboardTitleFrame.center
} else {
transition.setPosition(view: keyboardTitleView, position: keyboardTitleFrame.center)
}
transition.setAlpha(view: keyboardTitleView, alpha: state.editingColor ? 0.0 : 1.0) transition.setAlpha(view: keyboardTitleView, alpha: state.editingColor ? 0.0 : 1.0)
} }
let keyboardSwitchSize = self.keyboardSwitchView.update( let keyboardSwitchSize = self.keyboardSwitchView.update(
transition: transition, transition: .immediate,
component: AnyComponent( component: AnyComponent(
Button( Button(
content: AnyComponent( content: AnyComponent(
@ -978,7 +983,12 @@ final class AvatarEditorScreenComponent: Component {
if keyboardSwitchView.superview == nil { if keyboardSwitchView.superview == nil {
self.addSubview(keyboardSwitchView) self.addSubview(keyboardSwitchView)
} }
transition.setFrame(view: keyboardSwitchView, frame: keyboardSwitchFrame) keyboardSwitchView.bounds = CGRect(origin: .zero, size: keyboardSwitchFrame.size)
if keyboardSwitchFrame.center.y == keyboardSwitchView.center.y {
keyboardSwitchView.center = keyboardSwitchFrame.center
} else {
transition.setPosition(view: keyboardSwitchView, position: keyboardSwitchFrame.center)
}
transition.setAlpha(view: keyboardSwitchView, alpha: state.editingColor ? 0.0 : 1.0) transition.setAlpha(view: keyboardSwitchView, alpha: state.editingColor ? 0.0 : 1.0)
} }
contentHeight += keyboardTitleSize.height contentHeight += keyboardTitleSize.height