Skip to content

Commit bf276dc

Browse files
ghost1372ghost1372
committed
[VSIX] Remove TitleBar Fix
1 parent e384557 commit bf276dc

8 files changed

Lines changed: 21 additions & 45 deletions

File tree

‎VSIX/DevWinUI_Template/DevWinUI_Template/DevWinUI_Template.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<Reference Include="WindowsBase" />
135135
</ItemGroup>
136136
<ItemGroup>
137-
<PackageReference Include="NuGet.Protocol" Version="7.0.1" />
137+
<PackageReference Include="NuGet.Protocol" Version="7.3.0" />
138138
<PackageReference Include="Microsoft.VisualStudio.SDK" ExcludeAssets="runtime">
139139
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
140140
<Version>17.4.33103.184</Version>
@@ -151,7 +151,7 @@
151151
<Version>17.10.2185</Version>
152152
</PackageReference>
153153
<PackageReference Include="WPF-UI">
154-
<Version>4.1.0</Version>
154+
<Version>4.2.0</Version>
155155
</PackageReference>
156156
</ItemGroup>
157157
<ItemGroup>

‎VSIX/DevWinUI_Template/DevWinUI_Template/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="13.1.0" Language="en-US" Publisher="Mahdi Hosseini" />
4+
<Identity Id="DevWinUI_Template.18eb89b1-bd1f-4e22-9196-6ea05b8ca61d" Version="13.2.0" Language="en-US" Publisher="Mahdi Hosseini" />
55
<DisplayName>DevWinUI Templates for WinUI</DisplayName>
66
<Description xml:space="preserve">DevWinUI Project Template, help you quickly create a new WinUI 3 App with DevWinUI and MVVM Packages. We prepare your project with the following features: NavigationView, Custom TitleBar, HomeLandingPage and Settings Page (with Theme settings).
77
We also always use the latest version of WindowsAppSDK.

‎VSIX/DevWinUI_Template/WinUIApp-Blank-UnitTest/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
<TitleBar x:Name="AppTitleBar"
1515
Title="$safeprojectname$"
1616
Subtitle="1.0.0">
17-
<!-- Temporary Fix TitleBar Icon -->
18-
<TitleBar.LeftHeader>
19-
<ImageIcon Width="16"
20-
Height="16"
21-
Margin="2,0,14,0"
22-
Source="ms-appx:///Assets/AppIcon.png" />
23-
</TitleBar.LeftHeader>
17+
<TitleBar.IconSource>
18+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
19+
</TitleBar.IconSource>
2420
</TitleBar>
2521
<StackPanel Grid.Row="1">
2622

‎VSIX/DevWinUI_Template/WinUIApp-Blank/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414
<TitleBar x:Name="AppTitleBar"
1515
Title="$safeprojectname$"
1616
Subtitle="1.0.0">
17-
<!-- Temporary Fix TitleBar Icon -->
18-
<TitleBar.LeftHeader>
19-
<ImageIcon Width="16"
20-
Height="16"
21-
Margin="2,0,14,0"
22-
Source="ms-appx:///Assets/AppIcon.png" />
23-
</TitleBar.LeftHeader>
17+
<TitleBar.IconSource>
18+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
19+
</TitleBar.IconSource>
2420
</TitleBar>
2521
<StackPanel Grid.Row="1">
2622

‎VSIX/DevWinUI_Template/WinUIApp-MVVM-NavigationView/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@
2323
QueryIcon="Find"
2424
QuerySubmitted="OnQuerySubmitted"
2525
TextChanged="OnTextChanged" />
26-
<!-- Temporary Fix TitleBar Icon -->
27-
<TitleBar.LeftHeader>
28-
<ImageIcon Width="16"
29-
Height="16"
30-
Margin="2,0,14,0"
31-
Source="ms-appx:///Assets/AppIcon.png" />
32-
</TitleBar.LeftHeader>
26+
<TitleBar.IconSource>
27+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
28+
</TitleBar.IconSource>
3329
<TitleBar.RightHeader>
3430
<Button x:Name="ThemeButton"
3531
Height="32"

‎VSIX/DevWinUI_Template/WinUIApp-MVVM/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
<TitleBar x:Name="AppTitleBar"
1616
Title="{x:Bind dev:ProcessInfoHelper.ProductName}"
1717
Subtitle="{x:Bind dev:ProcessInfoHelper.VersionWithPrefix}">
18-
<!-- Temporary Fix TitleBar Icon -->
19-
<TitleBar.LeftHeader>
20-
<ImageIcon Width="16"
21-
Height="16"
22-
Margin="2,0,14,0"
23-
Source="ms-appx:///Assets/AppIcon.png" />
24-
</TitleBar.LeftHeader>
18+
<TitleBar.IconSource>
19+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
20+
</TitleBar.IconSource>
2521
</TitleBar>
2622
<StackPanel Grid.Row="1">
2723

‎VSIX/DevWinUI_Template/WinUIApp-NavigationView/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,9 @@
1717
IsBackButtonVisible="True"
1818
IsPaneToggleButtonVisible="True"
1919
Subtitle="{x:Bind dev:ProcessInfoHelper.VersionWithPrefix}">
20-
<!-- Temporary Fix TitleBar Icon -->
21-
<TitleBar.LeftHeader>
22-
<ImageIcon Width="16"
23-
Height="16"
24-
Margin="2,0,14,0"
25-
Source="ms-appx:///Assets/AppIcon.png" />
26-
</TitleBar.LeftHeader>
20+
<TitleBar.IconSource>
21+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
22+
</TitleBar.IconSource>
2723
<TitleBar.RightHeader>
2824
<Button x:Name="ThemeButton"
2925
Height="32"

‎VSIX/DevWinUI_Template/WinUIApp/MainWindow.xaml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,9 @@
1515
<TitleBar x:Name="AppTitleBar"
1616
Title="{x:Bind dev:ProcessInfoHelper.ProductName}"
1717
Subtitle="{x:Bind dev:ProcessInfoHelper.VersionWithPrefix}">
18-
<!-- Temporary Fix TitleBar Icon -->
19-
<TitleBar.LeftHeader>
20-
<ImageIcon Width="16"
21-
Height="16"
22-
Margin="2,0,14,0"
23-
Source="ms-appx:///Assets/AppIcon.png" />
24-
</TitleBar.LeftHeader>
18+
<TitleBar.IconSource>
19+
<ImageIconSource ImageSource="ms-appx:///Assets/AppIcon.png" />
20+
</TitleBar.IconSource>
2521
</TitleBar>
2622
<StackPanel Grid.Row="1">
2723

0 commit comments

Comments
 (0)