Skip to content

Commit

Permalink
Updated the card counter.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zachwlewis
zachwlewis committed Aug 20, 2015
1 parent b51b6c7 commit 83b54e6
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
Binary file modified Hearthstone Deck Tracker/Images/frame_card_counter.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions Hearthstone Deck Tracker/Windows/OverlayWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@
</Style>
</ListView.Resources>
</controls:DeckListView>
<StackPanel Name="StackPanelPlayerCount" Orientation="Horizontal" HorizontalAlignment="Stretch" Height="35" Width="218" Margin="0,5">
<StackPanel.Background>
<Canvas Name="CanvasPlayerCount" HorizontalAlignment="Stretch" Height="66" Width="218" Margin="0,5">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/frame_card_counter.png"/>
</StackPanel.Background>
<local:HearthstoneTextBlock x:Name="LblCardCount" FontSize="18" Text="3" VerticalAlignment="Center" TextAlignment="Center" Width="48" HorizontalAlignment="Left" Margin="50,0,0,0" />
<local:HearthstoneTextBlock x:Name="LblDeckCount" FontSize="18" Text="27" TextAlignment="Center" Width="48" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="20,0,0,0" />
</StackPanel>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblCardCount" FontSize="18" Text="0" Canvas.Left="47" Canvas.Top="27" TextAlignment="Center" Width="55" />
<local:HearthstoneTextBlock x:Name="LblDeckCount" FontSize="18" Text="30" Canvas.Left="150" Canvas.Top="27" TextAlignment="Center" Width="56" />
</Canvas>
<Canvas Name="CanvasPlayerChance" HorizontalAlignment="Stretch" Height="66" Width="218" Margin="0,5">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/player-chance-frame.png"/>
Expand Down Expand Up @@ -88,13 +88,13 @@
</Style>
</ListView.Resources>
</controls:DeckListView>
<StackPanel Name="StackPanelOpponentCount" Orientation="Horizontal" HorizontalAlignment="Stretch" Height="35" Width="218" Margin="0,5">
<StackPanel.Background>
<Canvas Name="CanvasOpponentCount" HorizontalAlignment="Stretch" Height="66" Width="218" Margin="0,5">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/frame_card_counter.png"/>
</StackPanel.Background>
<local:HearthstoneTextBlock x:Name="LblOpponentCardCount" FontSize="18" Text="3" VerticalAlignment="Center" TextAlignment="Center" Width="48" HorizontalAlignment="Left" Margin="50,0,0,0" />
<local:HearthstoneTextBlock x:Name="LblOpponentDeckCount" FontSize="18" Text="27" TextAlignment="Center" Width="48" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="20,0,0,0" />
</StackPanel>
</Canvas.Background>
<local:HearthstoneTextBlock x:Name="LblOpponentCardCount" FontSize="18" Text="0" Canvas.Left="47" Canvas.Top="27" TextAlignment="Center" Width="55" />
<local:HearthstoneTextBlock x:Name="LblOpponentDeckCount" FontSize="18" Text="30" Canvas.Left="150" Canvas.Top="27" TextAlignment="Center" Width="56" />
</Canvas>
<Canvas Name="CanvasOpponentChance" HorizontalAlignment="Stretch" Height="105" Width="218" Margin="0,5">
<Canvas.Background>
<ImageBrush ImageSource="/HearthstoneDeckTracker;component/Images/opponent-chance-frame.png"/>
Expand Down
9 changes: 5 additions & 4 deletions Hearthstone Deck Tracker/Windows/OverlayWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,11 +590,12 @@ public void Update(bool refresh)

CanvasPlayerChance.Visibility = Config.Instance.HideDrawChances ? Visibility.Collapsed : Visibility.Visible;
LblPlayerFatigue.Visibility = Config.Instance.HidePlayerFatigueCount ? Visibility.Collapsed : Visibility.Visible;
StackPanelPlayerCount.Visibility = Config.Instance.HidePlayerCardCount ? Visibility.Collapsed : Visibility.Visible;
CanvasPlayerCount.Visibility = Config.Instance.HidePlayerCardCount ? Visibility.Collapsed : Visibility.Visible;

CanvasOpponentChance.Visibility = Config.Instance.HideOpponentDrawChances ? Visibility.Collapsed : Visibility.Visible;
LblOpponentFatigue.Visibility = Config.Instance.HideOpponentFatigueCount ? Visibility.Collapsed : Visibility.Visible;
StackPanelOpponentCount.Visibility = Config.Instance.HideOpponentCardCount ? Visibility.Collapsed : Visibility.Visible;
CanvasOpponentCount.Visibility = Config.Instance.HideOpponentCardCount ? Visibility.Collapsed : Visibility.Visible;

if(Game.IsInMenu && !_uiMovable)
HideTimers();

Expand Down Expand Up @@ -977,7 +978,7 @@ public void UpdatePlayerLayout()
StackPanelPlayer.Children.Add(CanvasPlayerChance);
break;
case "Card Counter":
StackPanelPlayer.Children.Add(StackPanelPlayerCount);
StackPanelPlayer.Children.Add(CanvasPlayerCount);
break;
case "Fatigue Counter":
StackPanelPlayer.Children.Add(StackPanelPlayerFatigue);
Expand Down Expand Up @@ -1006,7 +1007,7 @@ public void UpdateOpponentLayout()
StackPanelOpponent.Children.Add(CanvasOpponentChance);
break;
case "Card Counter":
StackPanelOpponent.Children.Add(StackPanelOpponentCount);
StackPanelOpponent.Children.Add(CanvasOpponentCount);
break;
case "Fatigue Counter":
StackPanelOpponent.Children.Add(StackPanelOpponentFatigue);
Expand Down
Binary file added raw-assets/card-counter-frame.psd
View file
Binary file not shown.

0 comments on commit 83b54e6

Please sign in to comment.