Skip to content

Commit e0cfd8b

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #184 from TheRealDjmr/Patch4controllerappearanceui
Add files via upload
2 parents 9fe2714 + ef15ca5 commit e0cfd8b

File tree

1 file changed

+31
-5
lines changed

1 file changed

+31
-5
lines changed

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

+31-5
Original file line numberDiff line numberDiff line change
@@ -3905,9 +3905,16 @@
39053905
<DataTemplate>
39063906
<StackPanel>
39073907
<ContentControl x:Name="base" ls:MoveFocus.Focusable="True" Focusable="True" Template="{StaticResource AppearanceListButtonTemplateShort}" HorizontalAlignment="Center">
3908-
<Control Template="{StaticResource ColorOptionTickBoxTemplate}" />
3908+
<Control Template="{StaticResource ColorOptionTickBoxTemplate}" />
39093909
</ContentControl>
39103910
</StackPanel>
3911+
<!-- MOD START - Hide all sliders since sliders are now added to the main page -->
3912+
<DataTemplate.Triggers>
3913+
<DataTrigger Binding="{Binding ListItemType}" Value="Slider">
3914+
<Setter TargetName="base" Property="Visibility" Value="Collapsed"/>
3915+
</DataTrigger>
3916+
</DataTemplate.Triggers>
3917+
<!-- MOD END -->
39113918
</DataTemplate>
39123919
</Setter.Value>
39133920
</Setter>
@@ -5467,8 +5474,12 @@
54675474

