Improved readability

neoneye · neoneye · commit 24051fb0887c · 2023-01-12T19:17:40.000+01:00
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift
@@ -89,40 +89,44 @@ struct HCMenuView: View {
         #endif
     }
 
-    var navigationStack: some View {
-        NavigationStack {
-            Form {
-                Section(header: Text("Grid system")) {
-                    Picker("Format", selection: $gridMode) {
-                        ForEach(CanvasGridMode.allCases, id: \.self) { value in
-                            Text(value.localizedDisplayName).tag(value)
-                        }
-                    }.onChange(of: gridMode) { newValue in
-                        self.model.delegate?.hcMenuViewController_canvasGridModeDidChange(gridMode: newValue)
-                    }
-                    Picker("Symmetry", selection: $symmetryMode) {
-                        ForEach(SymmetryMode.allCases, id: \.self) { value in
-                            Text(value.localizedDisplayName).tag(value)
-                        }
-                    }.onChange(of: symmetryMode) { newValue in
-                        globalSymmetryMode = newValue
-                    }
-                    NavigationLink("Subdivide") {
-                        HCMenuSubdivideView() { n in
-                            model.delegate?.hcMenuViewController_applySubdivide(n: n)
-                            dismiss()
-                        }
+    var formContent: some View {
+        Form {
+            Section(header: Text("Grid system")) {
+                Picker("Format", selection: $gridMode) {
+                    ForEach(CanvasGridMode.allCases, id: \.self) { value in
+                        Text(value.localizedDisplayName).tag(value)
                     }
+                }.onChange(of: gridMode) { newValue in
+                    self.model.delegate?.hcMenuViewController_canvasGridModeDidChange(gridMode: newValue)
                 }
-                Section(header: Text("Export")) {
-                    exportPNGButton
-                    exportPDFButton
-                    exportSVGButton
+                Picker("Symmetry", selection: $symmetryMode) {
+                    ForEach(SymmetryMode.allCases, id: \.self) { value in
+                        Text(value.localizedDisplayName).tag(value)
+                    }
+                }.onChange(of: symmetryMode) { newValue in
+                    globalSymmetryMode = newValue
                 }
-                Section(header: Text("Feedback")) {
-                    emailDeveloperButton
+                NavigationLink("Subdivide") {
+                    HCMenuSubdivideView() { n in
+                        model.delegate?.hcMenuViewController_applySubdivide(n: n)
+                        dismiss()
+                    }
                 }
             }
+            Section(header: Text("Export")) {
+                exportPNGButton
+                exportPDFButton
+                exportSVGButton
+            }
+            Section(header: Text("Feedback")) {
+                emailDeveloperButton
+            }
+        }
+    }
+
+    var navigationStack: some View {
+        NavigationStack {
+            formContent
             .navigationTitle("Canvas")
             .navigationBarTitleDisplayMode(.inline)
             .toolbar {
