fixed bug where cursor did not move to end on click of numbers

antingle · May 6, 2022 · 7dabeb0 · 7dabeb0
1 parent 98ae70e
commit 7dabeb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Calculator.xcodeproj/project.pbxproj b/Calculator.xcodeproj/project.pbxproj
@@ -393,7 +393,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.8.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.3;
+				MARKETING_VERSION = 0.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = anthonyingle.Calculator;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -423,7 +424,8 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.8.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.3;
+				MARKETING_VERSION = 0.8.1;
 				PRODUCT_BUNDLE_IDENTIFIER = anthonyingle.Calculator;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/Calculator/Views/CalculatorView.swift b/Calculator/Views/CalculatorView.swift
@@ -23,7 +23,9 @@ struct CalculatorView: View {
         VStack {
             // MARK: - History View
             // A view to show all previous solutions and expressions
-            HistoryView(expression: $expression, historyIndex: $historyIndex)
+            HistoryView(expression: $expression,
+                        historyIndex: $historyIndex,
+                        shouldMoveCursorToEnd: $shouldMoveCursorToEnd)
 
             // MARK: - TextField View
             // An NSTextField wrapped as a SwiftUI view

diff --git a/Calculator/Views/HistoryView.swift b/Calculator/Views/HistoryView.swift
@@ -11,6 +11,7 @@ struct HistoryView: View {
     @EnvironmentObject private var historyStore: HistoryStore
     @Binding var expression: String
     @Binding var historyIndex: Int
+    @Binding var shouldMoveCursorToEnd: Bool
 
     var body: some View {
         // MARK TODO: Make this file more readable
@@ -30,6 +31,7 @@ struct HistoryView: View {
                                     .frame(maxWidth: .infinity, alignment: .trailing)
                                     .font(.title2)
                                     .onTapGesture {
+                                        shouldMoveCursorToEnd = true
                                         expression += item.solution
                                     }
                                     .foregroundColor(historyIndex != -1 ? (item.id == historyStore.history[historyIndex].id ? .accentColor : .primary) : .primary)
@@ -55,6 +57,7 @@ struct HistoryView: View {
                                 .font(.body)
                                 .foregroundColor(.gray)
                                 .onTapGesture {
+                                    shouldMoveCursorToEnd = true
                                     expression += item.expression
                                 }
                             // MARK TODO: Make this an option?