From 0cf7fa7c1714b09fa7e13cb4621434cf8b0245fc Mon Sep 17 00:00:00 2001 From: DB p Date: Thu, 2 Dec 2021 13:33:00 +0900 Subject: [PATCH] Fix PageNubmerDisplay --- Flow.Launcher/WelcomeWindow.xaml | 2 +- Flow.Launcher/WelcomeWindow.xaml.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml index e6e2309d6..93f41d278 100644 --- a/Flow.Launcher/WelcomeWindow.xaml +++ b/Flow.Launcher/WelcomeWindow.xaml @@ -109,7 +109,7 @@ HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" - Text="1/5" + Text="{Binding PageDisplay, Mode=OneWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" TextAlignment="Center" /> diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs index 27612965e..ee8623461 100644 --- a/Flow.Launcher/WelcomeWindow.xaml.cs +++ b/Flow.Launcher/WelcomeWindow.xaml.cs @@ -28,6 +28,7 @@ namespace Flow.Launcher InitializeComponent(); BackButton.IsEnabled = false; this.settings = settings; + pages = new() { new WelcomePage1(settings), @@ -38,11 +39,16 @@ namespace Flow.Launcher }; ContentFrame.Navigate(pages[0]); } + private int page; + private int pageNum = 1; private int MaxPage = 5; + public string PageDisplay => $"{pageNum}/5"; private void UpdateView() { + pageNum = page + 1; + PageNavigation.Text = PageDisplay; if (page == 0) { BackButton.IsEnabled = false; @@ -84,7 +90,6 @@ namespace Flow.Launcher } } - public string PageDisplay => $"{page}/5"; private void BtnCancel_OnClick(object sender, RoutedEventArgs e) { Close();