Merge pull request #121 from TheRealDjmr/hotfix8

Hotfix8

Author: TheRealDjmr

ImprovedUI/Mods/ImprovedUI/meta.lsx

@@ -22,10 +22,10 @@
                     <attribute id="Tags" type="LSString" value=""/>
                     <attribute id="Type" type="FixedString" value="Add-on"/>
                     <attribute id="UUID" type="FixedString" value="00000000-0000-0000-0000-ImprovedUI12"/>
-                    <attribute id="Version" type="int64" value="109493765940445184"/>
+                    <attribute id="Version" type="int64" value="109634503428800512"/>
                     <children>
                         <node id="PublishVersion">
-                            <attribute id="Version" type="int64" value="109493765940445184"/>
+                            <attribute id="Version" type="int64" value="109634503428800512"/>
                         </node>
                         <node id="Scripts"/>
                         <node id="TargetModes">

ImprovedUI/Public/Game/GUI/Library/CCLib_c.xaml

@@ -4361,7 +4361,9 @@
                                     <TextBlock x:Name="description" Visibility="{Binding Description.Text, Converter={StaticResource NullToCollapsedConverter}, ConverterParameter='EmptyString'}" ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" Margin="0,20,0,0"/>
 
                                     <TextBlock x:Name="SelectedTitle" Style="{StaticResource PanelSubHeaderText}" Margin="0,50,0,0">
-                <Run Text="{Binding Source='h390a9286g28cag49ceg93c5gd5b7c1e962da', Converter={StaticResource TranslatedStringConverter}}"/><Run Text="{Binding SelectedPassiveCount, StringFormat=' {0}'}"/><Run Text="{Binding MaxSelectedPassiveCount, StringFormat='/{0}'}"/>
+										<Run Text="{Binding Source='h390a9286g28cag49ceg93c5gd5b7c1e962da', Converter={StaticResource TranslatedStringConverter}}"/>
+                                        <Run Text="{Binding SelectedPassiveCount, StringFormat=' {0}'}"/>
+                                        <Run x:Name="PassiveSelectorMaxText" Text="{Binding MaxSelectedPassiveCount, StringFormat='/{0}'}"/>
                                     </TextBlock>
 
                                     <ItemsControl ItemsSource="{Binding Passives}" ItemTemplate="{StaticResource SelectablePassiveTemplate}" Margin="0,40,0,0"/>
@@ -4372,6 +4374,20 @@
                                     <DataTrigger Binding="{Binding IsComplete}" Value="False">
                                         <Setter TargetName="SelectedTitle" Property="Foreground" Value="{StaticResource CCTabToDo}"/>
                                     </DataTrigger>
+									<MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsComplete}" Value="True"/>
+                                            <Condition Value="True">
+                                                <Condition.Binding>
+                                                    <MultiBinding Converter="{StaticResource GreaterOrEqualThanMultiConverter}">
+                                                        <Binding Path="MaxSelectedPassiveCount"/>
+                                                        <Binding Path="SelectedPassiveCount"/>
+                                                    </MultiBinding>
+                                                </Condition.Binding>
+                                            </Condition>
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter TargetName="PassiveSelectorMaxText" Property="Text" Value="{Binding SelectedPassiveCount, StringFormat='/{0}'}"/>
+                                    </MultiDataTrigger>
                                 </DataTemplate.Triggers>
                             </DataTemplate>
 

ImprovedUI/Public/Game/GUI/Library/CCLib_k.xaml

@@ -2401,7 +2401,7 @@
             <TextBlock x:Name="SelectionTitle" Style="{StaticResource PanelHeaderText}" FontSize="{StaticResource ScaledDefaultFontSize}" MaxWidth="700" TextWrapping="Wrap" TextAlignment="Center">
                 <Run Text="{Binding Name}"/>
                 <Run Text="{Binding SelectedPassiveCount, StringFormat=' ({0}'}"/>
-                <Run Text="{Binding MaxSelectedPassiveCount, StringFormat='/{0})'}"/>
+                <Run x:Name="PassiveSelectorMaxText" Text="{Binding MaxSelectedPassiveCount, StringFormat='/{0})'}"/>
             </TextBlock>
             <TextBlock x:Name="description" ls:TextBlockFormatter.SourceText="{Binding Description.Text}" Style="{StaticResource PanelDescriptionText}" Margin="0,50,0,0"/>
 
@@ -2433,6 +2433,21 @@
             <DataTrigger Binding="{Binding IsComplete}" Value="False">
                 <Setter TargetName="SelectionTitle" Property="Foreground" Value="{StaticResource CCTabToDo}"/>
             </DataTrigger>
+			
+			<MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding IsComplete}" Value="True"/>
+                    <Condition Value="True">
+                        <Condition.Binding>
+                            <MultiBinding Converter="{StaticResource GreaterOrEqualThanMultiConverter}">
+                                <Binding Path="MaxSelectedPassiveCount"/>
+                                <Binding Path="SelectedPassiveCount"/>
+                            </MultiBinding>
+                        </Condition.Binding>
+                    </Condition>
+                </MultiDataTrigger.Conditions>
+                <Setter TargetName="PassiveSelectorMaxText" Property="Text" Value="{Binding SelectedPassiveCount, StringFormat='/{0})'}"/>
+            </MultiDataTrigger>
         </DataTemplate.Triggers>
     </DataTemplate>