stride3d
/
stride
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Editor] Add new Theme & UI fixes/refinements (#1807)

This commit is contained in:
SVNMLR 2023-09-24 14:54:42 +02:00 коммит произвёл GitHub
Родитель 824863612f
Коммит 7020dcdd2a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 279 добавлений и 80 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
sources/editor/Stride.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
Просмотреть файл

@ -360,8 +360,8 @@
<TextBlock Style="{StaticResource NameStyle}"/>
<!-- FIXME uncomment this when we allow to load/unload a single entity -->
<!--<TextBlock Style="{StaticResource LoadingStyle}" />-->
<TextBlock Text="{Binding Components, Converter={pvc:EntityComponentToTransformLinkInfo}, Mode=OneWay, StringFormat=(Link: {0}), FallbackValue={}}" Foreground="#FFB0D3FF" />
<TextBlock Text="{Binding SourcePrefab.Name, Mode=OneWay, StringFormat=(Prefab: {0}), FallbackValue={}}" Foreground="#FFB0FFD3" />
<TextBlock Text="{Binding Components, Converter={pvc:EntityComponentToTransformLinkInfo}, Mode=OneWay, StringFormat=(Link: {0}), FallbackValue={}}" Foreground="{DynamicResource LinkTextColor}" />
<TextBlock Text="{Binding SourcePrefab.Name, Mode=OneWay, StringFormat=(Prefab: {0}), FallbackValue={}}" Foreground="{DynamicResource PrefabTextColor}" />
</StackPanel>
</DockPanel>
</HierarchicalDataTemplate>
@ -520,7 +520,7 @@
ToolTip="{sd:Localize Compute lighting using light probes, Context=ToolTip}"
Command="{Binding Lighting.RequestLightProbesComputeCommand}">
<StackPanel Orientation="Horizontal">
<Image Source="{StaticResource ImageLightProbesCompute}" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<Image Source="{StaticResource ImageLightProbesCompute}" Width="16" Height="16" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<TextBlock Text="Compute" VerticalAlignment="Center" Margin="4"/>
</StackPanel>
</Button>
@ -528,7 +528,7 @@
ToolTip="{sd:Localize Reset light probes, Context=ToolTip}"
Command="{Binding Lighting.RequestLightProbesResetCommand}">
<StackPanel Orientation="Horizontal">
<Image Source="{StaticResource ImageLightProbesReset}" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<Image Source="{StaticResource ImageLightProbesReset}" Width="16" Height="16" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<TextBlock Text="{sd:Localize Reset}" VerticalAlignment="Center" Margin="4"/>
</StackPanel>
</Button>
@ -542,7 +542,7 @@
ToolTip="{sd:Localize Generate a cubemap from the scene view and save as a texture, Context=ToolTip}"
Command="{Binding Lighting.CaptureCubemapCommand}">
<StackPanel Orientation="Horizontal">
<Image Source="{StaticResource ImageGenerateCubeMap}" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<Image Source="{StaticResource ImageGenerateCubeMap}" Width="16" Height="16" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<TextBlock Text="{sd:Localize Capture}" VerticalAlignment="Center" Margin="4"/>
</StackPanel>
</Button>

8
sources/editor/Stride.Assets.Presentation/AssetEditors/ScriptEditor/Resources/ThemeScriptEditor.xaml
Просмотреть файл

@ -159,8 +159,8 @@
Grid.Column="2"
Grid.Row="1">
<Button Margin="3"
Height="24"
Width="24"
Height="16"
Width="16"
Command="editor:SearchCommandsEx.ReplaceNext"
ToolTip="{sd:Localize Replace next (Alt+R), Context=ToolTip}">
<Image Width="16"
@ -169,8 +169,8 @@
Source="{StaticResource ReplaceNext}" />
</Button>
<Button Margin="3"
Height="24"
Width="24"
Height="16"
Width="16"
Command="editor:SearchCommandsEx.ReplaceAll"
ToolTip="{sd:Localize Replace all (Alt+A), Context=ToolTip}">
<Image Width="16"

4
sources/editor/Stride.Core.Assets.Editor/Resources/Icons/plus2_math-24.png
Просмотреть файл

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f8ed6ba29466b56f35261df3e80c4a91d7f6f2a3b7e60aaa8bdcdd6f6f69436
size 292
oid sha256:b985a19862bf6f2b4d7d5cfb9c8fadb887c176a47011fa9c869321f8c31ffa75
size 1742

12
sources/editor/Stride.Core.Assets.Editor/Themes/generic.xaml
Просмотреть файл

@ -18,22 +18,22 @@
<ToolBarTray DockPanel.Dock="Top" Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={sd:VisibleOrCollapsed}}">
<ToolBar ToolBarTray.IsLocked="True" Header="Filters:" Visibility="{Binding CanFilterLog, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={sd:VisibleOrCollapsed}}">
<ToggleButton IsChecked="{Binding ShowDebugMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Debug, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryDebugMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogDebugBrush}" Data="{StaticResource GeometryDebugMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowVerboseMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Verbose, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryVerboseMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogVerboseBrush}" Data="{StaticResource GeometryVerboseMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowInfoMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Info, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryInfoMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogInfoBrush}" Data="{StaticResource GeometryInfoMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowWarningMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Warning, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryWarningMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogWarningBrush}" Data="{StaticResource GeometryWarningMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowErrorMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Error, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryErrorMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogErrorBrush}" Data="{StaticResource GeometryErrorMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowFatalMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Fatal, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryFatalMessage}" />
<Path Width="12" Height="12" Stretch="Uniform" Fill="{StaticResource TextLogFatalBrush}" Data="{StaticResource GeometryFatalMessage}" />
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowStacktrace, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Exception Stack Trace, Context=ToolTip}">
<Label Content="(...)" Width="16" Height="12" FontSize="10" HorizontalContentAlignment="Center" />

