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

Clean up Part1 #2330

Merged
merged 22 commits into from
Feb 13, 2016
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
6 changes: 0 additions & 6 deletions .nuget/NuGet.Config

This file was deleted.

Binary file removed .nuget/NuGet.exe
Binary file not shown.
151 changes: 0 additions & 151 deletions .nuget/NuGet.targets

This file was deleted.

Binary file modified .paket/paket.bootstrapper.exe
Binary file not shown.
1 change: 1 addition & 0 deletions MahApps.Metro.Resources/MahApps.Metro.Resources.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,5 @@
<Target Name="AfterBuild">
</Target>
-->
<Import Project="..\.paket\paket.targets" />
</Project>
1 change: 1 addition & 0 deletions MahApps.Metro.XAMLMagic.vssettings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<UserSettings><ApplicationIdentity version="14.0"/><ToolsOptions/><Category name="XAML Magic_XAML Magic Settings" Category="{b8d170a8-8f82-3004-b639-920adbe0b825}" Package="{74fdbbf7-6350-4d00-b942-db64a3b95754}" RegisteredName="XAML Magic_XAML Magic Settings" PackageName="StylerPackage"><PropertyValue name="AttributesTolerance">2</PropertyValue><PropertyValue name="CommentPadding">2</PropertyValue><PropertyValue name="ConfigPath"/><PropertyValue name="EnableAttributeReordering">True</PropertyValue><PropertyValue name="FormatMarkupExtension">False</PropertyValue><PropertyValue name="FormatOnSave">False</PropertyValue><PropertyValue name="KeepFirstAttributeOnSameLine">True</PropertyValue><PropertyValue name="MaxAttributeCharatersPerLine">0</PropertyValue><PropertyValue name="MaxAttributesPerLine">1</PropertyValue><PropertyValue name="NewlineExemptionElements">RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter</PropertyValue><PropertyValue name="NoNewLineMarkupExtensions">x:Bind, Binding</PropertyValue><PropertyValue name="OrderAttributesByName">True</PropertyValue><PropertyValue name="PutEndingBracketOnNewLine">False</PropertyValue><PropertyValue name="RemoveEndingTagOfEmptyElement">True</PropertyValue><PropertyValue name="ReorderCanvasChildren">True</PropertyValue><PropertyValue name="ReorderGridChildren">False</PropertyValue><PropertyValue name="ReorderSetters">TargetNameThenProperty</PropertyValue><PropertyValue name="ReorderVSM">Last</PropertyValue><PropertyValue name="ResetToDefault">False</PropertyValue><PropertyValue name="RootElementLineBreakRule">Default</PropertyValue><PropertyValue name="SeparateByGroups">False</PropertyValue><PropertyValue name="SerializedAttributeOrderingRuleGroups">["x:Class","xmlns, xmlns:x","xmlns:*","x:Key, Key, x:Name, Name, x:Uid, Uid, Title","Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom","Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight","Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex","Style, Background, Foreground, Fill, BorderBrush, BorderThickness, Stroke, StrokeThickness, Opacity","FontFamily, FontSize, LineHeight, FontWeight, FontStyle, FontStretch","*:*, *","PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint, ElementName, RelativeSource, Source, Path, XPath, IsAsync, Mode, Converter, ConverterParameter, ConverterCulture, UpdateSourceTrigger, NotifyOnSourceUpdated, NotifyOnTargetUpdated, NotifyOnValidationError, ValidatesOnDataErrors, ValidatesOnNotifyDataErrors, ValidatesOnExceptions","mc:Ignorable, d:IsDataSource, d:IsHidden, d:LayoutOverrides, d:IsStaticText, d:DesignHeight, d:DesignWidth, d:DataContext, d:DesignSource"]</PropertyValue><PropertyValue name="SpaceBeforeClosingSlash">True</PropertyValue><PropertyValue name="ThicknessAttributes">Margin, Padding, BorderThickness, ThumbnailClipMargin</PropertyValue><PropertyValue name="ThicknessSeparator">Space</PropertyValue></Category></UserSettings>
1 change: 1 addition & 0 deletions MahApps.Metro.XAMLStyler.vssettings
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<UserSettings><ApplicationIdentity version="14.0"/><ToolsOptions/><Category name="Xaml Styler_Xaml Styler Settings" Category="{ea52a64c-be6c-305a-9a99-d4d64e97a6e7}" Package="{a224be3c-88d1-4a57-9804-181dbef68021}" RegisteredName="Xaml Styler_Xaml Styler Settings" PackageName="StylerPackage"><PropertyValue name="AttributeOrderAlignmentLayout">HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex</PropertyValue><PropertyValue name="AttributeOrderAttachedLayout">Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom</PropertyValue><PropertyValue name="AttributeOrderBlendRelated">mc:Ignorable, d:IsDataSource, d:IsHidden, d:LayoutOverrides, d:IsStaticText, d:DesignHeight, d:DesignWidth, d:DataContext, d:DesignSource</PropertyValue><PropertyValue name="AttributeOrderClass">x:Class</PropertyValue><PropertyValue name="AttributeOrderCoreLayout">Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight, Margin, Padding</PropertyValue><PropertyValue name="AttributeOrderKey">Key, x:Key, Uid, x:Uid</PropertyValue><PropertyValue name="AttributeOrderName">Name, x:Name, Title</PropertyValue><PropertyValue name="AttributeOrderOthers">PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint, ElementName, RelativeSource, Source, Path, XPath, IsAsync, Mode, Converter, ConverterParameter, ConverterCulture, UpdateSourceTrigger, NotifyOnSourceUpdated, NotifyOnTargetUpdated, NotifyOnValidationError, ValidatesOnDataErrors, ValidatesOnNotifyDataErrors, ValidatesOnExceptions</PropertyValue><PropertyValue name="AttributeOrderWpfNamespace">xmlns, xmlns:x</PropertyValue><PropertyValue name="AttributesTolerance">2</PropertyValue><PropertyValue name="BeautifyOnSave">False</PropertyValue><PropertyValue name="FormatMarkupExtension">False</PropertyValue><PropertyValue name="KeepBindingsOnSameLine">True</PropertyValue><PropertyValue name="KeepFirstAttributeOnSameLine">True</PropertyValue><PropertyValue name="KeepxBindOnSameLine">True</PropertyValue><PropertyValue name="MaxAttributeCharatersPerLine">0</PropertyValue><PropertyValue name="MaxAttributesPerLine">1</PropertyValue><PropertyValue name="NoNewLineElements">RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter</PropertyValue><PropertyValue name="OrderAttributesByName">True</PropertyValue><PropertyValue name="PutAttributeOrderRuleGroupsOnSeparateLines">False</PropertyValue><PropertyValue name="PutEndingBracketOnNewLine">False</PropertyValue><PropertyValue name="RemoveEndingTagOfEmptyElement">True</PropertyValue><PropertyValue name="ReorderCanvasChildren">True</PropertyValue><PropertyValue name="ReorderGridChildren">False</PropertyValue><PropertyValue name="ReorderSetters">TargetNameThenProperty</PropertyValue><PropertyValue name="RootElementLineBreakRule">Default</PropertyValue><PropertyValue name="SpaceBeforeClosingSlash">True</PropertyValue></Category></UserSettings>
12 changes: 5 additions & 7 deletions MahApps.Metro.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{5FEFAEC4-5A45-480B-903A-9E0B5F5B913D}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro", "MahApps.Metro\MahApps.Metro.csproj", "{5B1710D2-5DC8-4754-91B2-19165DE49B3D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetroDemo", "samples\MetroDemo\MetroDemo.csproj", "{56E8080F-FFEB-47CD-ADB9-92245F92565B}"
Expand All @@ -24,13 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetroDemo.NET45", "samples\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Metro.Demo", "samples\Caliburn.Metro.Demo\Caliburn.Metro.Demo.csproj", "{9F9B7559-E8B6-43C3-BEE8-9A977BACE0FB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4166BE4A-2746-40AA-B38B-70D7C3054C37}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
.nuget\NuGet.exe = .nuget\NuGet.exe
.nuget\NuGet.targets = .nuget\NuGet.targets
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro.Tests", "Mahapps.Metro.Tests\MahApps.Metro.Tests.csproj", "{4B381135-F480-478E-9635-B76A425670B7}"
ProjectSection(ProjectDependencies) = postProject
{5B1710D2-5DC8-4754-91B2-19165DE49B3D} = {5B1710D2-5DC8-4754-91B2-19165DE49B3D}
Expand Down
17 changes: 10 additions & 7 deletions MahApps.Metro/Controls/GlowWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,28 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:metro="clr-namespace:MahApps.Metro.Controls"
x:Name="glowWindow"
Title="GlowWindow"
Width="300"
Height="300"
WindowStyle="None"
Background="Transparent"
ShowActivated="False"
Opacity="0"
ResizeMode="NoResize"
ShowActivated="False"
SnapsToDevicePixels="True"
Opacity="0"
x:Name="glowWindow">
WindowStyle="None">

<Window.Resources>
<!-- use this storyboard for a smoother visibility -->
<!-- use this storyboard for a smoother visibility -->
<Storyboard x:Key="OpacityStoryboard">
<DoubleAnimation BeginTime="00:00:.2" Duration="00:00:.3"
Storyboard.TargetProperty="(UIElement.Opacity)"
<DoubleAnimation BeginTime="00:00:.2"
Duration="00:00:.3"
Storyboard.TargetName="glowWindow"
Storyboard.TargetProperty="(UIElement.Opacity)"
To="1" />
</Storyboard>
</Window.Resources>

<metro:Glow x:Name="glow"
Width="{Binding ElementName=glowWindow, Path=ActualWidth, Mode=OneWay}"
Height="{Binding ElementName=glowWindow, Path=ActualHeight, Mode=OneWay}"
Expand Down
Loading