Fixed a bug where changing the interface's size would cause a measure…

…ment to be displayed incorrectly
philipturner · Sep 1, 2021 · 96e0a87 · 96e0a87
1 parent 4a9b149
commit 96e0a87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/AR MultiPendulum.xcodeproj/project.pbxproj b/AR MultiPendulum.xcodeproj/project.pbxproj
@@ -1524,7 +1524,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6T952M2592;
 				ENABLE_PREVIEWS = YES;
@@ -1536,7 +1536,7 @@
 				);
 				MARKETING_VERSION = 0.1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.philipturner.AR-MultiPendulum.ios";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.philipturner.AR-MultiPendulum";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1549,7 +1549,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 6T952M2592;
 				ENABLE_PREVIEWS = YES;
@@ -1561,7 +1561,7 @@
 				);
 				MARKETING_VERSION = 0.1.0;
 				MTL_FAST_MATH = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.philipturner.AR-MultiPendulum.ios";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.philipturner.AR-MultiPendulum";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

diff --git a/AR MultiPendulum/MultiPendulum/Interface/PendulumInterfaceExtensions.swift b/AR MultiPendulum/MultiPendulum/Interface/PendulumInterfaceExtensions.swift
@@ -61,7 +61,11 @@ extension PendulumInterface {
                 angularVelocityPicker.resetSize()
 
                 let previousInterface = baseInterface
-                baseInterface = .settings
+
+                if previousInterface == .mainInterface {
+                    baseInterface = .settings
+                }
+
                 setMeasurementText()
                 baseInterface = previousInterface
             }