10
sources/editor/Stride.Core.Assets.Editor/View/AssetViewUserControl.xaml
Просмотреть файл

@ -50,7 +50,7 @@
<Border BorderBrush="{StaticResource NormalBorderBrush}" BorderThickness="2" CornerRadius="3" Background="{StaticResource NormalBrush}"
HorizontalAlignment="Right" VerticalAlignment="Top" Visibility="{Binding Sources.NeedUpdateFromSource, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}" Margin="0,3,0,0">
<Button Style="{StaticResource ImageButtonStyle}" Command="{Binding Sources.UpdateFromSourceCommand}" Margin="0">
<Image Source="{StaticResource UpdateSelectedAssetsFromSource}" Width="16" Height="16" Margin="-1"/>
<Image Source="{StaticResource UpdateSelectedAssetsFromSource}" Width="12" Height="12" Margin="5"/>
</Button>
</Border>
<Button HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,3" Command="{Binding Dependencies.ToggleIsRootOnSelectedAssetCommand, FallbackValue={x:Null}}">
@ -66,9 +66,9 @@
</Style>
</Button.Style>
<Grid Background="Transparent">
<Image Source="{StaticResource ImageAssetIsRoot}" Width="16" Height="16" Visibility="{Binding Dependencies.IsRoot, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
<Image Source="{StaticResource ImageAssetIsIndirectlyIncluded}" Width="16" Height="16" Visibility="{Binding Dependencies.IsIndirectlyIncluded, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
<Image Source="{StaticResource ImageAssetIsExcluded}" Width="16" Height="16" Visibility="{Binding Dependencies.IsExcluded, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
<Image Source="{StaticResource ImageAssetIsRoot}" Width="12" Height="12" Margin ="5" Visibility="{Binding Dependencies.IsRoot, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
<Image Source="{StaticResource ImageAssetIsIndirectlyIncluded}" Width="12" Height="12" Margin ="5" Visibility="{Binding Dependencies.IsIndirectlyIncluded, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
<Image Source="{StaticResource ImageAssetIsExcluded}" Width="12" Height="12" Margin ="5" Visibility="{Binding Dependencies.IsExcluded, Converter={sd:VisibleOrHidden}, FallbackValue={sd:Hidden}}"/>
</Grid>
</Button>
</Grid>
@ -280,7 +280,7 @@
<Menu Background="Transparent">
<MenuItem StaysOpenOnClick="True" Style="{StaticResource ToolBarIconMenuItemStyle}">
<MenuItem.Icon>
<Image Source="{StaticResource ImageView}" MaxHeight="24" MaxWidth="24"
<Image Source="{StaticResource ImageView}" MaxHeight="16" MaxWidth="16"
ToolTip="{sd:Localize Asset view options, Context=ToolTip}" status:ToolTipHelper.Status="{Binding Session.Editor.Status}" ToolTipService.ShowOnDisabled="True"/>
</MenuItem.Icon>
<MenuItem.Resources>

8
sources/editor/Stride.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
Просмотреть файл

