DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-02 10:43:31 +00:00
Code Issues Releases Wiki Activity

Nodes editor - Use theme color for selectio nrect

Browse Source
This commit is contained in:
Robert 2021-09-04 20:30:26 +02:00
parent e356d59daa
commit 06870c1b67
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
View File

@ -35,8 +35,17 @@
<DocumentationFile>bin\Artemis.VisualScripting.xml</DocumentationFile> <DocumentationFile>bin\Artemis.VisualScripting.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Page Include="Properties\DesignTimeResources.xaml" Condition="'$(DesignTime)'=='true' OR ('$(SolutionPath)'!='' AND Exists('$(SolutionPath)') AND '$(BuildingInsideVisualStudio)'!='true' AND '$(BuildingInsideExpressionBlend)'!='true')">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<ContainsDesignTimeResources>true</ContainsDesignTimeResources>
</Page>
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.1.0" />
<PackageReference Include="Ninject" Version="3.3.4" /> <PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="NoStringEvaluating" Version="2.2.1" /> <PackageReference Include="NoStringEvaluating" Version="2.2.1" />
<PackageReference Include="SkiaSharp" Version="2.80.3" /> <PackageReference Include="SkiaSharp" Version="2.80.3" />

15
src/Artemis.VisualScripting/Editor/Styles/VisualScriptPresenter.xaml
View File

@ -2,6 +2,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:Artemis.VisualScripting.Editor.Controls"> xmlns:controls="clr-namespace:Artemis.VisualScripting.Editor.Controls">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
</ResourceDictionary.MergedDictionaries>
<ControlTemplate x:Key="TemplateVisualScriptPresenter" <ControlTemplate x:Key="TemplateVisualScriptPresenter"
TargetType="{x:Type controls:VisualScriptPresenter}"> TargetType="{x:Type controls:VisualScriptPresenter}">
<Border BorderBrush="{TemplateBinding BorderBrush}" <Border BorderBrush="{TemplateBinding BorderBrush}"
@ -29,11 +35,14 @@
Background="{TemplateBinding Background}"> Background="{TemplateBinding Background}">
<Border x:Name="PART_SelectionBorder" <Border x:Name="PART_SelectionBorder"
Background="#3300FF00"
BorderThickness="1" BorderThickness="1"
BorderBrush="#FF00CC00" BorderBrush="{StaticResource PrimaryHueLightBrush}"
CornerRadius="1" CornerRadius="1"
Visibility="Hidden" /> Visibility="Hidden">
<Border.Background>
<SolidColorBrush Color="{DynamicResource Primary400}" Opacity="0.25" />
</Border.Background>
</Border>
<ItemsControl x:Name="PART_NodeList" <ItemsControl x:Name="PART_NodeList"
Panel.ZIndex="0"> Panel.ZIndex="0">

8
src/Artemis.VisualScripting/Properties/DesignTimeResources.xaml Normal file
View File

@ -0,0 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Teal.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Teal.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

17
src/Artemis.VisualScripting/packages.lock.json
View File

@ -8,6 +8,15 @@
"resolved": "2021.1.0", "resolved": "2021.1.0",
"contentHash": "n9JSw5Z+F+6gp9vSv4aLH6p/bx3GAYA6FZVq1wJq/TJySv/kPgFKLGFeS7A8Xa5X4/GWorh5gd43yjamUgnBNA==" "contentHash": "n9JSw5Z+F+6gp9vSv4aLH6p/bx3GAYA6FZVq1wJq/TJySv/kPgFKLGFeS7A8Xa5X4/GWorh5gd43yjamUgnBNA=="
}, },
"MaterialDesignThemes": {
"type": "Direct",
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "WqrO9AbtdE4pLPtDk/C5BZRnkgWFwVGyUHWj7tRJrgnKl089DEobVXBCLeqp2mkgBeFHj4Xe3AfWyhmlnO6AZA==",
"dependencies": {
"MaterialDesignColors": "2.0.1"
}
},
"Ninject": { "Ninject": {
"type": "Direct", "type": "Direct",
"requested": "[3.3.4, )", "requested": "[3.3.4, )",
@ -99,14 +108,6 @@
"MaterialDesignThemes": "3.2.0" "MaterialDesignThemes": "3.2.0"
} }
}, },
"MaterialDesignThemes": {
"type": "Transitive",
"resolved": "4.1.0",
"contentHash": "WqrO9AbtdE4pLPtDk/C5BZRnkgWFwVGyUHWj7tRJrgnKl089DEobVXBCLeqp2mkgBeFHj4Xe3AfWyhmlnO6AZA==",
"dependencies": {
"MaterialDesignColors": "2.0.1"
}
},
"McMaster.NETCore.Plugins": { "McMaster.NETCore.Plugins": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.4.0", "resolved": "1.4.0",