Skip to content

Commit

Permalink
make group member indicators color-coded based on role
Browse files Browse the repository at this point in the history
  • Loading branch information
foglio1024 committed Apr 26, 2024
1 parent 0b1e520 commit c85e09b
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 2 deletions.
46 changes: 44 additions & 2 deletions TCC.Core/UI/Controls/Group/PartyMember.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:group="clr-namespace:TCC.UI.Controls.Group"
xmlns:converters="clr-namespace:Nostrum.WPF.Converters;assembly=Nostrum.WPF"
xmlns:converters1="clr-namespace:TCC.UI.Converters"
xmlns:data="clr-namespace:TCC.Data"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance pc:User}">
<group:GroupMemberBase.Resources>
Expand Down Expand Up @@ -296,10 +297,51 @@
RenderTransformOrigin=".5 .5"
Background="{StaticResource RevampBackgroundBrush}"
BorderThickness="2"
BorderBrush="{StaticResource RevampBorderBrush}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
BorderBrush="{StaticResource RevampBorderBrush}"
Margin="5" />
Margin="5" >
</Border>
<Border RenderTransform="{StaticResource Rotate45}"
RenderTransformOrigin=".5 .5"
BorderThickness="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Margin="7" >
<Border.Style>
<Style TargetType="Border">
<Setter Property="BorderBrush" Value="{StaticResource RevampBorderBrush}"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Dps}">
<Setter Property="BorderBrush" Value="{StaticResource DpsRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource DpsRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Tank}">
<Setter Property="BorderBrush" Value="{StaticResource TankRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource TankRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>

</DataTrigger>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Healer}">
<Setter Property="BorderBrush" Value="{StaticResource HealerRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource HealerRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>

</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
</Border>
<!--Aggro indicator -->
<Grid x:Name="AggroBorderGrid" RenderTransformOrigin=".5 .5">
<Border Name="AggroBorder"
Expand Down
40 changes: 40 additions & 0 deletions TCC.Core/UI/Controls/Group/RaidMember.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:group="clr-namespace:TCC.UI.Controls.Group"
xmlns:converters="clr-namespace:Nostrum.WPF.Converters;assembly=Nostrum.WPF"
xmlns:converters1="clr-namespace:TCC.UI.Converters"
xmlns:data="clr-namespace:TCC.Data"
UseLayoutRounding="True"
mc:Ignorable="d"
d:DataContext="{d:DesignInstance pc:User}">
Expand Down Expand Up @@ -247,7 +248,46 @@
VerticalAlignment="Stretch"
BorderBrush="{StaticResource RevampBorderBrush}"
Margin="5" />
<Border RenderTransform="{StaticResource Rotate45}"
RenderTransformOrigin=".5 .5"
BorderThickness="1"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Margin="6" >
<Border.Style>
<Style TargetType="Border">
<Setter Property="BorderBrush" Value="{StaticResource RevampBorderBrush}"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Dps}">
<Setter Property="BorderBrush" Value="{StaticResource DpsRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource DpsRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>
</DataTrigger>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Tank}">
<Setter Property="BorderBrush" Value="{StaticResource TankRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource TankRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>

</DataTrigger>
<DataTrigger Binding="{Binding Role}" Value="{x:Static data:Role.Healer}">
<Setter Property="BorderBrush" Value="{StaticResource HealerRoleBrush}"/>
<Setter Property="Background" >
<Setter.Value>
<SolidColorBrush Color="{StaticResource HealerRoleColor}" Opacity=".1"/>
</Setter.Value>
</Setter>

</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
</Border>
<!--Aggro indicator -->
<Grid x:Name="AggroBorderGrid" RenderTransformOrigin=".5 .5">
<Border Name="AggroBorder"
Expand Down

0 comments on commit c85e09b

Please sign in to comment.