@ -197,7 +197,7 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<ToggleButton Grid.Column="1" Template="{StaticResource TreeExpanderToggleButton}" Width="12" Height="12" HorizontalAlignment="Left"
<ToggleButton Grid.Column="1" Template="{StaticResource TreeExpanderToggleButton}" Width="8" Height="8" HorizontalAlignment="Left"
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}}"
Visibility="{Binding VisibleChildrenCount, Converter={sd:Chained {sd:NumericToBool}, {sd:VisibleOrCollapsed}}}"/>
<TextBlock x:Name="PropertyNameBlock" Grid.Column="2" Text="{Binding DisplayName}" HorizontalAlignment="Stretch" VerticalAlignment="Center"
@ -230,7 +230,7 @@
Visibility="{Binding HasChild_Enabled, Converter={sd:VisibleOrCollapsed}}"/>
</Grid>
</Border>
<GridSplitter Grid.Column="2" ResizeBehavior="PreviousAndNext" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent"/>
<GridSplitter Grid.Column="2" Width="2" ResizeBehavior="PreviousAndNext" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="{DynamicResource TextBoxBackgroundBrush}"/>
<Border x:Name="PART_Editor" Grid.Column="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,0,5,0">
<ContentControl x:Name="PART_ValueContainer" Content="{Binding}" ContentTemplateSelector="{x:Static edvw:PropertyViewHelper.EditorProviders}"
Focusable="False" VerticalAlignment="Center" d:DataContext="{d:DesignInstance qvm:NodeViewModel}"/>
@ -259,7 +259,7 @@
<Grid Visibility="{Binding IsVisible, Converter={sd:VisibleOrCollapsed}}" edvw:PropertyViewHelper.Increment="0"
Margin="{Binding Offset, Converter={sd:NumericToThickness}, ConverterParameter={sd:Thickness 1,0,0,0},
RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}, Mode=OneWay}" x:Name="Grid">
<Border x:Name="PART_Name" MinHeight="26" Margin="6" Background="{StaticResource EmphasisColorBrush}"
<Border x:Name="PART_Name" MinHeight="20" Margin="6" Background="{StaticResource EmphasisColorBrush}"
VerticalAlignment="Stretch" HorizontalAlignment="Stretch" ToolTip="{Binding Documentation}"/>
<DockPanel Margin="10,8" x:Name="HeaderDockPanel">
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center">
@ -271,7 +271,7 @@
</i:Interaction.Behaviors>
</ComboBox>
</StackPanel>
<ToggleButton DockPanel.Dock="Left" Template="{StaticResource PropertyGridHeaderExpanderToggleButton}" Width="16" Height="16"
<ToggleButton DockPanel.Dock="Left" Template="{StaticResource PropertyGridHeaderExpanderToggleButton}" Width="8" Height="8"
IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource AncestorType=sd:PropertyViewItem}}"
Visibility="{Binding VisibleChildrenCount, Converter={sd:Chained {sd:NumericToBool}, {sd:VisibleOrCollapsed}}}"/>
<StackPanel Orientation="Horizontal" Margin="8,0,0,0">

4
sources/editor/Stride.GameStudio/GameStudioWindow.xaml
Просмотреть файл

@ -732,7 +732,7 @@
Visibility="{Binding Session.EditSelectedContentCommand.IsEnabled, Converter={sd:VisibleOrCollapsed}, FallbackValue={sd:Collapsed}}">
<Grid>
<DockPanel Visibility="{Binding Session.ActiveProperties.CanDisplayProperties, Converter={sd:VisibleOrCollapsed}}">
<Image Source="{StaticResource ImageEditAsset}" Margin="4" DockPanel.Dock="Left" Width="24" Height="24" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<Image Source="{StaticResource ImageEditAsset}" Margin="4" DockPanel.Dock="Left" Width="16" Height="16" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
<TextBlock Text="{sd:Localize Open this asset in editor}" Margin="0,4,4,4" VerticalAlignment="Center" />
</DockPanel>
<TextBlock Text="{sd:Localize Show this asset in editor}" Margin="0,4,4,4" VerticalAlignment="Center"
@ -937,7 +937,7 @@
</xcad:LayoutPanel>
</xcad:LayoutRoot>
</xcad:DockingManager>
<StatusBar Grid.Row="2" Background="#007ACC" Visibility="{Binding Session, Converter={sd:Chained {sd:ObjectToBool}, {sd:VisibleOrCollapsed}}}">
<StatusBar Grid.Row="2" Background="{StaticResource StatusBarBackgroundBrush}" Visibility="{Binding Session, Converter={sd:Chained {sd:ObjectToBool}, {sd:VisibleOrCollapsed}}}">
<StatusBar.Resources>
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="Foreground" Value="{StaticResource SelectedTextBrush}"/>

9
sources/editor/Stride.GameStudio/Theme.AvalonDock.xaml
Просмотреть файл

@ -59,7 +59,7 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!--Following border is required to catch mouse events-->
<Border Background="Transparent" Grid.RowSpan="2"/>
<Border Background="{StaticResource MenuBackgroundBrush}" Grid.RowSpan="2"/>
<Grid Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type avalonDockControls:LayoutDocumentPaneControl}}, Path=Model.ShowHeader, Converter={StaticResource BoolToVisibilityConverter}}"
Panel.ZIndex="1" >
<Grid.ColumnDefinitions>
@ -157,10 +157,6 @@
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Rectangle
x:Name="splineBd"
Fill="{TemplateBinding Background}"/>
<Border x:Name="Bd"
Grid.Column="1"
BorderBrush="{TemplateBinding BorderBrush}">
@ -168,7 +164,7 @@
x:Name="BdInternal"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}"
>
CornerRadius="5,5,0,0">
<ContentPresenter
x:Name="Content"
ContentSource="Header"
@ -293,6 +289,7 @@
<Grid SnapsToDevicePixels="true">
<Border x:Name="Bd"
BorderBrush="{TemplateBinding BorderBrush}"
CornerRadius="0,0,5,5"
Background="{TemplateBinding Background}"
Padding="{TemplateBinding Padding}">
<ContentPresenter

4
sources/presentation/Stride.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
Просмотреть файл

@ -62,6 +62,7 @@
<SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
<SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="#007ACC" />
<SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
<SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
@ -107,6 +108,9 @@
<SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
<SolidColorBrush x:Key="LinkTextColor" Color="#FFB0D3FF" />
<SolidColorBrush x:Key="PrefabTextColor" Color="#FFB0FFD3" />
<!--TextLogViewer colors-->
<SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkGray"/>
<SolidColorBrush x:Key="TextLogVerboseBrush" Color="White"/>

