Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Border to PreferenceView #14078

Merged
merged 1 commit into from
Jun 15, 2023
Merged

Border to PreferenceView #14078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@
mc:Ignorable="d"
Height="480"
Width="665"
ResizeMode="NoResize">
ResizeMode="NoResize"
BorderThickness="0"
AllowsTransparency="True"
Background="Transparent">

<!--Using the Styles from the SharedResourcesDictionary located in DynamoCoreWpf/UI/Themes/DynamoModern.xaml-->
<Window.Resources>
Expand Down Expand Up @@ -133,8 +136,13 @@
</Window.Resources>

<!--This is the main row of the Preference Window-->
<Grid x:Name="mainGrid"
Background="{StaticResource PreferencesWindowBackgroundColor}">
<Border x:Name="mainBorder"
BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess you happen to found out this color from other places is white?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I got this one from the NodeView border

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

Line 569 in b02d034

BorderBrush="{StaticResource WorkspaceBackgroundHomeBrush}"
as instructed by @Amoursol. The only thing is the borderthickness, which for the Nodes is 1px, and for the PreferencesView is now set at 2px. I will double-check with @Amoursol to see if there is preference for each maybe.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, will merge it for now

BorderThickness="2"
CornerRadius="4"
Background="{StaticResource PreferencesWindowBackgroundColor}">
<Grid x:Name="mainGrid"
Background="Transparent">
<Grid.Resources>
<sys:Double x:Key="ToggleButtonWidth">40</sys:Double>
<sys:Double x:Key="ToggleButtonHeight">20</sys:Double>
Expand Down Expand Up @@ -1906,4 +1914,5 @@
</Grid>
</Grid>
</Grid>
</Border>
</Window>