Build fix

BAndysc · Jul 23, 2024 · 7f1fb3d · 7f1fb3d
1 parent 2b64409
commit 7f1fb3d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml b/Examples/Nodify.Playground/Editor/NodifyEditorView.xaml
@@ -499,7 +499,7 @@
         <nodify:Minimap ItemsSource="{Binding ItemsSource, ElementName=Editor}"
                         ViewportSize="{Binding ViewportSize, ElementName=Editor}"
                         ViewportLocation="{Binding ViewportLocation, ElementName=Editor}"
-                        Visibility="{Binding ShowMinimap, Source={x:Static local:PlaygroundSettings.Instance}, Converter={shared:BooleanToVisibilityConverter}}"
+                        IsVisible="{Binding ShowMinimap, Source={x:Static local:PlaygroundSettings.Instance}, Converter={shared:BooleanToVisibilityConverter}}"
                         IsReadOnly="{Binding DisableMinimapControls, Source={x:Static local:PlaygroundSettings.Instance}}"
                         ResizeToViewport="{Binding ResizeToViewport, Source={x:Static local:PlaygroundSettings.Instance}}"
                         MaxViewportOffset="{Binding MinimapMaxViewportOffset.Size, Source={x:Static local:PlaygroundSettings.Instance}}"
@@ -514,17 +514,17 @@
                     <Grid />
                 </DataTemplate>
             </nodify:Minimap.ItemTemplate>
-            <nodify:Minimap.ItemContainerStyle>
-                <Style TargetType="{x:Type nodify:MinimapItem}"
+            <nodify:Minimap.ItemContainerTheme>
+                <ControlTheme TargetType="{x:Type nodify:MinimapItem}"
                        BasedOn="{StaticResource {x:Type nodify:MinimapItem}}">
                     <Setter Property="Location"
                             Value="{Binding Location}" />
                     <Setter Property="Width"
                             Value="150" />
                     <Setter Property="Height"
                             Value="130" />
-                </Style>
-            </nodify:Minimap.ItemContainerStyle>
+                </ControlTheme>
+            </nodify:Minimap.ItemContainerTheme>
         </nodify:Minimap>
     </Grid>
 

diff --git a/Examples/Nodify.Shapes/Canvas/CanvasView.xaml b/Examples/Nodify.Shapes/Canvas/CanvasView.xaml
@@ -47,8 +47,7 @@
                 </Setter>
             </ControlTheme>
 
-            <ControlTheme TargetType="{x:Type shared:Resizer}" x:Key="{x:Type shared:Resizer}"
-                   BasedOn="{StaticResource {x:Type shared:Resizer}}">
+            <ControlTheme TargetType="{x:Type shared:Resizer}" x:Key="{x:Type shared:Resizer}">
                 <Setter Property="Background"
                         Value="{Binding BorderBrush, RelativeSource={RelativeSource AncestorType=nodify:ItemContainer}}" />
                 <Setter Property="IsEnabled"
@@ -433,8 +432,7 @@
                     </nodify:Minimap.Background>
                     <nodify:Minimap.ItemContainerTheme>
                         <ControlTheme TargetType="{x:Type nodify:MinimapItem}"
-                                      x:DataType="local:ShapeViewModel"
-                                      BasedOn="{StaticResource {x:Type nodify:MinimapItem}}">
+                                      x:DataType="local:ShapeViewModel">
                             <Setter Property="Location"
                                     Value="{Binding Location}" />
                             <Setter Property="Width"

diff --git a/Examples/Nodify.Shared/Controls/ResizablePanel.cs b/Examples/Nodify.Shared/Controls/ResizablePanel.cs
@@ -38,6 +38,7 @@ public ICommand? ResizeCompletedCommand
         static ResizablePanel()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ResizablePanel), new FrameworkPropertyMetadata(typeof(ResizablePanel)));
+            ClipToBoundsProperty.OverrideDefaultValue<ResizablePanel>(false); // to match WPF behavior
         }
 
         public ResizablePanel()
@@ -174,6 +175,7 @@ public ResizeDirections Direction
         static Resizer()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Resizer), new FrameworkPropertyMetadata(typeof(Resizer)));
+            ClipToBoundsProperty.OverrideDefaultValue<Resizer>(false); // to match WPF behavior
         }
     }
 

diff --git a/Nodify/Themes/Styles/Minimap.xaml b/Nodify/Themes/Styles/Minimap.xaml
@@ -95,7 +95,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             Padding="{TemplateBinding Padding}"
                             CornerRadius="3">
-                        <ContentPresenter />
+                        <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
                     </Border>
                 </ControlTemplate>
             </Setter.Value>