170
sources/presentation/Stride.Core.Presentation/Themes/Overrides/DividedTheme.xaml Normal file
Просмотреть файл

@ -0,0 +1,170 @@
<!--
// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
x:Class="Stride.Core.Presentation.Themes.Overrides.DividedTheme"
mc:Ignorable="d">
<!-- Main Colors -->
<Color x:Key="MainColor">#383838</Color>
<Color x:Key="HoverColor">#444444</Color>
<Color x:Key="DefaultColor">#FF9BB1C5</Color>
<SolidColorBrush x:Key="DropdownButtonBackgroundBrush" Color="#FF4D4D4D" />
<SolidColorBrush x:Key="ComboBoxBackground" Color="#FF2A2A2A" />
<SolidColorBrush x:Key="ComboBoxItemHoverBackground" Color="#FF46607C"/>
<Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
<Color x:Key="BottomGradientSelectColor">#FF737373</Color>
<Color x:Key="BlackColor">#FF000000</Color>
<Color x:Key="WhiteColor">#FFFFFFFF</Color>
<Color x:Key="LoadingAssetMessageFromColor">#FF00FF70</Color>
<SolidColorBrush x:Key="LoadingAssetMessageFromBrush" Color="{StaticResource LoadingAssetMessageFromColor}" />
<Color x:Key="LoadingAssetMessageToColor">White</Color>
<SolidColorBrush x:Key="SubTabItemActiveBackground" Color="#FF4F4F54" />
<SolidColorBrush x:Key="SubTabItemActiveForeground" Color="#FFEBEBEB" />
<SolidColorBrush x:Key="BackgroundBrush" Color="#FF383838"/>
<SolidColorBrush x:Key="TextBrush" Color="#FFCBCBCB" />
<SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
<SolidColorBrush x:Key="NormalBrush" Color="#FF444444" />
<SolidColorBrush x:Key="NormalBorderBrush" Color="#FF212121" />
<SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
<SolidColorBrush x:Key="GlyphBrush" Color="#FFE6E6E6" />
<SolidColorBrush x:Key="GlyphHeaderBrush" Color="#FFC4C4C4" />
<SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
<SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
<SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
<SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
<SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
<SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
<SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FF2A2A2A" />
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#FF46607C"/>
<SolidColorBrush x:Key="SelectedTextBrush" Color="#FFEBEBEB"/>
<SolidColorBrush x:Key="EmphasisColorBrush" Color="#FF3E5F96" />
<Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
<SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
<Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
<SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
<SolidColorBrush x:Key="DisabledForegroundBrush" Color="#FF656565" />
<SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FF040405" />
<SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF373737" />
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="#FF373737" />
<SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
<SolidColorBrush x:Key="ComboToggleButtonBackground" Color="#FF515151" />
<SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#FF585858" />
<SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
<SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
<SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
<SolidColorBrush x:Key="DefaultedBorderBrush" Color="#FF212121" />
<SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
<SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF4D4D4D"/>
<SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#FF303030"/>
<SolidColorBrush x:Key="MenuHoverBrush" Color="#FF46607C"/>
<SolidColorBrush x:Key="PropertyGridItemHoverBrush" Color="#FF444444" />
<SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
<SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
<SolidColorBrush x:Key="MenuBackgroundBrush" Color="#FF222222"/>
<SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF191919" />
<SolidColorBrush x:Key="ButtonNormalBackground" Color="#FF585858"/>
<SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF656565"/>
<SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
<SolidColorBrush x:Key="MenuBorderBrush" Color="#FF232323"/>
<SolidColorBrush x:Key="ListBorder" Color="#FF828790" />
<SolidColorBrush x:Key="ToolBarGripper" Color="#FF3A3A3A"/>
<SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
<SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
<SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
<SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF2A2A2A"/>
<SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF2A2A2A"/>
<SolidColorBrush x:Key="MenuBlueGlyphs" Color="#FF7196CE" />
<DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
<SolidColorBrush x:Key="CodeEditorBackgroundBrush" Color="#FF1E1E1E" />
<SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
<SolidColorBrush x:Key="LinkTextColor" Color="#FFB0D3FF" />
<SolidColorBrush x:Key="PrefabTextColor" Color="#FF7198D2" />
<!--TextLogViewer colors-->
<SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkGray"/>
<SolidColorBrush x:Key="TextLogVerboseBrush" Color="White"/>
<SolidColorBrush x:Key="TextLogInfoBrush" Color="LightGreen"/>
<SolidColorBrush x:Key="TextLogWarningBrush" Color="Gold"/>
<SolidColorBrush x:Key="TextLogErrorBrush" Color="Tomato"/>
<SolidColorBrush x:Key="TextLogFatalBrush" Color="Red"/>
<!-- EXPRESSION COMMON VALUES -->
<LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
<GradientStop Color="#59FFFFFF" Offset="0" />
<GradientStop Color="#00FFFFFF" Offset="1" />
<GradientStop Color="#26FFFFFF" Offset="0.467" />
<GradientStop Color="#00FFFFFF" Offset="0.475" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
<GradientStop Color="#4CFFFFFF" Offset="0" />
<GradientStop Color="#26FFFFFF" Offset="1" />
<GradientStop Color="#26FFFFFF" Offset="0.467" />
<GradientStop Color="#00FFFFFF" Offset="0.475" />
<GradientStop Color="#00FFFFFF" Offset="0.856" />
</LinearGradientBrush>
<LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
<GradientStop Color="#444" Offset="0.0" />
<GradientStop Color="#888" Offset="1.0" />
</LinearGradientBrush>
<!-- Environment -->
<SolidColorBrush x:Key="MainWindowActiveCaptionTextBrush" Color="#FF999999"/>
<SolidColorBrush x:Key="MainWindowActiveDefaultBorderBrush" Color="#FF007ACC"/>
<SolidColorBrush x:Key="MainWindowButtonActiveBorderBrush" Color="Transparent"/>
<SolidColorBrush x:Key="MainWindowButtonDownBrush" Color="#FF46607C"/>
<SolidColorBrush x:Key="MainWindowButtonDownBorderBrush" Color="#FF007ACC"/>
<SolidColorBrush x:Key="MainWindowButtonHoverActiveBrush" Color="#72555555"/>
<SolidColorBrush x:Key="MainWindowButtonHoverActiveBorderBrush" Color="#72555555"/>
<SolidColorBrush x:Key="MainWindowButtonHoverInactiveBrush" Color="#72555555"/>
<SolidColorBrush x:Key="MainWindowButtonHoverInactiveBorderBrush" Color="#72555555"/>
<SolidColorBrush x:Key="MainWindowButtonInactiveBorderBrush" Color="Transparent"/>
<SolidColorBrush x:Key="MainWindowInactiveBorderBrush" Color="#FF2E2E36"/>
<SolidColorBrush x:Key="MainWindowInactiveCaptionTextBrush" Color="#999999"/>
<SolidColorBrush x:Key="ScrollBarBrush" Color="#FF2A2A2A"/>
<SolidColorBrush x:Key="ScrollBarArrowBackgroundBrush" Color="#FF282828"/>
<SolidColorBrush x:Key="ScrollBarArrowGlyphBrush" Color="#FF999999"/>
<SolidColorBrush x:Key="ScrollBarThumbBackgroundBrush" Color="#FF686868"/>
<SolidColorBrush x:Key="ScrollBarThumbDisabledBrush" Color="#FF303030"/>
<SolidColorBrush x:Key="ScrollBarThumbMouseOverBackgroundBrush" Color="#FF9E9E9E"/>
<SolidColorBrush x:Key="ScrollBarThumbPressedBackgroundBrush" Color="#FFEFEBEF"/>
</ResourceDictionary>

