Add header for goto and fix eclipse finder

Author: levinli303

CelestiaWinUI/EclipseFinderUserControl.xaml

@@ -48,16 +48,15 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
-                <TextBlock Text="Object:" x:Name="ObjectHint" Grid.Column="0" VerticalAlignment="Center"/>
-                <AutoSuggestBox x:Name="ObjectChooser" ItemsSource="{x:Bind AvailableObjects}" Grid.Column="1" TextChanged="ObjectChooser_TextChanged" SuggestionChosen="ObjectChooser_SuggestionChosen" UpdateTextOnSelect="False">
+                <AutoSuggestBox x:Name="ObjectChooser" ItemsSource="{x:Bind AvailableObjects}" Grid.Column="0" Grid.ColumnSpan="2" TextChanged="ObjectChooser_TextChanged" SuggestionChosen="ObjectChooser_SuggestionChosen" UpdateTextOnSelect="False">
                     <AutoSuggestBox.ItemTemplate>
                         <DataTemplate x:DataType="app:SearchObjectEntry">
                             <TextBlock Text="{x:Bind Name, Mode=OneTime}"/>
                         </DataTemplate>
                     </AutoSuggestBox.ItemTemplate>
                 </AutoSuggestBox>
-                <CheckBox Content="Solar" IsChecked="{x:Bind FindSolar, Mode=TwoWay}" x:Name="SolarEclipseButton" Grid.Column="2"/>
-                <CheckBox Content="Lunar" IsChecked="{x:Bind FindLunar, Mode=TwoWay}" x:Name="LunarEclipseButton" Grid.Column="3"></CheckBox>
+                <CheckBox Content="Solar" IsChecked="{x:Bind FindSolar, Mode=TwoWay}" x:Name="SolarEclipseButton" Grid.Column="2" VerticalAlignment="Bottom"/>
+                <CheckBox Content="Lunar" IsChecked="{x:Bind FindLunar, Mode=TwoWay}" x:Name="LunarEclipseButton" Grid.Column="3" VerticalAlignment="Bottom"/>
             </Grid>
             <RelativePanel>
                 <Button Content="Compute" x:Name="ComputeButton" Click="ComputeButton_Click" RelativePanel.AlignLeftWithPanel="True"/>

CelestiaWinUI/EclipseFinderUserControl.xaml.cpp

@@ -43,7 +43,7 @@ namespace winrt::CelestiaWinUI::implementation
     {
         availableObjects = single_threaded_observable_vector<SearchObjectEntry>({ SearchObjectEntry(CelestiaAppCore::LocalizedString(L"Earth", L"celestia-data"), L"Sol/Earth"), SearchObjectEntry(CelestiaAppCore::LocalizedString(L"Jupiter", L"celestia-data"), L"Sol/Jupiter")});
         eclipses = single_threaded_observable_vector<CelestiaWinUI::EclipseResult>();
-        startTime = clock::now();
+        startTime = clock::now() - std::chrono::hours(24 * 365);
         endTime = clock::now();
     }
 
@@ -55,7 +55,7 @@ namespace winrt::CelestiaWinUI::implementation
         ComputeButton().Content(box_value(LocalizationHelper::Localize(L"Compute", L"Compute for eclipses")));
         StartTimeHint().Text(LocalizationHelper::Localize(L"Start time:", L"In eclipse finder, range of time to find eclipse in"));
         EndTimeHint().Text(LocalizationHelper::Localize(L"End time:", L"In eclipse finder, range of time to find eclipse in"));
-        ObjectHint().Text(LocalizationHelper::Localize(L"Object:", L"In Go to, Windows, In eclipse finder, object to find eclipse with"));
+        ObjectChooser().Header(box_value(LocalizationHelper::Localize(L"Object", L"In eclipse finder, object to find eclipse with, or in go to")));
         SolarEclipseButton().Content(box_value(LocalizationHelper::Localize(L"Solar", L"Solar eclipses.")));
         LunarEclipseButton().Content(box_value(LocalizationHelper::Localize(L"Lunar", L"Lunar eclipses.")));
         EmptyHintText().Text(LocalizationHelper::Localize(L"Find eclipses for an object in a time range", L""));
@@ -193,12 +193,12 @@ namespace winrt::CelestiaWinUI::implementation
         if (selectedEclipse == nullptr)
             return;
 
-        auto eclipse = selectedEclipse.as<CelestiaEclipse>();
+        auto eclipse = selectedEclipse.as<CelestiaWinUI::EclipseResult>();
         renderer.EnqueueTask([weak_this{ get_weak() }, eclipse]()
             {
                 auto strong_this{ weak_this.get() };
                 if (strong_this == nullptr) return;
-                strong_this->appCore.Simulation().GoToEclipse(eclipse);
+                strong_this->appCore.Simulation().GoToEclipse(eclipse.Eclipse());
             });
     }
 

CelestiaWinUI/GotoObjectDialog.xaml

@@ -27,6 +27,6 @@
         <TextBox x:Name="LatitudeText" Grid.Row="1" TextChanged="LatitudeText_TextChanged"/>
         <TextBox x:Name="LongitudeText" Grid.Row="1" Grid.Column="1" TextChanged="LongitudeText_TextChanged"/>
         <TextBox x:Name="DistanceText" Grid.Row="2" TextChanged="DistanceText_TextChanged"/>
-        <ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{x:Bind Units, Mode=OneTime}" SelectedIndex="{x:Bind Unit, Mode=TwoWay}"></ComboBox>
+        <ComboBox Grid.Row="2" Grid.Column="1" ItemsSource="{x:Bind Units, Mode=OneTime}" SelectedIndex="{x:Bind Unit, Mode=TwoWay}" VerticalAlignment="Bottom"/>
     </Grid>
 </ContentDialog>

CelestiaWinUI/GotoObjectDialog.xaml.cpp

@@ -43,10 +43,10 @@ namespace winrt::CelestiaWinUI::implementation
         Title(box_value(LocalizationHelper::Localize(L"Go to Object", L"")));
         PrimaryButtonText(LocalizationHelper::Localize(L"OK", L""));
         SecondaryButtonText(LocalizationHelper::Localize(L"Cancel", L""));
-        ObjectNameText().PlaceholderText(LocalizationHelper::Localize(L"Object Name", L""));
-        LongitudeText().PlaceholderText(LocalizationHelper::Localize(L"Longitude", L"Coordinates"));
-        LatitudeText().PlaceholderText(LocalizationHelper::Localize(L"Latitude", L"Coordinates"));
-        DistanceText().PlaceholderText(LocalizationHelper::Localize(L"Distance", L"Distance to the object (in Go to)"));
+        ObjectNameText().Header(box_value(LocalizationHelper::Localize(L"Object Name", L"")));
+        LongitudeText().Header(box_value(LocalizationHelper::Localize(L"Longitude", L"Coordinates")));
+        LatitudeText().Header(box_value(LocalizationHelper::Localize(L"Latitude", L"Coordinates")));
+        DistanceText().Header(box_value(LocalizationHelper::Localize(L"Distance", L"Distance to the object (in Go to)")));
     }
 
     float GotoObjectDialog::Latitude()