Prevent a bug from happening for GoTo control

0x7c13 · Mar 12, 2020 · 5fe2afe · 5fe2afe
1 parent de8a182
commit 5fe2afe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/Notepads/Controls/TextEditor/TextEditor.xaml.cs b/src/Notepads/Controls/TextEditor/TextEditor.xaml.cs
@@ -475,6 +475,7 @@ public async Task ReloadFromEditingFile(Encoding encoding)
                 }
                 StartCheckingFileStatusPeriodically();
                 CloseSideBySideDiffViewer();
+                HideGoToControl();
                 FileReloaded?.Invoke(this, EventArgs.Empty);
             }
         }

diff --git a/src/Notepads/NotepadsMainPage.StatusBar.cs b/src/Notepads/NotepadsMainPage.StatusBar.cs
@@ -397,26 +397,25 @@ private void BuildEncodingIndicatorFlyout()
                 AddEncodingItem(encoding, reopenWithEncoding, saveWithEncoding);
             }
 
-            var reopenWithEncodingOthers = new MenuFlyoutSubItem()
-            {
-                Text = _resourceLoader.GetString("TextEditor_EncodingIndicator_FlyoutItem_MoreEncodings"),
-                FlowDirection = FlowDirection.RightToLeft,
-            };
-
-            var saveWithEncodingOthers = new MenuFlyoutSubItem()
-            {
-                Text = _resourceLoader.GetString("TextEditor_EncodingIndicator_FlyoutItem_MoreEncodings"),
-                FlowDirection = FlowDirection.RightToLeft,
-            };
-
             // Add legacy ANSI encodings
             var ANSIEncodings = EncodingUtility.GetAllSupportedANSIEncodings();
-
             if (ANSIEncodings.Length > 0)
             {
                 reopenWithEncoding.Items?.Add(new MenuFlyoutSeparator());
                 saveWithEncoding.Items?.Add(new MenuFlyoutSeparator());
 
+                var reopenWithEncodingOthers = new MenuFlyoutSubItem()
+                {
+                    Text = _resourceLoader.GetString("TextEditor_EncodingIndicator_FlyoutItem_MoreEncodings"),
+                    FlowDirection = FlowDirection.RightToLeft,
+                };
+
+                var saveWithEncodingOthers = new MenuFlyoutSubItem()
+                {
+                    Text = _resourceLoader.GetString("TextEditor_EncodingIndicator_FlyoutItem_MoreEncodings"),
+                    FlowDirection = FlowDirection.RightToLeft,
+                };
+
                 foreach (var encoding in ANSIEncodings)
                 {
                     AddEncodingItem(encoding, reopenWithEncodingOthers, saveWithEncodingOthers);