diff --git a/osrs-toolbox/Models/CompetitionOverlaySettingsModel.cs b/osrs-toolbox/Models/CompetitionOverlaySettingsModel.cs
index cd04647..d53aafe 100644
--- a/osrs-toolbox/Models/CompetitionOverlaySettingsModel.cs
+++ b/osrs-toolbox/Models/CompetitionOverlaySettingsModel.cs
@@ -1,4 +1,6 @@
using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
namespace osrs_toolbox
{
@@ -31,13 +33,15 @@ namespace osrs_toolbox
public bool HideOtherPlayers
{
get { return _hideOtherPlayers; }
- set { SetProperty(ref _hideOtherPlayers, value, nameof(HideOtherPlayers)); }
+ set { SetProperty(ref _hideOtherPlayers, value, nameof(HideOtherPlayers)); OnPropertyChanged(nameof(OtherPlayersCheckboxImage)); }
}
public bool HideZeroGained
{
get { return _hideZeroKC; }
- set { SetProperty(ref _hideZeroKC, value, nameof(HideZeroGained)); }
+ set { SetProperty(ref _hideZeroKC, value, nameof(HideZeroGained)); OnPropertyChanged(nameof(HideZeroCheckboxImage)); }
}
+ public ImageSource OtherPlayersCheckboxImage => HideOtherPlayers ? new BitmapImage(new Uri(@"/Resources/stone-checkbox-checked.png", UriKind.Relative)) : new BitmapImage(new Uri(@"/Resources/stone-checkbox-unchecked.png", UriKind.Relative));
+ public ImageSource HideZeroCheckboxImage => HideZeroGained ? new BitmapImage(new Uri(@"/Resources/stone-checkbox-checked.png", UriKind.Relative)) : new BitmapImage(new Uri(@"/Resources/stone-checkbox-unchecked.png", UriKind.Relative));
public ICommand ToggleCompetitionOverlay
{
diff --git a/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml b/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml
index 6a36980..fa23561 100644
--- a/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml
+++ b/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml
@@ -5,42 +5,120 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:osrs_toolbox"
mc:Ignorable="d"
- Title="Wise Old Man Competition Overlay Settings" d:Height="450" d:Width="800" SizeToContent="WidthAndHeight" Closed="Window_Closed">
+ Title="Wise Old Man Competition Overlay Settings" Height="450" Width="600" Closed="Window_Closed" WindowStyle="None" Background="Transparent" AllowsTransparency="True">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml.cs b/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml.cs
index a03bcaf..f785112 100644
--- a/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml.cs
+++ b/osrs-toolbox/Views/CompetitionOverlaySettingsView.xaml.cs
@@ -31,5 +31,45 @@ namespace osrs_toolbox
{
Current = null;
}
+
+ private void Move_Window(object sender, MouseButtonEventArgs e)
+ {
+ if (e.LeftButton == MouseButtonState.Pressed) { this.DragMove(); }
+ }
+
+ private void Close_Window(object sender, MouseButtonEventArgs e)
+ {
+ Current.Close();
+ }
+
+ private void Button_Hovered(object sender, MouseEventArgs e)
+ {
+ (sender as Image).Source = new BitmapImage(new Uri(@"/Resources/wood-button-pressed.png", UriKind.Relative));
+ }
+
+ private void Button_Unhovered(object sender, MouseEventArgs e)
+ {
+ (sender as Image).Source = new BitmapImage(new Uri(@"/Resources/wood-button.png", UriKind.Relative));
+ }
+
+ private void Exit_Hovered(object sender, MouseEventArgs e)
+ {
+ (sender as Rectangle).Fill = new SolidColorBrush(Colors.Red);
+ }
+
+ private void Exit_Unhovered(object sender, MouseEventArgs e)
+ {
+ (sender as Rectangle).Fill = new SolidColorBrush(Colors.White);
+ }
+
+ private void Toggle_Other_Players(object sender, MouseButtonEventArgs e)
+ {
+ (DataContext as CompetitionOverlaySettingsViewModel).HideOtherPlayers = !(DataContext as CompetitionOverlaySettingsViewModel).HideOtherPlayers;
+ }
+
+ private void Toggle_Zero_Gained(object sender, MouseButtonEventArgs e)
+ {
+ (DataContext as CompetitionOverlaySettingsViewModel).HideZeroGained = !(DataContext as CompetitionOverlaySettingsViewModel).HideZeroGained;
+ }
}
}