54685475
<StackPanel x:Name="tattooChoices" Visibility="{Binding IsDragonborn, Converter={StaticResource BoolToCollapsedConverter}}">
54695476
<ListBox Tag="tattoos" ItemsSource="{Binding SelectableTattoos}" SelectedItem="{Binding SelectedTattoo}" Template="{StaticResource AppearanceCarousel}" Visibility="{Binding SelectableTattoos.Count, Converter={StaticResource CountToVisibilityConverter}}" Style="{StaticResource sliderListBoxStyle}"/>
5470-
5471-
<ListBox Tag="tattooColors" ItemsSource="{Binding SelectableTattooColours}" SelectedItem="{Binding SelectedTattooColour}" Template="{StaticResource AppearanceCarousel}" Visibility="{Binding AppearanceTattoos.EmptyMaterialSelected, Converter={StaticResource BoolToCollapsedConverter}}" Style="{StaticResource sliderListBoxStyle}"/>
5477+
<!-- MOD START - Add makeup color sliders -->
5478+
<StackPanel Visibility="{Binding AppearanceTattoos.EmptyMaterialSelected, Converter={StaticResource BoolToCollapsedConverter}}">
5479+
<ListBox Tag="tattooColors" ItemsSource="{Binding SelectableTattooColours}" SelectedItem="{Binding SelectedTattooColour}" Template="{StaticResource AppearanceCarousel}" Style="{StaticResource sliderListBoxStyle}"/>
5480+
<ListBox x:Name="tattooIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="highlightIntensity" DataContext="{Binding AppearanceTattoos.ColorOptions[0]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5481+
</StackPanel>
5482+
<!-- MOD END -->
54725483
</StackPanel>
54735484

54745485
<ListBox Tag="piercing" ItemsSource="{Binding SelectablePiercings}" SelectedItem="{Binding SelectedPiercing}" Template="{StaticResource AppearanceCarousel}" Visibility="{Binding SelectablePiercings.Count, Converter={StaticResource CountToVisibilityConverter}}" Style="{StaticResource sliderListBoxStyle}" />
@@ -5480,13 +5491,20 @@
54805491
<ListBox Tag="makeup" ItemsSource="{Binding SelectableMakeup}" SelectedItem="{Binding SelectedMakeup}" Template="{StaticResource AppearanceCarousel}" Visibility="{Binding SelectableMakeup.Count, Converter={StaticResource CountToVisibilityConverter}}" Style="{StaticResource sliderListBoxStyle}"/>
54815492

54825493
<ListBox Tag="makeupColors" ItemsSource="{Binding SelectableMakeupColours}" SelectedItem="{Binding SelectedMakeupColour}" Template="{StaticResource AppearanceCarousel}" Visibility="{Binding AppearanceMakeup.EmptyMaterialSelected, Converter={StaticResource BoolToCollapsedConverter}}" Style="{StaticResource sliderListBoxStyle}"/>
5494+
<!-- MOD START - Add makeup color sliders -->
5495+
<StackPanel Visibility="{Binding AppearanceMakeup.EmptyMaterialSelected, Converter={StaticResource BoolToCollapsedConverter}}">
5496+
<ListBox x:Name="makeupColorIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="highlightIntensity" DataContext="{Binding AppearanceMakeup.ColorOptions[0]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5497+
<ListBox x:Name="makeupMetallicIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="metallicIntensity" DataContext="{Binding AppearanceMakeup.ColorOptions[1]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5498+
<ListBox x:Name="makeupGlossyIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="glossyIntensity" DataContext="{Binding AppearanceMakeup.ColorOptions[2]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5499+
</StackPanel>
5500+
<!-- MOD END -->
54835501

54845502
<!-- MOD START - Hide lip makeup based on if eye makeup is available (doesn't show for Origin characters) -->
54855503
<StackPanel Visibility="{Binding SelectableMakeup.Count, Converter={StaticResource CountToVisibilityConverter}}">
54865504
<ListBox Tag="lipMakeupColors" ItemsSource="{Binding SelectableLipsMakeupColours}" SelectedItem="{Binding SelectedLipsMakeupColour}" Template="{StaticResource AppearanceCarousel}" Style="{StaticResource sliderListBoxStyle}"/>
54875505
<ListBox x:Name="lipColorIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="lipColorIntensity" DataContext="{Binding AppearanceLipsMakeup.ColorOptions[0]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5488-
<ListBox x:Name="metallicIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="metallicIntensity" DataContext="{Binding AppearanceLipsMakeup.ColorOptions[1]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5489-
<ListBox x:Name="glossyIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="glossyIntensity" DataContext="{Binding AppearanceLipsMakeup.ColorOptions[2]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5506+
<ListBox x:Name="lipMetallicIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="metallicIntensity" DataContext="{Binding AppearanceLipsMakeup.ColorOptions[1]}" Template="{StaticResource AppearanceSliderCarousel}"/>
5507+
<ListBox x:Name="lipGlossyIntensity" Tag="{StaticResource FalseValue}" ls:AttachedProperties.InheritedTag="glossyIntensity" DataContext="{Binding AppearanceLipsMakeup.ColorOptions[2]}" Template="{StaticResource AppearanceSliderCarousel}"/>
54905508
</StackPanel>
54915509
<!-- MOD END -->
54925510

@@ -6143,6 +6161,8 @@
61436161
</b:Interaction.Triggers>
61446162

61456163
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h6ed36c54g1a3dg4c46g9987gd5882613ae05', Converter={StaticResource TranslatedStringConverter}}" Style="{StaticResource OverPanelHeaderText}"/>
6164+
<!-- MOD NOTE - Re-add color options -->
6165+
<ItemsControl Style="{DynamicResource ColorOptionsStyle}" ItemsSource="{Binding HairColorOptions}" Margin="0,50,0,0"/>
61466166

61476167
<ListBox ItemsSource="{Binding SelectableHairColours}" SelectedItem="{Binding SelectedHairColour}" ItemTemplate="{StaticResource selectableColourTemplate}" Style="{StaticResource appearanceOverpanelListBoxStyle}" Margin="0,50,0,0"/>
61486168

@@ -6164,6 +6184,8 @@
61646184
</b:Interaction.Triggers>
61656185

61666186
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h9d4a4e08g81cdg4259g8bd1g80b47dbda3f3', Converter={StaticResource TranslatedStringConverter}}" Style="{StaticResource OverPanelHeaderText}"/>
6187+
<!-- MOD NOTE - Re-add color options -->
6188+
<ItemsControl Style="{StaticResource ColorOptionsStyle}" ItemsSource="{Binding AppearanceHairHighlights.ColorOptions}" Margin="0,50,0,0"/>
61676189

61686190
<ListBox ItemsSource="{Binding SelectableHighlightColours}" SelectedItem="{Binding SelectedHighlightColour}" ItemTemplate="{StaticResource selectableColourTemplate}" Style="{StaticResource appearanceOverpanelListBoxStyle}" Margin="0,50,0,0"/>
61696191

@@ -6247,6 +6269,8 @@
62476269
</b:Interaction.Triggers>
62486270

62496271
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h8f9581e8g4440g4cf5g8752g220535346a50', Converter={StaticResource TranslatedStringConverter}}" Style="{StaticResource OverPanelHeaderText}"/>
6272+
<!-- MOD NOTE - Re-add color options -->
6273+
<ItemsControl Style="{StaticResource ColorOptionsStyle}" ItemsSource="{Binding AppearanceHornColor.ColorOptions}" Margin="0,50,0,0"/>
62506274

62516275
<ListBox ItemsSource="{Binding SelectableHornColours}" SelectedItem="{Binding SelectedHornColour}" ItemTemplate="{StaticResource selectableColourTemplate}" Style="{StaticResource appearanceOverpanelListBoxStyle}" Margin="0,50,0,0"/>
62526276

@@ -6268,6 +6292,8 @@
62686292
</b:Interaction.Triggers>
62696293

62706294
<TextBlock ls:TextBlockFormatter.SourceText="{Binding Source='h33ea2bd3g91cag471cg8242gef7327983dbf', Converter={StaticResource TranslatedStringConverter}}" Style="{StaticResource OverPanelHeaderText}"/>
6295+
<!-- MOD NOTE - Re-add color options -->
6296+
<ItemsControl Style="{StaticResource ColorOptionsStyle}" ItemsSource="{Binding AppearanceHornTipColor.ColorOptions}" Margin="0,50,0,0"/>
62716297

62726298
<ListBox ItemsSource="{Binding SelectableHornTipColours}" SelectedItem="{Binding SelectedHornTipColour}" ItemTemplate="{StaticResource selectableColourTemplate}" Style="{StaticResource appearanceOverpanelListBoxStyle}" Margin="0,50,0,0"/>
62736299

0 commit comments

Comments
 (0)