waffle.lord/Patcher
waffle.lord/Patcher
0
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

update message view with textblock to wrap text

Browse Source
This commit is contained in:
IsWaffle 2022-04-30 12:03:09 -04:00
parent 165ddb4990
commit 9bcbb42f83
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Patcher/PatchClient/Assets/Styles.axaml
View File

@ -4,15 +4,16 @@
<Design.PreviewWith> <Design.PreviewWith>
<Border Padding="20" Background="{StaticResource AKI_Background_Light}"> <Border Padding="20" Background="{StaticResource AKI_Background_Light}">
<!-- Add Controls for Previewer Here --> <!-- Add Controls for Previewer Here -->
<StackPanel Background="{StaticResource AKI_Background_Light}" Spacing="15" Margin="10"> <StackPanel Background="{StaticResource AKI_Background_Light}" Spacing="15" Margin="10">
<cc:TitleBar Title="Title Bar Text"/> <cc:TitleBar Title="Title Bar Text"/>
<Label Content="Normal label"/> <Label Content="Normal label"/>
<Label Content="Yellow label" Classes="yellow"/> <Label Content="Yellow label" Classes="yellow"/>
<Label Content="Blue label" Classes="dark"/> <TextBlock Text="Yellow textblock" Classes="yellow"/>
<ProgressBar Value="40"/> <Label Content="Blue label" Classes="dark"/>
<Separator Height="1"/> <ProgressBar Value="40"/>
<ProgressBar Value="60" Classes="done"/> <Separator Height="1"/>
</StackPanel> <ProgressBar Value="60" Classes="done"/>
</StackPanel>
</Border> </Border>
</Design.PreviewWith> </Design.PreviewWith>
@ -21,24 +22,28 @@
<Style Selector="cc|TitleBar"> <Style Selector="cc|TitleBar">
<Setter Property="Background" Value="{StaticResource AKI_Background_Dark}"/> <Setter Property="Background" Value="{StaticResource AKI_Background_Dark}"/>
<Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/> <Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/>
<Setter Property="XButtonForeground" Value="{StaticResource AKI_Brush_DarkGrayBlue}"/> <Setter Property="XButtonForeground" Value="{StaticResource AKI_Brush_DarkGrayBlue}"/>
</Style> </Style>
<Style Selector="Label"> <Style Selector="TextBlock.yellow">
<Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/> <Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/>
</Style> </Style>
<Style Selector="Label">
<Setter Property="Foreground" Value="{StaticResource AKI_Foreground_Light}"/>
</Style>
<Style Selector="Label.yellow"> <Style Selector="Label.yellow">
<Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/> <Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/>
</Style> </Style>
<Style Selector="Label.dark"> <Style Selector="Label.dark">
<Setter Property="Foreground" Value="DimGray"/> <Setter Property="Foreground" Value="DimGray"/>
</Style> </Style>
<Style Selector="ProgressBar"> <Style Selector="ProgressBar">
<Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/> <Setter Property="Foreground" Value="{StaticResource AKI_Brush_Yellow}"/>
</Style> </Style>
<Style Selector="ProgressBar.done"> <Style Selector="ProgressBar.done">
<Setter Property="Foreground" Value="Green"/> <Setter Property="Foreground" Value="Green"/>
@ -65,7 +70,7 @@
</Style.Animations> </Style.Animations>
</Style> </Style>
<Style Selector="Separator"> <Style Selector="Separator">
<Setter Property="Background" Value="{StaticResource AKI_Background_Dark}"/> <Setter Property="Background" Value="{StaticResource AKI_Background_Dark}"/>
</Style> </Style>
</Styles> </Styles>

7
Patcher/PatchClient/Views/MessageView.axaml
View File

@ -11,10 +11,11 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"> <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<Label Content="You can close this window" <Label Content="You can close this window"
FontSize="12" FontWeight="SemiBold"/> FontSize="12" FontWeight="SemiBold"
<Label Content="{Binding InfoText}"
Classes="yellow"
/> />
<TextBlock Text="{Binding InfoText}" TextWrapping="Wrap"
Classes="yellow"
/>
</StackPanel> </StackPanel>
</UserControl> </UserControl>