Skip to content

Commit 0ba0e64

Browse files
authored
Small fixes (#488)
Fix copy folder picker Fix metrics Closes #487 Closes #474
1 parent e1dfd1f commit 0ba0e64

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Daybreak/Daybreak.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<LangVersion>preview</LangVersion>
1414
<ApplicationIcon>Daybreak.ico</ApplicationIcon>
1515
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
16-
<Version>0.9.8.150</Version>
16+
<Version>0.9.8.151</Version>
1717
<EnableWindowsTargeting>true</EnableWindowsTargeting>
1818
<UserSecretsId>cfb2a489-db80-448d-a969-80270f314c46</UserSecretsId>
1919
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>

Daybreak/Services/Charts/LiveChartInitializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ public void OnStartup()
2323
.AddLightTheme()
2424
.HasMap<Metric>((metric, index) =>
2525
{
26-
return new Coordinate(Convert.ToDouble(metric.Measurement), metric.Timestamp.Ticks);
26+
return new Coordinate(metric.Timestamp.Ticks, Convert.ToDouble(metric.Measurement));
2727
})
2828
.HasMap<TraderQuote>((quote, point) =>
2929
{
30-
return new Coordinate(((double)quote.Price) / 20d, quote.Timestamp?.Ticks ?? 0);
30+
return new Coordinate(quote.Timestamp?.Ticks ?? 0, ((double)quote.Price) / 20d);
3131
}));
3232
}
3333
}

Daybreak/Services/Guildwars/GuildwarsCopyService.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public sealed class GuildwarsCopyService : IGuildwarsCopyService
1818

1919
private static readonly string[] FilesToCopy =
2020
{
21-
"d3d9.dll",
2221
"Gw.dat",
2322
"Gw.exe",
2423
"GwLoginClient.dll"
@@ -117,7 +116,7 @@ private static bool TryGetDestinationPath(out string path)
117116
UseDescriptionForTitle = true
118117
};
119118

120-
var result = folderPicker.ShowDialog(new Win32Window(Launcher.Instance.MainWindow));
119+
var result = folderPicker.ShowDialog();
121120
if (result is DialogResult.Abort or DialogResult.Cancel or DialogResult.No)
122121
{
123122
return false;

Daybreak/Views/Copy/GuildwarsCopyView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
FontSize="16" Margin="10" Width="50" Height="25" Clicked="HighlightButton_Clicked" Foreground="{StaticResource MahApps.Brushes.ThemeForeground}"
2727
HighlightColor="{StaticResource MahApps.Brushes.Accent}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
2828
BorderBrush="{StaticResource MahApps.Brushes.ThemeForeground}"
29+
Visibility="{Binding ElementName=_this, Path=ContinueButtonEnabled, Mode=OneWay, Converter={StaticResource BooleanToVisibilityConverter}}"
2930
BorderThickness="1"
3031
ToolTip="Continue"/>
3132
</StackPanel>

Daybreak/Views/GuildwarsDownloadView.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private async void DownloadView_Loaded(object sender, RoutedEventArgs e)
6767
UseDescriptionForTitle = true
6868
};
6969

70-
var result = folderPicker.ShowDialog(new Win32Window(Launcher.Instance.MainWindow));
70+
var result = folderPicker.ShowDialog();
7171
if (result is DialogResult.Abort or DialogResult.Cancel or DialogResult.No)
7272
{
7373
this.installationStatus.CurrentStep = DownloadStatus.DownloadCancelled;

0 commit comments

Comments
 (0)