4
sources/presentation/Stride.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
Просмотреть файл

@ -68,6 +68,7 @@
<SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
<SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="#007ACC" />
<SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
<SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
@ -113,6 +114,9 @@
<SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
<SolidColorBrush x:Key="LinkTextColor" Color="#FFB0D3FF" />
<SolidColorBrush x:Key="PrefabTextColor" Color="#FFB0FFD3" />
<!--TextLogViewer colors-->
<SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkGray"/>
<SolidColorBrush x:Key="TextLogVerboseBrush" Color="White"/>

12
sources/presentation/Stride.Core.Presentation/Themes/Overrides/LightSteelBlueTheme.xaml
Просмотреть файл

@ -30,7 +30,7 @@
<SolidColorBrush x:Key="SubTabItemActiveBackground" Color="#F5F5F5" />
<SolidColorBrush x:Key="SubTabItemActiveForeground" Color="#0066CC" />
<SolidColorBrush x:Key="BackgroundBrush" Color="#E7E7EA"/>
<SolidColorBrush x:Key="BackgroundBrush" Color="#DBDBDB"/>
<SolidColorBrush x:Key="TextBrush" Color="#FF000000" />
<SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
<SolidColorBrush x:Key="NormalBrush" Color="#D1D5DA" />
@ -49,7 +49,7 @@
<SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFF5F5F5" />
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#007ACC"/>
<SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#FF007ACC"/>
<SolidColorBrush x:Key="SelectedTextBrush" Color="White"/>
<Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
@ -61,7 +61,8 @@
<SolidColorBrush x:Key="DisabledForegroundBrush" Color="#888" />
<SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#FFD4D4D4" />
<SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="WindowBackgroundBrush" Color="#92A0A9" />
<SolidColorBrush x:Key="StatusBarBackgroundBrush" Color="#007ACC" />
<SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
<SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
@ -75,7 +76,7 @@
<SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
<SolidColorBrush x:Key="SolidBorderBrush" Color="#CCCEDB" />
<SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FFCCCEDB"/>
<SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#C2D7ED"/>
<SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#98A8bA"/>
<SolidColorBrush x:Key="MenuHoverBrush" Color="#C9DEF5"/>
<SolidColorBrush x:Key="PropertyGridItemHoverBrush" Color="#FFC9DEF5" />
@ -107,6 +108,9 @@
<SolidColorBrush x:Key="GraphicsCompositorNodeTextBrush" Color="#EBEBEB" />
<SolidColorBrush x:Key="LinkTextColor" Color="#FF8ABB2E" />
<SolidColorBrush x:Key="PrefabTextColor" Color="#FF7198D2" />
<!--TextLogViewer colors-->
<SolidColorBrush x:Key="TextLogDebugBrush" Color="DarkSlateGray"/>
<SolidColorBrush x:Key="TextLogVerboseBrush" Color="Black"/>

