mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-12 11:56:30 +00:00
UI - Fixed a lot of binding errors
UI - Added most missing DisposeWith calls
This commit is contained in:
1 parent
8fd18b9565
commit
372991a69b
28 files changed
+347
-230
No files matched your search
@@ -3,28 +3,22 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:pins="clr-namespace:Artemis.UI.Screens.VisualScripting.Pins"
|
||||
xmlns:converters="clr-namespace:Artemis.UI.Converters"
|
||||
mc:Ignorable="d"
|
||||
d:DesignWidth="200"
|
||||
x:Class="Artemis.UI.Screens.VisualScripting.Pins.InputPinView"
|
||||
x:DataType="pins:PinViewModel">
|
||||
<UserControl.Resources>
|
||||
<converters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
|
||||
</UserControl.Resources>
|
||||
<UserControl.Styles>
|
||||
<StyleInclude Source="/Screens/VisualScripting/VisualScripting.axaml" />
|
||||
<Style Selector="StackPanel#PinContainer Border#VisualPinPoint">
|
||||
<Setter Property="Background">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="{CompiledBinding DarkenedPinColor}"></SolidColorBrush>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="BorderBrush">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="{CompiledBinding PinColor}"></SolidColorBrush>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</UserControl.Styles>
|
||||
<StackPanel Name="PinContainer" Orientation="Horizontal" Spacing="6">
|
||||
<Border Name="PinPoint">
|
||||
<Border Name="VisualPinPoint" />
|
||||
<Border Name="VisualPinPoint"
|
||||
BorderBrush="{CompiledBinding PinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
|
||||
Background="{CompiledBinding DarkenedPinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"/>
|
||||
</Border>
|
||||
<TextBlock Name="PinName" VerticalAlignment="Center" Text="{CompiledBinding Pin.Name}" />
|
||||
</StackPanel>
|
||||
|
||||
@@ -3,29 +3,23 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:pins="clr-namespace:Artemis.UI.Screens.VisualScripting.Pins"
|
||||
xmlns:converters="clr-namespace:Artemis.UI.Converters"
|
||||
mc:Ignorable="d"
|
||||
d:DesignWidth="200"
|
||||
x:Class="Artemis.UI.Screens.VisualScripting.Pins.OutputPinView"
|
||||
x:DataType="pins:PinViewModel">
|
||||
<UserControl.Resources>
|
||||
<converters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
|
||||
</UserControl.Resources>
|
||||
<UserControl.Styles>
|
||||
<StyleInclude Source="/Screens/VisualScripting/VisualScripting.axaml" />
|
||||
<Style Selector="StackPanel#PinContainer Border#VisualPinPoint">
|
||||
<Setter Property="Background">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="{CompiledBinding DarkenedPinColor}" />
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="BorderBrush">
|
||||
<Setter.Value>
|
||||
<SolidColorBrush Color="{CompiledBinding PinColor}" />
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</UserControl.Styles>
|
||||
<StackPanel Name="PinContainer" Orientation="Horizontal" Spacing="6">
|
||||
<TextBlock Name="PinName" VerticalAlignment="Center" Text="{CompiledBinding Pin.Name}" />
|
||||
<Border Name="PinPoint">
|
||||
<Border Name="VisualPinPoint" />
|
||||
<Border Name="VisualPinPoint"
|
||||
BorderBrush="{CompiledBinding PinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"
|
||||
Background="{CompiledBinding DarkenedPinColor, Converter={StaticResource ColorToSolidColorBrushConverter}}"/>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
Reference in new issue
Block a user