Skip to content

Commit 198de34

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #303 from TheRealDjmr/hotfix19
Hotfix19
2 parents 8292dea + 8246460 commit 198de34

File tree

5 files changed

+10
-103
lines changed

5 files changed

+10
-103
lines changed

‎ImprovedUI/Mods/ImprovedUI/meta.lsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<attribute id="Tags" type="LSString" value=""/>
2323
<attribute id="Type" type="FixedString" value="Add-on"/>
2424
<attribute id="UUID" type="FixedString" value="00000000-0000-0000-0000-ImprovedUI12"/>
25-
<attribute id="Version" type="int64" value="110619672289738752"/>
25+
<attribute id="Version" type="int64" value="110619674437222400"/>
2626
<children>
2727
<node id="PublishVersion">
28-
<attribute id="Version" type="int64" value="110619672289738752"/>
28+
<attribute id="Version" type="int64" value="110619674437222400"/>
2929
</node>
3030
<node id="Scripts"/>
3131
<node id="TargetModes">

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

+3-44
Original file line numberDiff line numberDiff line change
@@ -4277,50 +4277,8 @@
42774277
<Setter Property="FontSize" Value="{StaticResource ScaledDefaultFontSize}"/>
42784278
</Style>
42794279

4280-
<!-- MOD START - Overwrite Slider Template for CC only -->
4281-
<ControlTemplate x:Key="CCOptionsSliderTemplate" TargetType="Slider">
4282-
<ControlTemplate.Resources>
4283-
<BitmapImage x:Key="SliderBackground" UriSource="pack://application:,,,/GustavNoesisGUI;component/Assets/Options/sliderBox_wide_d.png"/>
4284-
</ControlTemplate.Resources>
4285-
<StackPanel Orientation="Horizontal">
4286-
<Grid HorizontalAlignment="Center">
4287-
<ls:LSNineSliceImage x:Name="bg" HorizontalAlignment="Center" VerticalAlignment="Center" ImageSource="{StaticResource SliderBackground}" Width="{TemplateBinding Width}" Height="80" Slices="106,20"/>
4288-
4289-
<ls:LSRepeatButton x:Name="PART_DecreaseRepeatButton" HorizontalAlignment="Left" ContentTemplate="{StaticResource SliderRepeatButtonTemplate}" SoundID="UI_HUD_Shared_Slider_LeftButton" Command="Slider.DecreaseLarge" />
4290-
<ls:LSRepeatButton x:Name="PART_IncreaseRepeatButton" HorizontalAlignment="Right" ContentTemplate="{StaticResource SliderRepeatButtonTemplate}" SoundID="UI_HUD_Shared_Slider_RightButton" Command="Slider.IncreaseLarge" RenderTransformOrigin="0.5, 0.5">
4291-
<ls:LSRepeatButton.RenderTransform>
4292-
<ScaleTransform ScaleX="-1"/>
4293-
</ls:LSRepeatButton.RenderTransform>
4294-
</ls:LSRepeatButton>
4295-
4296-
<Track Name="PART_Track" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="56,0" Height="{TemplateBinding Height}">
4297-
<Track.DecreaseRepeatButton>
4298-
<ls:LSRepeatButton x:Name="PART_TrackBefore" Style="{StaticResource Style.Slider.RepeatButton}" Command="Slider.DecreaseLarge"/>
4299-
</Track.DecreaseRepeatButton>
4300-
<Track.Thumb>
4301-
<ls:LSThumb Style="{StaticResource OptionSliderThumbStyle}" />
4302-
</Track.Thumb>
4303-
<Track.IncreaseRepeatButton>
4304-
<ls:LSRepeatButton x:Name="PART_TrackAfter" Style="{StaticResource Style.Slider.RepeatButton}" Command="Slider.IncreaseLarge"/>
4305-
</Track.IncreaseRepeatButton>
4306-
</Track>
4307-
<TextBlock x:Name="PART_ValueLabel" Style="{StaticResource DefaultSliderValueStyle}" Margin="0,0,-60,0" Foreground="{StaticResource LS_accent100TxtColor}" FontSize="{StaticResource ScaledLargeFontSize}" Visibility="Visible"/>
4308-
</Grid>
4309-
</StackPanel>
4310-
<ControlTemplate.Triggers>
4311-
<DataTrigger Binding="{Binding Enabled}" Value="False">
4312-
<Setter Property="Opacity" Value="{StaticResource DisabledOpacity}" />
4313-
</DataTrigger>
4314-
4315-
<Trigger Property="IsMouseOver" Value="True">
4316-
<Setter TargetName="bg" Property="ImageSource" Value="pack://application:,,,/GustavNoesisGUI;component/Assets/Options/sliderBox_wide_h.png"/>
4317-
</Trigger>
4318-
</ControlTemplate.Triggers>
4319-
</ControlTemplate>
4320-
43214280
<Style x:Key="CCSliderStyle" TargetType="{x:Type Slider}">
4322-
<Setter Property="Template" Value="{StaticResource CCOptionsSliderTemplate}"/>
4323-
<!-- MOD END -->
4281+
<Setter Property="Template" Value="{StaticResource OptionsSliderTemplate}"/>
43244282
<Setter Property="Value" Value="{Binding Value}"/>
43254283
<Setter Property="Minimum" Value="{Binding Min}"/>
43264284
<Setter Property="Maximum" Value="{Binding Max}"/>
@@ -4330,12 +4288,13 @@
43304288
<Setter Property="IsEnabled" Value="{Binding Enabled}"/>
43314289
<Setter Property="Width" Value="600"/>
43324290
<Setter Property="HorizontalAlignment" Value="Center"/>
4291+
<Setter Property="Margin" Value="50,0,-50,0"/>
43334292
</Style>
43344293

