Skip to content

Commit 43f41fd

Browse files
committed
Small tweaks
1 parent 2e7884f commit 43f41fd

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

D2RSO/MainWindow.xaml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
WindowStartupLocation="CenterScreen"
1212
ResizeMode="NoResize"
1313
GlowBrush="{DynamicResource MahApps.Brushes.Accent}"
14-
Title="D2R Skill Overlay" Height="450" Width="430">
14+
Title="D2R Skill Overlay" Height="450" Width="440">
1515
<mah:MetroWindow.RightWindowCommands>
1616
<mah:WindowCommands>
1717
<Button Content="Get help" Click="SupportButton_OnClick"/>
@@ -135,7 +135,7 @@
135135
<RowDefinition Height="Auto"/>
136136
<RowDefinition Height="Auto"/>
137137
</Grid.RowDefinitions>
138-
<Label Content="Duration" Margin="5"/>
138+
<Label Content="Duration (sec)" Margin="5"/>
139139
<mah:NumericUpDown Grid.Row="1" Value="{Binding TimeLength, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Minimum="0" NumericInputMode="Decimal" HideUpDownButtons="True"/>
140140
</Grid>
141141

@@ -158,9 +158,22 @@
158158

159159
</StackPanel>
160160

161-
<Button Grid.Column="3" Width="30" Height="30" Padding="0" Margin="5" Click="RemSkillButton_OnClick" CommandParameter="{Binding}">
162-
<Path Data="M19,3H16.3H7.7H5A2,2 0 0,0 3,5V7.7V16.4V19A2,2 0 0,0 5,21H7.7H16.4H19A2,2 0 0,0 21,19V16.3V7.7V5A2,2 0 0,0 19,3M15.6,17L12,13.4L8.4,17L7,15.6L10.6,12L7,8.4L8.4,7L12,10.6L15.6,7L17,8.4L13.4,12L17,15.6L15.6,17Z" Fill="{StaticResource MahApps.Brushes.IdealForeground}"
163-
Stretch="Uniform"/>
161+
<Button Grid.Column="3" Width="25" Height="25" Padding="0" Margin="5" Click="RemSkillButton_OnClick" CommandParameter="{Binding}">
162+
<Path Fill="{StaticResource MahApps.Brushes.IdealForeground}"
163+
Stretch="Uniform">
164+
<Path.Style>
165+
<Style TargetType="{x:Type Path}">
166+
<Style.Triggers>
167+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="False">
168+
<Setter Property="Data" Value="M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M19,19H5V5H19V19M17,8.4L13.4,12L17,15.6L15.6,17L12,13.4L8.4,17L7,15.6L10.6,12L7,8.4L8.4,7L12,10.6L15.6,7L17,8.4Z" />
169+
</DataTrigger>
170+
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsMouseOver}" Value="True">
171+
<Setter Property="Data" Value="M19,3H16.3H7.7H5A2,2 0 0,0 3,5V7.7V16.4V19A2,2 0 0,0 5,21H7.7H16.4H19A2,2 0 0,0 21,19V16.3V7.7V5A2,2 0 0,0 19,3M15.6,17L12,13.4L8.4,17L7,15.6L10.6,12L7,8.4L8.4,7L12,10.6L15.6,7L17,8.4L13.4,12L17,15.6L15.6,17Z" />
172+
</DataTrigger>
173+
</Style.Triggers>
174+
</Style>
175+
</Path.Style>
176+
</Path>
164177
</Button>
165178
</Grid>
166179
</DataTemplate>

D2RSO/MainWindow.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ private void StopTracking()
120120
_globalInputHook = null;
121121
CounterWindow?.Close();
122122
CounterWindow = null;
123+
IsCounterPreviewVisible = false;
123124
}
124125

125126
#endregion

0 commit comments

Comments
 (0)