Skip to content

Initial switch to the Toolkit Adorners package... #42

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

Draft
michael-hawker wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

Initial switch to the Toolkit Adorners package... #42

Show file tree
Hide file tree
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
43 changes: 0 additions & 43 deletions Microsoft.Toolkit.Future/Adorners/AdornerDecorator.cs
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Microsoft.Toolkit.Future/Adorners/AdornerDecorator.xaml
View file
Open in desktop

This file was deleted.

259 changes: 0 additions & 259 deletions Microsoft.Toolkit.Future/Adorners/AdornerLayer.cs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions Microsoft.Toolkit.Future/Microsoft.Toolkit.Future.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<Compile Include="Adorners\AdornerDecorator.cs" />
<Compile Include="Adorners\AdornerLayer.cs" />
<Compile Include="Controls\ManualToggleButton.cs" />
<Compile Include="Converters\CollectionContainsConverter.cs" />
<Compile Include="Data\Grouping.cs" />
Expand Down Expand Up @@ -145,10 +143,6 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<Page Include="Adorners\AdornerDecorator.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Extensions\Pivot\Pivot.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
1 change: 0 additions & 1 deletion Microsoft.Toolkit.Future/Themes/Generic.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Future/Adorners/AdornerDecorator.xaml" />
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Future/Extensions/Pivot/Pivot.xaml" />
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Future/SelectedContentControl/SelectedContentControl.xaml" />
</ResourceDictionary.MergedDictionaries>
Expand Down
16 changes: 16 additions & 0 deletions XamlStudio.Toolkit/Controls/Adorners/AdornerHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Windows.UI.Xaml;

namespace XamlStudio.Toolkit.Controls.Adorners;

public static class AdornerHelpers
{
public static string GetElementInfo(DependencyObject element)
{
if (element == null) return "null";

var name = element.ReadLocalValue(FrameworkElement.NameProperty);

return ((name != DependencyProperty.UnsetValue) ? $"\"{name}\" " : "") +
"<" + element.GetType().Name + ">";
}
}
Loading