43354294
<ControlTemplate x:Key="SliderTemplate">
43364295
<StackPanel>
43374296
<TextBlock Text="{Binding Text}" HorizontalAlignment="Center"/>
4338-
<Slider DataContext="{Binding}" Style="{StaticResource CCSliderStyle}" Width="500">
4297+
<Slider DataContext="{Binding}" Style="{StaticResource CCSliderStyle}">
43394298
<b:Interaction.Triggers>
43404299
<b:EventTrigger EventName="ValueChanged">
43414300
<b:InvokeCommandAction Command="{Binding DataContext.AppearanceValueChanged, RelativeSource={RelativeSource AncestorType={x:Type ls:UIWidget}}}"/>

‎ImprovedUI/Public/Game/GUI/StateMachine.xaml

+3-22
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
</ls:StateEvent>
597597
<ls:StateEvent Name = "OpenOptions">
598598
<ls:StateEvent.Actions>
599-
<ls:PushState Name="Options"/>
599+
<ls:AddSubstate Name="Options"/>
600600
</ls:StateEvent.Actions>
601601
</ls:StateEvent>
602602
<ls:StateEvent Name = "OpenDifficultySettings">
@@ -616,26 +616,7 @@
616616
</ls:StateEvent>
617617
<ls:StateEvent Name = "CharacterAssignOpen">
618618
<ls:StateEvent.Actions>
619-
<ls:PushState Name="CharacterAssign"/>
620-
</ls:StateEvent.Actions>
621-
</ls:StateEvent>
622-
<ls:StateEvent Name = "ConnectivityMenuOpen">
623-
<ls:StateEvent.Actions>
624-
<ls:PushState Name="ConnectivityMenu"/>
625-
</ls:StateEvent.Actions>
626-
</ls:StateEvent>
627-
<ls:StateEvent Name = "GE.OnDialogueShow">
628-
<ls:StateEvent.Actions>
629-
<ls:RemoveState/>
630-
<ls:PushState Name="Dialogue"/>
631-
<ls:PushState Name="Paused"/>
632-
</ls:StateEvent.Actions>
633-
</ls:StateEvent>
634-
<ls:StateEvent Name = "OpenReactionsPopup">
635-
<ls:StateEvent.Actions>
636-
<ls:RemoveState/>
637-
<ls:PushState Name="ReactionsPopup"/>
638-
<ls:PushState Name="Paused"/>
619+
<ls:AddSubstate Name="CharacterAssign"/>
639620
</ls:StateEvent.Actions>
640621
</ls:StateEvent>
641622
<ls:StateEvent Name = "OpenCharacterCreation">
@@ -725,7 +706,7 @@
725706
</ls:StateEvent>
726707
<ls:StateEvent Name = "GE.OnDialogueShow">
727708
<ls:StateEvent.Actions>
728-
<ls:PushState Name="Dialogue"/>
709+
<ls:AddSubstate Name="Dialogue"/>
729710
</ls:StateEvent.Actions>
730711
</ls:StateEvent>
731712
<ls:StateEvent Name = "PreloadDialogue">

‎ImprovedUI/Public/Game/GUI/StateMachine_c.xaml

