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

Visual Restyle Update #13133

Merged
merged 18 commits into from
Aug 1, 2022
Merged

Visual Restyle Update #13133

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cb8f271
High-density Applied
dnenov Jul 21, 2022
1e802ce
TitleBarButton Icons Added
dnenov Jul 21, 2022
3f0cad5
Normalize Renamed to Restore, Icons Changed
dnenov Jul 21, 2022
7f15565
Created Dark Theme for TitleBarButtons
dnenov Jul 21, 2022
83faa18
Light Theme Style Derive From BaseButtonStyle
dnenov Jul 22, 2022
0a52153
ZoomDirectEditThreshold Global Variable
dnenov Jul 22, 2022
c016606
Edit Name TextBox Hover/Focus States Fix
dnenov Jul 23, 2022
09db1ad
Minimum Height Constraint Terms of Use Dialog
dnenov Jul 25, 2022
46c8ae8
Minimum Height ScollBar Handle
dnenov Jul 25, 2022
895c10b
Node Edit Text Selection Background
dnenov Jul 25, 2022
b298cd7
Resizable Crash Dialog
dnenov Jul 25, 2022
d05dda7
DynamoMessageBox Yes/No Swapp
dnenov Jul 25, 2022
38592fb
Dynamo Message Box Cancel Dock Left
dnenov Jul 25, 2022
0f3b4b4
Update About Window
dnenov Jul 26, 2022
64adf38
Mark Graph HasUnsavedChanges after Inline Rename (Node)
dnenov Jul 30, 2022
b92917b
Mark Graph HasUnsavedChanges after Rename (Note)
dnenov Jul 30, 2022
fbbfc78
Text Selection Color Change
dnenov Aug 1, 2022
c8e12e4
Remove Old TitleBar Icons
dnenov Aug 1, 2022
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
5 changes: 5 additions & 0 deletions src/DynamoCore/Configuration/Configurations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ public class Configurations
/// </summary>
public static readonly double ZoomThreshold = 0.4;

/// <summary>
/// Global zoom threshold for renaming Nodes and Notes
/// </summary>
public static readonly double ZoomDirectEditThreshold = 0.5;

#endregion

#region Tab Bar Configurations
Expand Down
32 changes: 32 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@
<None Remove="UI\Images\NodeStates\frozen-64px.png" />
<None Remove="UI\Images\NodeStates\hidden-64px.png" />
<None Remove="UI\Images\NodeStates\info-64px.png" />
<None Remove="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\close-darktheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\close-lighttheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\close-lighttheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\max-darktheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\max-darktheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\max-lighttheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\max-lighttheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\min-darktheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\min-darktheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\min-lighttheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\min-lighttheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\restore-darktheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\restore-darktheme-hover-16px.png" />
<None Remove="UI\Images\TitleBarButtons\restore-lighttheme-default-16px.png" />
<None Remove="UI\Images\TitleBarButtons\restore-lighttheme-hover-16px.png" />
<None Remove="UI\Images\warning_16px.png" />
<None Remove="Views\FileTrust\FileTrustWarning.xaml" />
<None Remove="Views\GuidedTour\HtmlPages\nodePackage.html" />
Expand Down Expand Up @@ -811,6 +827,22 @@
<Resource Include="UI\Images\NodeStates\frozen-64px.png" />
<Resource Include="UI\Images\NodeStates\hidden-64px.png" />
<Resource Include="UI\Images\NodeStates\info-64px.png" />
<Resource Include="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
reddyashish marked this conversation as resolved.
Show resolved Hide resolved
<Resource Include="UI\Images\TitleBarButtons\close-lighttheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\close-lighttheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\max-darktheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\max-darktheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\max-lighttheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\max-lighttheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\min-darktheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\close-darktheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\min-darktheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\min-lighttheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\min-lighttheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\restore-darktheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\restore-darktheme-hover-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\restore-lighttheme-default-16px.png" />
<Resource Include="UI\Images\TitleBarButtons\restore-lighttheme-hover-16px.png" />
<Resource Include="UI\Images\warning_16px.png" />
</ItemGroup>
<ItemGroup>
Expand Down
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-darktheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-darktheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-lighttheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/close-lighttheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/max-darktheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/max-darktheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/max-lighttheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/max-lighttheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/min-darktheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/min-darktheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/min-lighttheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/min-lighttheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/restore-darktheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/restore-darktheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/restore-lighttheme-default-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/DynamoCoreWpf/UI/Images/TitleBarButtons/restore-lighttheme-hover-16px.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 31 additions & 34 deletions src/DynamoCoreWpf/UI/Prompts/CrashPrompt.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:ui="clr-namespace:Dynamo.UI"
xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
Width="660"
SizeToContent="Height"
Height="270"
ResizeMode="NoResize"
WindowStartupLocation="CenterOwner"
Style="{DynamicResource DynamoWindowStyle}"
Expand Down Expand Up @@ -71,40 +71,39 @@