12
sources/presentation/Stride.Core.Presentation/Themes/ThemeResourceDictionary.cs
Просмотреть файл

@ -9,6 +9,7 @@ namespace Stride.Core.Presentation.Themes
{
private Uri expressionDarkSource;
private Uri darkSteelSource;
private Uri dividedSource;
private Uri expressionLightSource;
// New themes are added here as new properties.
@ -25,6 +26,12 @@ namespace Stride.Core.Presentation.Themes
set => SetValue(ref darkSteelSource, value);
}
public Uri DividedSource
{
get => dividedSource;
set => SetValue(ref dividedSource, value);
}
public Uri LightSteelBlueSource
{
get => expressionLightSource;
@ -45,6 +52,11 @@ namespace Stride.Core.Presentation.Themes
Source = DarkSteelSource;
break;
case ThemeType.Divided:
if (DividedSource != null)
Source = DividedSource;
break;
case ThemeType.LightSteelBlue:
if (LightSteelBlueSource != null)
Source = LightSteelBlueSource;

88
sources/presentation/Stride.Core.Presentation/Themes/ThemeSelector.xaml
Просмотреть файл

@ -37,6 +37,7 @@
<themes:ThemeResourceDictionary Source="Overrides/ExpressionDarkTheme.xaml"
ExpressionDarkSource="Overrides/ExpressionDarkTheme.xaml"
DarkSteelSource="Overrides/DarkSteelTheme.xaml"
DividedSource="Overrides/DividedTheme.xaml"
LightSteelBlueSource="Overrides/LightSteelBlueTheme.xaml" />
</ResourceDictionary.MergedDictionaries>
@ -402,7 +403,7 @@
</Grid.ColumnDefinitions>
<Rectangle Grid.ColumnSpan="2" HorizontalAlignment="Stretch" x:Name="Rectangle" VerticalAlignment="Stretch" Fill="{DynamicResource DropdownButtonBackgroundBrush}" Stroke="{DynamicResource NormalBorderBrush}" />
<Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Fill="{DynamicResource ComboBoxBackground}" Stroke="{DynamicResource NormalBorderBrush}" />
<Border Margin="1" Grid.Column="1" Background="{DynamicResource ComboToggleButtonBackground}" x:Name="border" />
<Border Margin="1" Grid.Column="1" CornerRadius="2" Background="{DynamicResource ComboToggleButtonBackground}" x:Name="border" />
<Path Grid.Column="1" HorizontalAlignment="Center" x:Name="Arrow" VerticalAlignment="Center" Data="M0.5,0.5 L3,6.5 5.5,0.5" Stroke="{DynamicResource TextBrush}" Margin="0" Height="5.5" StrokeThickness="2" Stretch="Fill" Width="9.8" />
</Grid>
<ControlTemplate.Triggers>
@ -428,7 +429,7 @@
<TextBox Visibility="Hidden" Template="{DynamicResource ComboBoxTextBox}" HorizontalAlignment="Left" Margin="3,2,23,2" x:Name="PART_EditableTextBox" Style="{x:Null}" VerticalAlignment="Center" Focusable="True" Background="{TemplateBinding Background}" IsReadOnly="{TemplateBinding IsReadOnly}" BorderBrush="{DynamicResource NormalBorderBrush}" Foreground="{DynamicResource TextBrush}" />
<Popup IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" x:Name="Popup" Focusable="False" AllowsTransparency="True" PopupAnimation="Slide">
<Grid MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}" x:Name="DropDown" SnapsToDevicePixels="True">
<Border x:Name="DropDownBorder" Background="{DynamicResource ControlBackgroundBrush}" />
<Border x:Name="DropDownBorder" Background="{DynamicResource ControlBackgroundBrush}" CornerRadius="3"/>
<ScrollViewer Margin="1" Style="{DynamicResource NuclearScrollViewer}" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" CanContentScroll="True" Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer>
@ -677,7 +678,8 @@
<ControlTemplate TargetType="{x:Type ToolTip}">
<Border x:Name="Border" BorderThickness="1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"
Background="{DynamicResource WindowBackgroundBrush}"
BorderBrush="{DynamicResource SolidBorderBrush}">
BorderBrush="{DynamicResource SolidBorderBrush}"
CornerRadius="3">
<ContentPresenter Margin="4" HorizontalAlignment="Left" VerticalAlignment="Top" />
</Border>
<ControlTemplate.Triggers>
@ -705,7 +707,7 @@
<Setter Property="MaxWidth" Value="16" />
</Style>
</ControlTemplate.Resources>
<Border x:Name="Border" Background="{DynamicResource MenuBackgroundBrush}" BorderBrush="{DynamicResource MenuBorderBrush}" BorderThickness="1">
<Border x:Name="Border" Background="{DynamicResource MenuBackgroundBrush}" BorderBrush="{DynamicResource MenuBorderBrush}" BorderThickness="1" CornerRadius="3">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
</Border>
<ControlTemplate.Triggers>
@ -775,11 +777,11 @@
<ControlTemplate x:Key="SimpleToggleButtonTemplate" TargetType="{x:Type ToggleButton}">
<Grid x:Name="Grid">
<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
<Border x:Name="HoverBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ButtonHoverBackgroundBrush}" />
<Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource PressedBrush}" />
<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}"/>
<Border x:Name="HoverBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" Background="{DynamicResource ButtonHoverBackgroundBrush}" />
<Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" Background="{DynamicResource PressedBrush}" />
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{DynamicResource ButtonNormalBorder}" Margin="0" Opacity="1" BorderThickness="{TemplateBinding BorderThickness}" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{DynamicResource ButtonNormalBorder}" Margin="0" Opacity="1" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsKeyboardFocused" Value="true">
@ -793,10 +795,12 @@
<Setter Property="Background" TargetName="PressedBorder" Value="{DynamicResource PressedBrush}"/>
</Trigger>
<Trigger Property="IsChecked" Value="true">
<Setter Property="Opacity" TargetName="HoverBorder" Value="0.5"/>
<Setter Property="Opacity" TargetName="HoverBorder" Value="1"/>
<Setter Property="Background" TargetName="HoverBorder" Value="{DynamicResource SelectedBackgroundBrush}"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Opacity" TargetName="Grid" Value="0.25" />
<Setter Property="Opacity" TargetName="Grid" Value="1"/>
<Setter Property="Background" TargetName="Grid" Value="{DynamicResource SelectedBackgroundBrush}" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
@ -822,11 +826,11 @@
</Style>
<ControlTemplate x:Key="ButtonTemplate" TargetType="{x:Type Button}">
<Grid x:Name="Grid">
<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
<Border x:Name="HoverBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ButtonHoverBackgroundBrush}" />
<Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource PressedBrush}" />
<Border x:Name="Background" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}"/>
<Border x:Name="HoverBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource ButtonHoverBackgroundBrush}"/>
<Border x:Name="PressedBorder" Opacity="0" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}" Background="{DynamicResource PressedBrush}"/>
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{DynamicResource ButtonNormalBorder}" Margin="0" Opacity="1" BorderThickness="{TemplateBinding BorderThickness}" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="false" BorderBrush="{DynamicResource ButtonNormalBorder}" Margin="0" Opacity="1" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsDefault" Value="True"/>
@ -873,7 +877,7 @@
<Style TargetType="{x:Type CheckBox}">
<Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="FocusVisualStyle" Value="{DynamicResource CheckBoxFocusVisual}" />
<Setter Property="Background" Value="{DynamicResource NormalBrush}" />
<Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
<Setter Property="Template" Value="{DynamicResource CheckBoxTemplate}" />
@ -1058,7 +1062,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type RepeatButton}">
<Grid>
<Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" Opacity="1" />
<Border x:Name="Border" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}" Opacity="1" />
<ContentPresenter HorizontalAlignment="Center" x:Name="ContentPresenter" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" Opacity="1" Height="Auto" />
</Grid>
<ControlTemplate.Triggers>
@ -1624,7 +1628,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type ProgressBar}">
<Grid>
<Border x:Name="PART_Track" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
<Border x:Name="PART_Track" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}"
Background="{TemplateBinding Background}"/>
<Border HorizontalAlignment="Left" x:Name="PART_Indicator" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
<Border.Background>
@ -1718,7 +1722,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ctrl:TextBox">
<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
<Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
<Grid>
<ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Padding="{TemplateBinding Padding}" Visibility="{TemplateBinding IsFocused, Converter={cvt:VisibleOrCollapsed}}"/>
<ContentControl x:Name="Watermark" Content="{TemplateBinding WatermarkContent}" ContentTemplate="{TemplateBinding WatermarkContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="6,2,2,2" Focusable="False"/>
@ -1752,7 +1756,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ctrl:NumericTextBox">
<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
<Border BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
<DockPanel LastChildFill="True">
<UniformGrid x:Name="upDownButtons" HorizontalAlignment="Stretch" DockPanel.Dock="Right" Rows="2" Focusable="False" Visibility="Collapsed" MaxWidth="16">
<RepeatButton x:Name="PART_IncreaseButton" Command="{x:Static ctrl:NumericTextBox.SmallIncreaseCommand}">
@ -1944,15 +1948,15 @@
</Storyboard>
</ControlTemplate.Resources>
<Grid>
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="3" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}">
<Grid>
<Border BorderThickness="1">
<ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource NuclearScrollViewer}" />
</Border>
</Grid>
</Border>
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{DynamicResource HoverTextBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" >
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{DynamicResource HoverTextBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" >
<Border.BorderBrush>
<SolidColorBrush Color="{DynamicResource TextBoxFocusBrush}"/>
</Border.BorderBrush>
@ -2017,15 +2021,15 @@
</Storyboard>
</ControlTemplate.Resources>
<Grid>
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" Background="{TemplateBinding Background}">
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" Background="{TemplateBinding Background}">
<Grid>
<Border BorderThickness="1">
<ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource NuclearScrollViewer}" />
</Border>
</Grid>
</Border>
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" />
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" />
</Grid>
<ControlTemplate.Triggers>
@ -2095,15 +2099,15 @@
</Storyboard>
</ControlTemplate.Resources>
<Grid>
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" Background="{TemplateBinding Background}">
<Border x:Name="Border" Opacity="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" Background="{TemplateBinding Background}">
<Grid>
<Border BorderThickness="1">
<ScrollViewer Margin="0" x:Name="PART_ContentHost" Style="{DynamicResource NuclearScrollViewer}" />
</Border>
</Grid>
</Border>
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2,2,2,2" />
<Border x:Name="HoverBorder" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource GlyphBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="3" />
<Border x:Name="FocusVisualElement" IsHitTestVisible="False" Opacity="0" BorderBrush="{StaticResource HoverShineBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="23" />
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsFocused" Value="True">
@ -2360,13 +2364,13 @@
</Trigger>
<Trigger Property="Role" Value="SubmenuHeader">
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Width" Value="24" TargetName="IconColumn" />
<Setter Property="Width" Value="16" TargetName="IconColumn" />
<Setter Property="Grid.IsSharedSizeScope" Value="true" />
<Setter Property="MinWidth" Value="70" TargetName="IGTTextBlock" />
</Trigger>
<Trigger Property="Role" Value="SubmenuItem">
<Setter Property="DockPanel.Dock" Value="Top" />
<Setter Property="Width" Value="24" TargetName="IconColumn" />
<Setter Property="Width" Value="16" TargetName="IconColumn" />
<Setter Property="Visibility" Value="Hidden" TargetName="ArrowPanel" />
<Setter Property="Grid.IsSharedSizeScope" Value="true" />
<Setter Property="MinWidth" Value="70" TargetName="IGTTextBlock" />
@ -2858,9 +2862,9 @@
<ControlTemplate x:Key="PropertyGridHeaderExpanderToggleButton" TargetType="{x:Type ToggleButton}">
<Grid Background="Transparent">
<Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphHeaderBrush}"
Data="M 0 0 L 6 6 L 0 12 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
Data="M 0 6 V 0 l 5 3 z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
<Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphHeaderBrush}"
Data="M 0 0 L 6 6 L 12 0 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
Data="M 0 0 H 6 L 3 6 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
@ -2873,9 +2877,9 @@
<ControlTemplate x:Key="TreeExpanderToggleButton" TargetType="{x:Type ToggleButton}">
<Grid Background="Transparent">
<Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}"
Data="M 0 0 L 6 6 L 0 12 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
Data="M 0 6 V 0 l 5 3 z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
<Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}"
Data="M 0 0 L 6 6 L 12 0 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
Data="M 0 0 H 6 L 3 6 Z" RenderTransformOrigin="0.5,0.5" Stretch="Uniform" StrokeThickness="0"/>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
@ -4587,22 +4591,22 @@
</ToolBar>
<ToolBar ToolBarTray.IsLocked="True" Header="Filters:" Visibility="{Binding CanFilterLog, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={cvt:VisibleOrCollapsed}}">
<ToggleButton IsChecked="{Binding ShowDebugMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Debug, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryDebugMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogDebugBrush}" Data="{StaticResource GeometryDebugMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowVerboseMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Verbose, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryVerboseMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogVerboseBrush}" Data="{StaticResource GeometryVerboseMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowInfoMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Info, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryInfoMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogInfoBrush}" Data="{StaticResource GeometryInfoMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowWarningMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Warning, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryWarningMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogWarningBrush}" Data="{StaticResource GeometryWarningMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowErrorMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Error, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryErrorMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogErrorBrush}" Data="{StaticResource GeometryErrorMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowFatalMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Fatal, Context=ToolTip}">
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}" Data="{StaticResource GeometryFatalMessage}"/>
<Path Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextLogFatalBrush}" Data="{StaticResource GeometryFatalMessage}"/>
</ToggleButton>
<ToggleButton IsChecked="{Binding ShowStacktrace, RelativeSource={RelativeSource Mode=TemplatedParent}}" ToolTip="{sd:Localize Toggle Exception Stack Trace, Context=ToolTip}">
<Label Content="(...)" Width="16" Height="12" FontSize="10" HorizontalContentAlignment="Center" />
@ -4735,8 +4739,8 @@
<ResourceDictionary />
</Style.Resources>
<Setter Property="Focusable" Value="False" />
<Setter Property="Width" Value="12" />
<Setter Property="Height" Value="12" />
<Setter Property="Width" Value="8" />
<Setter Property="Height" Value="8" />
<Setter Property="Margin" Value="0,0,4,0" />
<Setter Property="Template" Value="{StaticResource TreeExpanderToggleButton}"/>
</Style>

4
sources/presentation/Stride.Core.Presentation/Themes/ThemeType.cs
Просмотреть файл

@ -10,6 +10,8 @@ namespace Stride.Core.Presentation.Themes
ExpressionDark,
[Display("Dark Steel")]
DarkSteel,
[Display("Divided")]
Divided,
// Light themes
[Display("Light Steel Blue (Experimental)")]
@ -24,9 +26,11 @@ namespace Stride.Core.Presentation.Themes
{
case ThemeType.ExpressionDark:
case ThemeType.DarkSteel:
case ThemeType.Divided:
default:
return IconThemeSelector.ThemeBase.Dark;
case ThemeType.LightSteelBlue:
return IconThemeSelector.ThemeBase.Light;
}