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.

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

1.0.6.2 #3

Merged
merged 9 commits into from
Nov 27, 2022
4 changes: 4 additions & 0 deletions FrostyControls/FrostyControls.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Icons.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="FrostyAutoSizedGridView.cs" />
Expand Down
2,848 changes: 2,105 additions & 743 deletions FrostyControls/Themes/Generic.xaml

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions FrostyControls/Themes/Icons.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008">

<PathGeometry x:Key="CheckmarkIcon"
Figures="M 22.566406 4.730469 L 20.773438 3.511719 C 20.277344 3.175781 19.597656 3.304688 19.265625 3.796875 L 10.476562 16.757812 L 6.4375 12.71875 C 6.015625 12.296875 5.328125 12.296875 4.90625 12.71875 L 3.371094 14.253906 C 2.949219 14.675781 2.949219 15.363281 3.371094 15.789062 L 9.582031 22 C 9.929688 22.347656 10.476562 22.613281 10.96875 22.613281 C 11.460938 22.613281 11.957031 22.304688 12.277344 21.839844 L 22.855469 6.234375 C 23.191406 5.742188 23.0625 5.066406 22.566406 4.730469 Z M 22.566406 4.730469 "
FillRule="Nonzero" />
<PathGeometry x:Key="ExclamationIcon"
Figures="M70.83802,17.2l2.46354,91.73333h25.30729l2.55312,-91.73333zM86.04479,126.13333c-9.41986,0 -15.29635,5.46853 -15.29635,14.37812c0,8.82934 5.88222,14.28854 15.29635,14.28854c9.41413,0 15.21797,-5.45921 15.21797,-14.28854c0,-8.90959 -5.7981,-14.37812 -15.21797,-14.37812z"
FillRule="Nonzero" />
<PathGeometry x:Key="RemoveIcon"
Figures="M40.13333,22.93333c-1.46702,0 -2.93565,0.55882 -4.05365,1.67969l-11.46667,11.46667c-2.24173,2.24173 -2.24173,5.87129 0,8.10729l41.81302,41.81302l-41.81302,41.81302c-2.24173,2.24173 -2.24173,5.87129 0,8.10729l11.46667,11.46667c2.24173,2.24173 5.87129,2.24173 8.10729,0l41.81302,-41.81302l41.81302,41.81302c2.236,2.24173 5.87129,2.24173 8.10729,0l11.46667,-11.46667c2.24173,-2.24173 2.24173,-5.87129 0,-8.10729l-41.81302,-41.81302l41.81302,-41.81302c2.24173,-2.236 2.24173,-5.87129 0,-8.10729l-11.46667,-11.46667c-2.24173,-2.24173 -5.87129,-2.24173 -8.10729,0l-41.81302,41.81302l-41.81302,-41.81302c-1.12087,-1.12087 -2.58663,-1.67969 -4.05365,-1.67969z"
FillRule="Nonzero" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion FrostyEditor/BuildDate.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Mon 10/10/2022 19:42:18.40
Mon 10/24/2022 18:29:27.22
1 change: 1 addition & 0 deletions FrostyEditor/FrostyEditor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@
<Resource Include="Credits.txt" />
</ItemGroup>
<ItemGroup>
<Resource Include="Images\Recent.png" />
<Content Include="Resources\Textures\DefaultLightProbe.dds" CopyToOutputDirectory="PreserveNewest" />
<Content Include="Resources\Textures\Grid.DDS" CopyToOutputDirectory="PreserveNewest" />
<None Include="Shaders\character_jersey_shader.hlsl" />
Expand Down
Binary file added FrostyEditor/Images/Recent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion FrostyEditor/SplashWindowLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public SplashWindowLogger(SplashWindow inParent)

BindingOperations.SetBinding(parent.TaskbarItemInfo, TaskbarItemInfo.ProgressValueProperty, new Binding("Progress")
{
Converter = new DelegateBasedValueConverter(),
Converter = new FunctionBasedValueConverter(),
ConverterParameter = new Func<object, object>(delegate (object value)
{
return (double)value / 100.0;
Expand Down
3,005 changes: 1,929 additions & 1,076 deletions FrostyEditor/Windows/MainWindow.xaml

Large diffs are not rendered by default.

Loading