<Rectangle Style="{StaticResource DividerRectangleStyle}" Grid.Row="0" />

<StackPanel Grid.Row="1">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Image Name="imgIcon"
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Image Name="imgIcon"
Width="98" Height="85"
Margin="30,20,30,20"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Source="/DynamoCoreWpf;component/UI/Images/task_dialog_crash.png"></Image>
<StackPanel Grid.Row="0" Grid.Column="1"

<StackPanel Grid.Row="0" Grid.Column="1"
Margin="0, 30, 30, 30">
<TextBlock Name="txtOverridingText"
<TextBlock Name="txtOverridingText"
FontSize="13"
Foreground="{StaticResource DarkThemeInputBoxBackgroundBrush}"
HorizontalAlignment="Stretch"
TextWrapping="Wrap"/>
</StackPanel>
</StackPanel>

<StackPanel Grid.Row="1"
<StackPanel Grid.Row="1"
Grid.ColumnSpan="2"
Orientation="Horizontal"
HorizontalAlignment="Left"
Margin="10,0,10,10">

<Button Name="btnDetails"
<Button Name="btnDetails"
Content="{x:Static p:Resources.CrashPromptDialogDetailButton}"
Margin="-1 0 0 0"
Background="White"
Expand All @@ -114,7 +113,7 @@
Visibility="Collapsed"
Click="Details_Click"/>

<Button Name="btnCopy"
<Button Name="btnCopy"
Content="{x:Static p:Resources.CrashPromptDialogCopyButton}"
Margin="-1 0 0 0"
Background="White"
Expand All @@ -124,14 +123,15 @@
Visibility="Collapsed"
Click="Copy_Click" />

</StackPanel>
<StackPanel Grid.Row="1" Grid.ColumnSpan="2"
</StackPanel>

<StackPanel Grid.Row="1" Grid.ColumnSpan="2"
Orientation="Horizontal"
HorizontalAlignment="Right"
VerticalAlignment="Bottom"
Margin="10,0,10,10">
<Button Name="btnOpenFolder"

<Button Name="btnOpenFolder"
Content="{x:Static p:Resources.CrashPromptDialogOpenFolderButton}"
Background="White"
BorderBrush="#BFBFBF"
Expand All @@ -140,42 +140,39 @@
Visibility="Collapsed"
Click="OpenFolder_Click"/>

<Button Content="{x:Static p:Resources.CrashPromptDialogSubmitBugButton}"
<Button Content="{x:Static p:Resources.CrashPromptDialogSubmitBugButton}"
Background="White"
BorderBrush="#BFBFBF"
Foreground="#3C3C3C"
Style="{StaticResource CtaButtonStyle}"
Margin="10,0,0,0"
Click="PostOnGithub_Click" />

