v1.03 — Fluent UI controls, version card info, paste fix
- Version cards: release dates + supported OS (no LTSC/Version 16.0) - Fluent ComboBox: rounded corners, shadow dropdown, chevron icon - Fluent CheckBox: custom blue checkbox with MDL2 checkmark, hover states - Fluent TextBox: rounded corners, blue bottom border on focus - 64-bit labeled "(ajánlott)" Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
GroupName="Version" IsChecked="True" Margin="0,0,0,10">
|
||||
<StackPanel Margin="8,2">
|
||||
<TextBlock Text="Office 2024" FontSize="18" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="Version 16.0 · LTSC 2024 · Windows 10 / 11"
|
||||
<TextBlock Text="2024. októberi kiadás · Windows 10 / 11"
|
||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||
</StackPanel>
|
||||
</RadioButton>
|
||||
@@ -29,7 +29,7 @@
|
||||
GroupName="Version" Margin="0,0,0,10">
|
||||
<StackPanel Margin="8,2">
|
||||
<TextBlock Text="Office 2021" FontSize="18" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="Version 16.0 · LTSC 2021 · Windows 10 / 11"
|
||||
<TextBlock Text="2021. októberi kiadás · Windows 10 / 11"
|
||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||
</StackPanel>
|
||||
</RadioButton>
|
||||
@@ -38,7 +38,7 @@
|
||||
GroupName="Version" Margin="0,0,0,10">
|
||||
<StackPanel Margin="8,2">
|
||||
<TextBlock Text="Office 2019" FontSize="18" FontWeight="SemiBold"/>
|
||||
<TextBlock Text="Version 16.0 · LTSC 2019 · Windows 7 / 8.1 / 10"
|
||||
<TextBlock Text="2019. szeptemberi kiadás · Windows 7 / 8.1 / 10"
|
||||
FontSize="12" Foreground="{StaticResource TextSecondaryBrush}" Margin="0,2,0,0"/>
|
||||
</StackPanel>
|
||||
</RadioButton>
|
||||
|
||||
@@ -1,33 +1,144 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<!-- Fluent ComboBox -->
|
||||
<!-- Fluent ComboBox with rounded corners and custom dropdown -->
|
||||
<Style x:Key="FluentComboBox" TargetType="ComboBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI Variable Display, Segoe UI, Arial"/>
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<Setter Property="Padding" Value="12,8"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
|
||||
<Setter Property="Background" Value="{StaticResource CardBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
|
||||
<Setter Property="Padding" Value="12,9"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="ItemContainerStyle">
|
||||
<Setter.Value>
|
||||
<Style TargetType="ComboBoxItem">
|
||||
<Setter Property="FontFamily" Value="Segoe UI Variable Display, Segoe UI, Arial"/>
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<Setter Property="Padding" Value="12,8"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBoxItem">
|
||||
<Border x:Name="itemBorder" Background="Transparent"
|
||||
Padding="{TemplateBinding Padding}" CornerRadius="4" Margin="2,1">
|
||||
<ContentPresenter/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="itemBorder" Property="Background" Value="#E8E8E8"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="itemBorder" Property="Background" Value="#DCE8F8"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="ComboBox">
|
||||
<Grid>
|
||||
<ToggleButton x:Name="ToggleButton" Focusable="False"
|
||||
IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
ClickMode="Press">
|
||||
<ToggleButton.Template>
|
||||
<ControlTemplate TargetType="ToggleButton">
|
||||
<Border x:Name="toggleBorder"
|
||||
Background="{StaticResource CardBrush}"
|
||||
BorderBrush="{StaticResource BorderBrush}"
|
||||
BorderThickness="1" CornerRadius="6"
|
||||
SnapsToDevicePixels="True">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition/>
|
||||
<ColumnDefinition Width="36"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Grid.Column="1">
|
||||
<TextBlock Text="" FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="10" HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Foreground="{StaticResource TextSecondaryBrush}"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="toggleBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter TargetName="toggleBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter TargetName="toggleBorder" Property="BorderThickness" Value="1,1,1,2"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</ToggleButton.Template>
|
||||
</ToggleButton>
|
||||
<ContentPresenter x:Name="ContentSite" IsHitTestVisible="False"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
Margin="14,9,36,9"
|
||||
VerticalAlignment="Center" HorizontalAlignment="Left"/>
|
||||
<Popup x:Name="Popup" Placement="Bottom"
|
||||
IsOpen="{TemplateBinding IsDropDownOpen}"
|
||||
AllowsTransparency="True" Focusable="False"
|
||||
PopupAnimation="Slide">
|
||||
<Border x:Name="DropDownBorder" Background="{StaticResource CardBrush}"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
CornerRadius="8" Padding="4"
|
||||
MinWidth="{TemplateBinding ActualWidth}"
|
||||
MaxHeight="{TemplateBinding MaxDropDownHeight}"
|
||||
Margin="0,2,0,0"
|
||||
SnapsToDevicePixels="True">
|
||||
<Border.Effect>
|
||||
<DropShadowEffect ShadowDepth="4" BlurRadius="16" Opacity="0.14" Color="Black"/>
|
||||
</Border.Effect>
|
||||
<ScrollViewer SnapsToDevicePixels="True">
|
||||
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained"/>
|
||||
</ScrollViewer>
|
||||
</Border>
|
||||
</Popup>
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- Fluent TextBox -->
|
||||
<!-- Fluent TextBox with rounded corners -->
|
||||
<Style x:Key="FluentTextBox" TargetType="TextBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI Variable Display, Segoe UI, Arial"/>
|
||||
<Setter Property="FontSize" Value="16"/>
|
||||
<Setter Property="Padding" Value="10,8"/>
|
||||
<Setter Property="Background" Value="{StaticResource CardBrush}"/>
|
||||
<Setter Property="BorderBrush" Value="{StaticResource BorderBrush}"/>
|
||||
<Setter Property="BorderThickness" Value="1"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
|
||||
<Setter Property="CaretBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter Property="SelectionBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsFocused" Value="True">
|
||||
<Setter Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="TextBox">
|
||||
<Border x:Name="border" Background="{StaticResource CardBrush}"
|
||||
BorderBrush="{StaticResource BorderBrush}" BorderThickness="1"
|
||||
CornerRadius="6" Padding="10,8" SnapsToDevicePixels="True">
|
||||
<ScrollViewer x:Name="PART_ContentHost" Focusable="False"/>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="border" Property="BorderBrush" Value="#BBBBBB"/>
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
<Trigger Property="IsFocused" Value="True">
|
||||
<Setter TargetName="border" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter TargetName="border" Property="BorderThickness" Value="1,1,1,2"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter TargetName="border" Property="Background" Value="#F0F0F0"/>
|
||||
<Setter Property="Foreground" Value="#999999"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- Card-style RadioButton -->
|
||||
@@ -68,13 +179,57 @@
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- Fluent CheckBox -->
|
||||
<!-- Fluent CheckBox with custom box -->
|
||||
<Style x:Key="FluentCheckBox" TargetType="CheckBox">
|
||||
<Setter Property="FontFamily" Value="Segoe UI Variable Display, Segoe UI, Arial"/>
|
||||
<Setter Property="FontSize" Value="14"/>
|
||||
<Setter Property="Foreground" Value="{StaticResource TextPrimaryBrush}"/>
|
||||
<Setter Property="Cursor" Value="Hand"/>
|
||||
<Setter Property="Padding" Value="8,4"/>
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="CheckBox">
|
||||
<Border x:Name="rootBorder" Background="Transparent" Padding="6,8" CornerRadius="6"
|
||||
SnapsToDevicePixels="True">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<Border x:Name="checkBorder" Width="20" Height="20"
|
||||
CornerRadius="4" BorderThickness="2"
|
||||
BorderBrush="{StaticResource BorderBrush}"
|
||||
Background="{StaticResource CardBrush}"
|
||||
VerticalAlignment="Center" Margin="0,0,10,0">
|
||||
<TextBlock x:Name="checkMark" Text=""
|
||||
FontFamily="Segoe MDL2 Assets" FontSize="12"
|
||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Foreground="White" Visibility="Collapsed"/>
|
||||
</Border>
|
||||
<ContentPresenter VerticalAlignment="Center" RecognizesAccessKey="True"/>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter TargetName="rootBorder" Property="Background" Value="#F5F5F5"/>
|
||||
<Setter TargetName="checkBorder" Property="BorderBrush" Value="#999"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsChecked" Value="True">
|
||||
<Setter TargetName="checkBorder" Property="Background" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter TargetName="checkBorder" Property="BorderBrush" Value="{StaticResource AccentBrush}"/>
|
||||
<Setter TargetName="checkMark" Property="Visibility" Value="Visible"/>
|
||||
</Trigger>
|
||||
<MultiTrigger>
|
||||
<MultiTrigger.Conditions>
|
||||
<Condition Property="IsChecked" Value="True"/>
|
||||
<Condition Property="IsMouseOver" Value="True"/>
|
||||
</MultiTrigger.Conditions>
|
||||
<Setter TargetName="checkBorder" Property="Background" Value="{StaticResource AccentHoverBrush}"/>
|
||||
<Setter TargetName="checkBorder" Property="BorderBrush" Value="{StaticResource AccentHoverBrush}"/>
|
||||
<Setter TargetName="rootBorder" Property="Background" Value="#F5F5F5"/>
|
||||
</MultiTrigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter TargetName="rootBorder" Property="Opacity" Value="0.5"/>
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!-- Step indicator dot (active) -->
|
||||
|
||||
Reference in New Issue
Block a user