Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4114,8 +4114,12 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericMouseOverBackgroundColorBrush}" />
</Trigger>
<Trigger Property="IsSubmenuOpen" Value="True">
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
</Trigger>
Comment on lines 4115 to +4122

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have intentionally kept the existing structure. The comment makes sense, but pulling shared styles seems like a big refactor and IMO is best done in a separate PR.

<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
</Trigger>
Expand Down Expand Up @@ -4211,8 +4215,12 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericMouseOverBackgroundColorBrush}" />
</Trigger>
<Trigger Property="IsSubmenuOpen" Value="True">
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericBorderBackgroundColorBrush}" />
</Trigger>
Expand Down Expand Up @@ -4311,8 +4319,12 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
</Trigger>
<Trigger Property="IsSubmenuOpen" Value="True">
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
</Trigger>
Expand Down Expand Up @@ -5745,8 +5757,12 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
</Trigger>
<Trigger Property="IsSubmenuOpen" Value="True">
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
</Trigger>
Expand Down
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2007,6 +2007,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
Foreground = _blue300Brush,
VerticalAlignment = VerticalAlignment.Center,
HorizontalAlignment = HorizontalAlignment.Right,
RenderTransformOrigin = new Point(0.5, 0.5),
RenderTransform = new ScaleTransform(1, 1.5)
};

Expand Down Expand Up @@ -2041,6 +2042,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
popup.PlacementTarget = border;
popup.IsOpen = true;
border.Background = _nodeContextMenuBackgroundHighlight;
arrow.Foreground = Brushes.White;
};

border.MouseLeave += (s, e) =>
Expand All @@ -2050,6 +2052,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
{
popup.IsOpen = false;
border.Background = Brushes.Transparent;
arrow.Foreground = _blue300Brush;
}
};

Expand Down
1 change: 1 addition & 0 deletions src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2384,6 +2384,7 @@ private static ContextMenu GetNodeContextMenu()
Value = true
};
isMouseOverTrueTrigger.Setters.Add(new Setter(TextBlock.ForegroundProperty, Brushes.White, "ContentPresenter"));
isMouseOverTrueTrigger.Setters.Add(new Setter(Control.ForegroundProperty, Brushes.White, "subMenuArrow"));
Comment thread
jasonstratton marked this conversation as resolved.
isMouseOverTrueTrigger.Setters.Add(new Setter(DockPanel.BackgroundProperty, nodeContextMenuBackgroundHighlight, "dockPanel"));

// Trigger for IsMouseOver property (false)
Expand Down
4 changes: 4 additions & 0 deletions src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -507,8 +507,12 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
</Trigger>
<Trigger Property="IsSubmenuOpen" Value="True">
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
</Trigger>
<Trigger Property="IsMouseOver" Value="False">
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
</Trigger>
Expand Down
Loading