Skip to content

Commit 2deb3b5

Browse files
DYN-9078: Node context menu chevron doesn't change color on hover (#17124)
Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Ivo Petrov <ivaylo-matov@users.noreply.github.com>
1 parent 73742c5 commit 2deb3b5

4 files changed

Lines changed: 24 additions & 0 deletions

File tree

src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4114,8 +4114,12 @@
41144114
</Trigger>
41154115
<Trigger Property="IsMouseOver" Value="True">
41164116
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
4117+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
41174118
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericMouseOverBackgroundColorBrush}" />
41184119
</Trigger>
4120+
<Trigger Property="IsSubmenuOpen" Value="True">
4121+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
4122+
</Trigger>
41194123
<Trigger Property="IsMouseOver" Value="False">
41204124
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
41214125
</Trigger>
@@ -4211,8 +4215,12 @@
42114215
</Trigger>
42124216
<Trigger Property="IsMouseOver" Value="True">
42134217
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
4218+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
42144219
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericMouseOverBackgroundColorBrush}" />
42154220
</Trigger>
4221+
<Trigger Property="IsSubmenuOpen" Value="True">
4222+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
4223+
</Trigger>
42164224
<Trigger Property="IsMouseOver" Value="False">
42174225
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource GenericBorderBackgroundColorBrush}" />
42184226
</Trigger>
@@ -4311,8 +4319,12 @@
43114319
</Trigger>
43124320
<Trigger Property="IsMouseOver" Value="True">
43134321
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
4322+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
43144323
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
43154324
</Trigger>
4325+
<Trigger Property="IsSubmenuOpen" Value="True">
4326+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
4327+
</Trigger>
43164328
<Trigger Property="IsMouseOver" Value="False">
43174329
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
43184330
</Trigger>
@@ -5745,8 +5757,12 @@
57455757
</Trigger>
57465758
<Trigger Property="IsMouseOver" Value="True">
57475759
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
5760+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
57485761
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
57495762
</Trigger>
5763+
<Trigger Property="IsSubmenuOpen" Value="True">
5764+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
5765+
</Trigger>
57505766
<Trigger Property="IsMouseOver" Value="False">
57515767
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
57525768
</Trigger>

src/DynamoCoreWpf/Views/Core/AnnotationView.xaml.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2007,6 +2007,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
20072007
Foreground = _blue300Brush,
20082008
VerticalAlignment = VerticalAlignment.Center,
20092009
HorizontalAlignment = HorizontalAlignment.Right,
2010+
RenderTransformOrigin = new Point(0.5, 0.5),
20102011
RenderTransform = new ScaleTransform(1, 1.5)
20112012
};
20122013

@@ -2041,6 +2042,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
20412042
popup.PlacementTarget = border;
20422043
popup.IsOpen = true;
20432044
border.Background = _nodeContextMenuBackgroundHighlight;
2045+
arrow.Foreground = Brushes.White;
20442046
};
20452047

20462048
border.MouseLeave += (s, e) =>
@@ -2050,6 +2052,7 @@ private Grid CreateSubmenuItem(string label, Func<UIElement> submenuContentFacto
20502052
{
20512053
popup.IsOpen = false;
20522054
border.Background = Brushes.Transparent;
2055+
arrow.Foreground = _blue300Brush;
20532056
}
20542057
};
20552058

src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2384,6 +2384,7 @@ private static ContextMenu GetNodeContextMenu()
23842384
Value = true
23852385
};
23862386
isMouseOverTrueTrigger.Setters.Add(new Setter(TextBlock.ForegroundProperty, Brushes.White, "ContentPresenter"));
2387+
isMouseOverTrueTrigger.Setters.Add(new Setter(Control.ForegroundProperty, Brushes.White, "subMenuArrow"));
23872388
isMouseOverTrueTrigger.Setters.Add(new Setter(DockPanel.BackgroundProperty, nodeContextMenuBackgroundHighlight, "dockPanel"));
23882389

23892390
// Trigger for IsMouseOver property (false)

src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,12 @@
507507
</Trigger>
508508
<Trigger Property="IsMouseOver" Value="True">
509509
<Setter TargetName="ContentPresenter" Property="TextBlock.Foreground" Value="White" />
510+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
510511
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackgroundHighlight}" />
511512
</Trigger>
513+
<Trigger Property="IsSubmenuOpen" Value="True">
514+
<Setter TargetName="subMenuArrow" Property="Foreground" Value="White" />
515+
</Trigger>
512516
<Trigger Property="IsMouseOver" Value="False">
513517
<Setter TargetName="dockPanel" Property="Background" Value="{StaticResource NodeContextMenuBackground}" />
514518
</Trigger>

0 commit comments

Comments
 (0)