MSG/msg-desktop
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

ENH: Fixed sizing of the main window. #1

Open
eroesch wants to merge 8 commits from eroesch/msg-desktop:main into main
pull from: eroesch/msg-desktop:main
merge into: MSG:main
Conversation 5 Commits 8 Files changed 12 +47 -41
1 changed files with 47 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2b61760d94 - Show all commits

48
MSG Desktop/ContentView.swift
View file

@ -41,6 +41,10 @@ struct ContentView: View {
self.imageHeight = height
}
ZStack {
Color.black
.ignoresSafeArea()
// ScrollView fills remaining height
ScrollViewReader { proxy in
ScrollView {
@ -51,6 +55,7 @@ struct ContentView: View {
Text(lines[index])
.font(.system(.body, design: .monospaced))
.frame(maxWidth: .infinity, alignment: .leading)
}
Color.clear.frame(height: 1).id("bottom")
@ -64,27 +69,28 @@ struct ContentView: View {
}
}
// ScrollView {
// VStack(alignment: .leading) {
// TextEditor(text: $appState.output)
// .font(.system(.body, design: .monospaced))
// .frame(
// width: geometry.size.width - 60,
// height: max(0, geometry.size.height - imageHeight - 120) // - rough height of button row and padding
// )
// .padding()
// .disabled(true)
//
// Text("")
// .id("bottom")
// }
// }
// .onChange(of: appState.output) { _, _ in
// trimLinesIfNeeded()
// withAnimation {
// proxy.scrollTo("bottom", anchor: .bottom)
// }
// }
// ScrollView {
// VStack(alignment: .leading) {
// TextEditor(text: $appState.output)
// .font(.system(.body, design: .monospaced))
// .frame(
// width: geometry.size.width - 60,
// height: max(0, geometry.size.height - imageHeight - 120) // - rough height of button row and padding
// )
// .padding()
// .disabled(true)
//
// Text("")
// .id("bottom")
// }
// }
// .onChange(of: appState.output) { _, _ in
// trimLinesIfNeeded()
// withAnimation {
// proxy.scrollTo("bottom", anchor: .bottom)
// }
// }
}
}
// Buttons