<Button Content="{x:Static p:Resources.ContinueButton}"
<Button Content="{x:Static p:Resources.ContinueButton}"
BorderBrush="#0696D7"
Foreground="White"
Background="#0696D7"
Style="{StaticResource CtaButtonStyle}"
Margin="10,0,0,0"
Click="Continue_Click"
IsDefault="True" />

</StackPanel>

<TextBox x:FieldModifier="public"
</StackPanel>

<TextBox x:FieldModifier="public"
Style="{DynamicResource ResourceKey=SLightTextBox}"
Foreground="{StaticResource DarkThemeInputBoxBackgroundBrush}"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Name="CrashDetailsContent"
Margin="12,0,12,12"
BorderThickness="0"
Height="200"
IsReadOnly="True"
HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Auto"
Visibility="Collapsed"
Grid.Row="3" Grid.ColumnSpan="2"/>
</Grid>
</StackPanel>

</Grid>
</Grid>
</Border>
</Grid>
Expand Down
2 changes: 2 additions & 0 deletions src/DynamoCoreWpf/UI/Prompts/CrashPrompt.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ private void PostOnGithub_Click(object sender, RoutedEventArgs e)

private void Details_Click(object sender, RoutedEventArgs e)
{
this.Height = this.ActualHeight + 250;
this.ResizeMode = ResizeMode.CanResizeWithGrip;
this.btnDetails.Visibility = Visibility.Collapsed;
this.CrashDetailsContent.Visibility = Visibility.Visible;
this.btnCopy.Visibility = Visibility.Visible;
Expand Down
28 changes: 14 additions & 14 deletions src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,20 +119,8 @@
<!-- Buttons -->
<DockPanel Name="ButtonsDockPanel"
Grid.Row="2"
Margin="0,0,20,20"
Margin="16,0,20,20"
LastChildFill="False">

<Button Name="NoButton"
MinWidth="90"
Margin="0"
Click="NoButton_OnClick"
Content="{x:Static p:Resources.GenericTaskDialogOptionNo}"
DockPanel.Dock="Right"
Background="White"
BorderBrush="#BFBFBF"
Foreground="Black"
Style="{StaticResource CtaButtonStyle}"
Visibility="Collapsed" />

<Button Name="YesButton"
MinWidth="90"
Expand All @@ -158,14 +146,26 @@
Style="{StaticResource CtaButtonStyle}"
Visibility="Collapsed" />

<Button Name="NoButton"
MinWidth="90"
Margin="0"
Click="NoButton_OnClick"
Content="{x:Static p:Resources.GenericTaskDialogOptionNo}"
DockPanel.Dock="Right"
Background="White"
BorderBrush="#BFBFBF"
Foreground="Black"
Style="{StaticResource CtaButtonStyle}"
Visibility="Collapsed" />

<Button Name="CancelButton"
MinWidth="90"
Margin="0"
Background="White"
BorderBrush="#BFBFBF"
Click="CancelButton_OnClick"
Content="{x:Static p:Resources.GenericTaskDialogOptionCancel}"
DockPanel.Dock="Right"
DockPanel.Dock="Left"
Foreground="Black"
Style="{StaticResource CtaButtonStyle}"
Visibility="Collapsed" />
Expand Down
8 changes: 4 additions & 4 deletions src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,24 @@
Click="CloseButton_OnClick"
DockPanel.Dock="Right"
Margin="25 0 0 0"
Style="{StaticResource CloseButtonStyle}" />
Style="{StaticResource CloseButtonDarkStyle}" />

<Button Name="MaximizeButton"
Click="MaximizeButton_OnClick"
DockPanel.Dock="Right"
Style="{StaticResource MaximizeButtonStyle}" />
Style="{StaticResource MaximizeButtonDarkStyle}" />

<Button Name="NormalizeButton"
Click="MaximizeButton_OnClick"
DockPanel.Dock="Right"
Visibility="Collapsed"
Style="{StaticResource NormalizeButtonStyle}" />
Style="{StaticResource RestoreButtonDarkStyle}" />

<Button Name="MinimizeButton"
Margin="0 0 25 0"
Click="MinimizeButton_OnClick"
DockPanel.Dock="Right"
Style="{StaticResource MinimizeButtonStyle}" />
Style="{StaticResource MinimizeButtonDarkStyle}" />

<TextBlock Name="TitleTextBlock"
VerticalAlignment="Center"
Expand Down
33 changes: 18 additions & 15 deletions src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
xmlns:views="clr-namespace:Dynamo.UI.Views"
WindowStyle="None"
Width="544"
Height="590"
Width="530"
Height="605"
ResizeMode="NoResize"
ShowInTaskbar="False"
AllowsTransparency="True"
Expand Down Expand Up @@ -92,15 +92,15 @@
<Grid Background="Transparent" MouseDown="UIElement_OnMouseDown">
<Border Name="MainBorder" Style="{StaticResource NoStyleWindowBorderStyle}">

<Grid Margin="25 0">
<Grid Margin="15 0">

<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="160"></RowDefinition>
<RowDefinition Height="160"></RowDefinition>
<RowDefinition Height="220"></RowDefinition>
<RowDefinition Height="145"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition Height="auto"></RowDefinition>
<RowDefinition Height="60"></RowDefinition>
<RowDefinition Height="50"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"></ColumnDefinition>
Expand Down Expand Up @@ -139,7 +139,7 @@
Click="MaximizeButton_OnClick"
DockPanel.Dock="Right"
Visibility="Collapsed"
Style="{StaticResource NormalizeButtonStyle}" />
Style="{StaticResource RestoreButtonStyle}" />

<Button Name="MinimizeButton"
Margin="0 0 25 0"
Expand All @@ -156,20 +156,22 @@
TextWrapping="Wrap" />
</DockPanel>

<Rectangle Style="{StaticResource DividerRectangleStyle}" Grid.Row="0" Grid.ColumnSpan="2" Margin="-25 0"/>
<Rectangle Style="{StaticResource DividerRectangleStyle}" Grid.Row="0" Grid.ColumnSpan="2" Margin="-15 0"/>

<Border Background="#E6E6E6" Grid.Row="1"
<Border Background="#E6E6E6"
Grid.Row="1"
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="0 20 3 20"
Padding="0 7">
Margin="0 15 3 15"
Padding="0">
<ScrollViewer
Margin="0 0 -30 0"
Margin="0 0 -18 0"
HorizontalScrollBarVisibility="Disabled" >
<views:RichTextFile x:Name="GoogleAnalyticsConsent"
IsReadOnly="True"
IsEnabled="True"
IsDocumentEnabled="True"
Margin="0 5"
Padding="5 5 15 10"
Background="Transparent"
OpenLinksInBrowser="True"
Expand All @@ -182,16 +184,17 @@
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="0 0 3 0"
Padding="0 7">
Padding="0">
<ScrollViewer
Padding="0"
HorizontalScrollBarVisibility="Disabled"
Margin="0 0 -30 0">
Margin="0 0 -18 0">
<views:RichTextFile x:Name="ADPAnalyticsConsent"
Padding="5 5 15 10"
IsReadOnly="True"
IsEnabled="True"
IsDocumentEnabled="True"
Margin="0 5"
Foreground="{StaticResource DarkThemeInputBoxBackgroundBrush}"
Background="Transparent"
OpenLinksInBrowser="True"
Expand All @@ -204,7 +207,7 @@
Grid.Column="0"
Grid.ColumnSpan="2">

<Rectangle Style="{StaticResource DividerRectangleStyle}" Margin="-25 25 -25 0"/>
<Rectangle Style="{StaticResource DividerRectangleStyle}" Margin="-15 15 -15 0"/>

<CheckBox x:Name="AcceptGoogleAnalyticsCheck"
Click="ToggleIsGoogleAnalyticsChecked"
Expand Down
Loading