Skip to content

Feature: Added styles back to controls #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lamparter merged 1 commit into from
Mar 13, 2025
Merged

Feature: Added styles back to controls #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/Riverside.GlowUI.Styles/CubeUI.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ToolkitControls="using:Riverside.Toolkit.Controls"
xmlns:icons="using:Riverside.Toolkit.Icons">
<ResourceDictionary.MergedDictionaries>
<!--<ResourceDictionary.MergedDictionaries> There's positively no way to get this to work without using code-behind.
<ResourceDictionary Source="ms-appx:///Riverside.Toolkit/Styles/CubeThemeDictionary.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary.MergedDictionaries>-->
<Style x:Key="MicaFlyoutStyle" TargetType="FlyoutPresenter">
<Setter Property="Margin" Value="0" />
<Setter Property="Opacity" Value="1" />
Expand Down
260 changes: 260 additions & 0 deletions src/core/Riverside.Toolkit.Controls.Primitives/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Riverside.Toolkit.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">

<Style TargetType="local:CommandLink">
<Setter Property="Foreground" Value="{StaticResource AccentTextFillColorPrimaryBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:CommandLink">
<Grid
x:Name="ContentArea"
Padding="16,10,16,14"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1"
CornerRadius="4">
<Grid.BackgroundTransition>
<BrushTransition Duration="0:0:0.083" />
</Grid.BackgroundTransition>

<FontIcon
Margin="0,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Foreground="{TemplateBinding Foreground}"
Glyph="&#xEBE7;" />
<StackPanel Margin="40,0,0,0" Spacing="10">
<TextBlock
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource TitleTextBlockStyle}"
Text="{TemplateBinding Title}"
TextWrapping="WrapWholeWords" />
<TextBlock
Foreground="{TemplateBinding Foreground}"
Text="{TemplateBinding Description}"
TextWrapping="WrapWholeWords" />
</StackPanel>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorSecondaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorTertiaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="UACCommandLinkStyle" TargetType="local:CommandLink">
<Setter Property="Foreground" Value="{StaticResource AccentTextFillColorPrimaryBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:CommandLink">
<Grid
x:Name="ContentArea"
Padding="16,10,16,14"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1"
CornerRadius="4">
<Grid.BackgroundTransition>
<BrushTransition Duration="0:0:0.083" />
</Grid.BackgroundTransition>

<muxc:ImageIcon
Width="25"
Margin="0,8,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Source="/Assets/Windows/UserAccountControl.png" />
<StackPanel Margin="40,0,0,0" Spacing="10">
<TextBlock
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource TitleTextBlockStyle}"
Text="{TemplateBinding Title}"
TextWrapping="WrapWholeWords" />
<TextBlock
Foreground="{TemplateBinding Foreground}"
Text="{TemplateBinding Description}"
TextWrapping="WrapWholeWords" />
</StackPanel>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorSecondaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorTertiaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="AccentCommandLinkStyle" TargetType="local:CommandLink">
<Setter Property="Foreground" Value="{StaticResource TextOnAccentFillColorPrimaryBrush}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:CommandLink">
<Grid
x:Name="ContentArea"
Padding="16,10,16,14"
Background="{StaticResource AccentFillColorDefaultBrush}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1"
CornerRadius="4">
<Grid.BackgroundTransition>
<BrushTransition Duration="0:0:0.083" />
</Grid.BackgroundTransition>

<FontIcon
Margin="0,10,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Foreground="{TemplateBinding Foreground}"
Glyph="" />
<StackPanel Margin="40,0,0,0" Spacing="10">
<TextBlock
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource TitleTextBlockStyle}"
Text="{TemplateBinding Title}"
TextWrapping="WrapWholeWords" />
<TextBlock
Foreground="{TemplateBinding Foreground}"
Text="{TemplateBinding Description}"
TextWrapping="WrapWholeWords" />
</StackPanel>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource AccentFillColorSecondaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource AccentFillColorTertiaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<Style TargetType="local:Card">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:Card">
<Grid
x:Name="ContentArea"
Padding="16,10,16,14"
Background="{StaticResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="4">
<Grid.BackgroundTransition>
<BrushTransition Duration="0:0:0.083" />
</Grid.BackgroundTransition>
<StackPanel Spacing="10">
<TextBlock
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource TitleTextBlockStyle}"
Text="{TemplateBinding Title}"
TextWrapping="WrapWholeWords" />
<TextBlock
Foreground="{TemplateBinding Foreground}"
Style="{StaticResource SubtitleTextBlockStyle}"
Text="{TemplateBinding Subtitle}"
TextWrapping="WrapWholeWords" />
<TextBlock
Foreground="{TemplateBinding Foreground}"
Text="{TemplateBinding Content}"
TextWrapping="WrapWholeWords" />
</StackPanel>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorSecondaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Pressed">
<VisualState.Setters>
<Setter Target="ContentArea.Background" Value="{StaticResource ControlFillColorTertiaryBrush}" />
<Setter Target="ContentArea.BorderBrush" Value="{StaticResource ControlElevationBorderBrush}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<Style TargetType="local:ChatBubble">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:ChatBubble">
<Grid
Padding="8"
VerticalAlignment="Top"
Background="{ThemeResource CardBackgroundFillColorDefault}"
CornerRadius="8">
<TextBlock x:Name="BubbleText" Text="{TemplateBinding Text}" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>

<Style x:Key="AccentChatBubbleStyle" TargetType="local:ChatBubble">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:ChatBubble">
<Grid
Padding="8"
VerticalAlignment="Top"
Background="{ThemeResource AccentFillColorDefaultBrush}"
CornerRadius="8">
<TextBlock
x:Name="BubbleText"
Foreground="{ThemeResource TextOnAccentFillColorPrimaryBrush}"
Text="{TemplateBinding Text}" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
Loading