+2-34
Original file line numberDiff line numberDiff line change
@@ -591,11 +591,6 @@
591591
<ls:SetSubstate Name="CharacterAssign"/>
592592
</ls:StateEvent.Actions>
593593
</ls:StateEvent>
594-
<ls:StateEvent Name = "ConnectivityMenuOpen">
595-
<ls:StateEvent.Actions>
596-
<ls:SetSubstate Name="ConnectivityMenu"/>
597-
</ls:StateEvent.Actions>
598-
</ls:StateEvent>
599594

600595
<ls:StateEvent Name = "IE.ToggleInGameMenu">
601596
<ls:StateEvent.Actions>
@@ -618,22 +613,6 @@
618613
</ls:StateEvent.Actions>
619614
</ls:StateEvent>
620615

621-
<ls:StateEvent Name = "GE.OnDialogueShow">
622-
<ls:StateEvent.Actions>
623-
<ls:RemoveState/>
624-
<ls:PushState Name="Dialogue"/>
625-
<ls:PushState Name="Paused"/>
626-
</ls:StateEvent.Actions>
627-
</ls:StateEvent>
628-
629-
<ls:StateEvent Name = "OpenReactionsPopup">
630-
<ls:StateEvent.Actions>
631-
<ls:RemoveState/>
632-
<ls:PushState Name="ReactionsPopup"/>
633-
<ls:PushState Name="Paused"/>
634-
</ls:StateEvent.Actions>
635-
</ls:StateEvent>
636-
637616
<ls:StateEvent Name = "CloseGameMenu">
638617
<ls:StateEvent.Actions>
639618
<ls:RemoveState/>
@@ -646,12 +625,6 @@
646625
</ls:StateEvent.Actions>
647626
</ls:StateEvent>
648627

649-
<ls:StateEvent Name = "CloseAllFullscreen">
650-
<ls:StateEvent.Actions>
651-
<ls:RemoveState/>
652-
</ls:StateEvent.Actions>
653-
</ls:StateEvent>
654-
655628
<ls:StateEvent Name = "ClosePanelSelect">
656629
<ls:StateEvent.Actions>
657630
<ls:RemoveState/>
@@ -858,7 +831,7 @@
858831
</ls:StateEvent>
859832
<ls:StateEvent Name = "GE.OnDialogueShow">
860833
<ls:StateEvent.Actions>
861-
<ls:PushState Name="Dialogue"/>
834+
<ls:AddSubstate Name="Dialogue"/>
862835
</ls:StateEvent.Actions>
863836
</ls:StateEvent>
864837
<ls:StateEvent Name = "PreloadDialogue">
@@ -963,7 +936,7 @@
963936
</ls:StateEvent>
964937
<ls:StateEvent Name = "OpenReactionsPopup">
965938
<ls:StateEvent.Actions>
966-
<ls:PushState Name="ReactionsPopup"/>
939+
<ls:AddSubstate Name="ReactionsPopup"/>
967940
</ls:StateEvent.Actions>
968941
</ls:StateEvent>
969942
<ls:StateEvent Name = "OpenCharacterChangeAppearance">
@@ -3026,11 +2999,6 @@
30262999
</ls:State.Widgets>
30273000

30283001
<ls:State.Events>
3029-
<ls:StateEvent Name = "IE.ToggleInGameMenu">
3030-
<ls:StateEvent.Actions>
3031-
<ls:PushState Name="Paused"/>
3032-
</ls:StateEvent.Actions>
3033-
</ls:StateEvent>
30343002
<ls:StateEvent Name = "CloseCursor">
30353003
<ls:StateEvent.Actions>
30363004
<ls:RemoveState/>

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ This mod is aimed at making changes to the overall user interface to improve usa
2020
- Character Creation Layout tweaks: Redesigned Origin layout (the first screen you see when entering CC).
2121
- Character Creation Layout tweaks: Adds full Facial Hair Colour selection.
2222
- (Keyboard only) CC/Level up Layout tweaks: Adds multiple scroll bars to Origins, Races, Subraces, Classes, Subclasses, Deity and Background selection for better support with modded options.
23-
- (Keyboard only) Character Creation Layout tweaks: Adds numeric value to appearance sliders removed in Patch 6.
2423
- (Controller only) Character Creation Layout tweaks: Hides appearance options when not available, adds "all colours" tickbox for highlights.
2524
- Hireling tweaks: Redesigned Hireling layout (makes better use of the dead space).
2625

0 commit comments

Comments
 (0)