Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,10 @@

<StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>

<Style Selector="TextBlock">
<Setter Property="TextTrimming" Value="CharacterEllipsis"/>
</Style>

<!-- Avalonia's Fluent controls still consume UWP-era accent resources, whose dark-theme
defaults use the base accent and white foreground. Bind every filled accent control to
the WinUI v2 tokens above so dark mode consistently uses a lighter fill and dark glyphs. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
CornerRadius="6"
Padding="12,8"
Background="{DynamicResource SubtleFillColorSecondaryBrush}">
<StackPanel Orientation="Horizontal" Spacing="8">
<controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/warning_round.svg"
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
<controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/warning_round.svg"
Width="16" Height="16"
VerticalAlignment="Center"
automation:AutomationProperties.AccessibilityView="Raw"/>
<TextBlock Text="{Binding ScopeWarning}"
<TextBlock Grid.Column="1" Text="{Binding ScopeWarning}"
TextWrapping="Wrap"
VerticalAlignment="Center"/>
</StackPanel>
</Grid>
</Border>

<Grid Grid.Row="2" ColumnDefinitions="*,Auto" ColumnSpacing="8">
Expand Down
54 changes: 27 additions & 27 deletions src/UniGetUI.Avalonia/Views/DialogPages/ManageShortcutsWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@
<DataGridTemplateColumn Width="2*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate x:DataType="vm:ShortcutEntryViewModel">
<StackPanel Orientation="Horizontal" Spacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/id.svg"
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/id.svg"
Width="16" Height="16" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Name}" VerticalAlignment="Center"
<TextBlock Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Name}"/>
</StackPanel>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
Expand All @@ -146,14 +146,14 @@
<DataGridTemplateColumn Width="3*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate x:DataType="vm:ShortcutEntryViewModel">
<StackPanel Orientation="Horizontal" Spacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/open_folder.svg"
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/open_folder.svg"
Width="16" Height="16" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Path}" VerticalAlignment="Center"
<TextBlock Grid.Column="1" Text="{Binding Path}" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Path}"/>
</StackPanel>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
Expand Down Expand Up @@ -365,15 +365,15 @@
automation:AutomationProperties.Name="{Binding DeleteAutomationName}"
ToolTip.Tip="{t:Translate Text='Delete this shortcut, now and whenever an upgrade creates it again'}"/>

<StackPanel Grid.Column="2"
Orientation="Horizontal"
Spacing="6"
VerticalAlignment="Center">
<TextBlock Text="{Binding Name}"
<Grid Grid.Column="2"
ColumnDefinitions="*,Auto"
ColumnSpacing="6"
VerticalAlignment="Center">
<TextBlock Grid.Column="0" Text="{Binding Name}"
VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Path}"/>
<Border Background="{DynamicResource SystemAccentColor}"
<Border Grid.Column="1" Background="{DynamicResource SystemAccentColor}"
CornerRadius="4"
Padding="4,0"
VerticalAlignment="Center"
Expand All @@ -382,7 +382,7 @@
FontSize="10"
Foreground="White"/>
</Border>
</StackPanel>
</Grid>

<TextBlock Grid.Column="3"
Text="{Binding Location}"
Expand Down Expand Up @@ -504,14 +504,14 @@
<DataGridTemplateColumn Width="2*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate x:DataType="vm:StartMenuShortcutEntryViewModel">
<StackPanel Orientation="Horizontal" Spacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/id.svg"
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/id.svg"
Width="16" Height="16" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Name}" VerticalAlignment="Center"
<TextBlock Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Name}"/>
</StackPanel>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
Expand All @@ -520,14 +520,14 @@
<DataGridTemplateColumn Width="3*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate x:DataType="vm:StartMenuShortcutEntryViewModel">
<StackPanel Orientation="Horizontal" Spacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/open_folder.svg"
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="6"
VerticalAlignment="Center" Margin="0,0,4,0">
<controls:SvgIcon Grid.Column="0" Path="avares://UniGetUI/Assets/Symbols/open_folder.svg"
Width="16" Height="16" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Location}" VerticalAlignment="Center"
<TextBlock Grid.Column="1" Text="{Binding Location}" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"
ToolTip.Tip="{Binding Path}"/>
</StackPanel>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@
<DataGridTemplateColumn Header="{t:Translate Operation}" Width="1*" MinWidth="120" Tag="kind">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate x:DataType="vm:OperationHistoryRowViewModel">
<StackPanel Orientation="Horizontal" Spacing="6" Margin="12,0,4,0" VerticalAlignment="Center">
<controls:SvgIcon Path="{Binding KindIconPath}" Width="24" Height="24" VerticalAlignment="Center"/>
<TextBlock Text="{Binding KindLabel}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
</StackPanel>
<Grid ColumnDefinitions="Auto,*" ColumnSpacing="6" Margin="12,0,4,0" VerticalAlignment="Center">
<controls:SvgIcon Grid.Column="0" Path="{Binding KindIconPath}" Width="24" Height="24" VerticalAlignment="Center"/>
<TextBlock Grid.Column="1" Text="{Binding KindLabel}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
</Grid>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
Margin="16,0,16,8"
Padding="4"
IsVisible="{Binding IsRestartBannerVisible}">
<StackPanel Orientation="Horizontal"
Margin="8,6">
<TextBlock Text="{Binding RestartBannerText}"
<Grid ColumnDefinitions="*,Auto"
Margin="8,6">
<TextBlock Grid.Column="0" Text="{Binding RestartBannerText}"
FontSize="14"
VerticalAlignment="Center"
Margin="0,0,16,0"/>
<Button Content="{Binding RestartButtonText}"
<Button Grid.Column="1" Content="{Binding RestartButtonText}"
automation:AutomationProperties.Name="{Binding RestartButtonText}"
Command="{Binding RestartAppCommand}"
HorizontalAlignment="Right"/>
</StackPanel>
</Grid>
</Border>

<!-- Row 2: Content frame — sub-pages slide in horizontally (WinUI SlideNavigationTransition) -->
Expand Down
Loading
Loading