Merge branch 'ervert'

Please enter a commit message to explain why this merge is necessary,
 especially if it merges an updated upstream into a topic branch.

 Lines starting with '#' will be ignored, and an empty message aborts
 the commit.
This commit is contained in:
neon443
2025-07-04 17:40:39 +01:00
2 changed files with 10 additions and 7 deletions

View File

@@ -23,10 +23,6 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
print(getTerminal().foregroundColor.colorCodable)
applySelectedTheme()
Task {
await startFeedLoop()
}
}
func restoreScrollback() async {
@@ -74,6 +70,16 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
// TODO: selectedtext and cursor colors
}
override func didMoveToWindow() {
super.didMoveToWindow()
if window != nil {
Task {
await restoreScrollback()
await startFeedLoop()
}
}
}
public override init(frame: CGRect) {
super.init(frame: frame)
terminalDelegate = self

View File

@@ -19,9 +19,6 @@ struct TerminalController: UIViewRepresentable {
func makeUIView(context: Context) -> TerminalView {
if let sessionID = handler.sessionID {
if let existing = container.sessions[sessionID] {
Task {
await existing.terminalView.restoreScrollback()
}
return existing.terminalView
}
}