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

Jump to bottom

Fix ikw namespace in xaml #110

Merged
merged 2 commits into from
Nov 26, 2024
+13 −22
Merged

Fix ikw namespace in xaml #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e8561e
Fix ikw namespace in xaml
JeremyAnsel Nov 25, 2024
4608f65
Clean some bullsh1t
NotYoojun Nov 26, 2024
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
2 changes: 2 additions & 0 deletions samples/Acrylic10Example/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Acrylic10Example"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
ui:WindowHelper.UseModernWindowStyle="True"
ui:WindowHelper.SystemBackdropType="Acrylic10"
ui:TitleBar.Height="36"
mc:Ignorable="d"
Title="Welcome!" Height="450" Width="800"
Expand Down
12 changes: 0 additions & 12 deletions samples/Acrylic10Example/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,7 @@ public MainWindow()

private void Window_Loaded(object sender, RoutedEventArgs e)
{
WindowChrome.SetWindowChrome(this, new WindowChrome()
{
GlassFrameThickness = new Thickness(0, 1, 0, 0),
UseAeroCaptionButtons = false,
CornerRadius = new CornerRadius(0),
ResizeBorderThickness = new Thickness(4),
NonClientFrameEdges = NonClientFrameEdges.None,
CaptionHeight = 36d,

});

WindowHelper.SetApplyBackground(this, false);
AcrylicHelper.Apply(this, true);
}
}
}
4 changes: 2 additions & 2 deletions samples/ExamplePhotoTaker/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<ikw:SimpleStackPanel HorizontalAlignment="Center" VerticalAlignment="Center"
Spacing="10">

<ui:ClippedContent BorderBrush="Red" Width="160" Height="90"
<ikw:ClippedContent BorderBrush="Red" Width="160" Height="90"
BorderThickness="4 1 3 2" CornerRadius="5">
<Image Source="/david-van-dijk-3LTht2nxd34-unsplash.jpg" Stretch="UniformToFill" Opacity="0.8"/>
</ui:ClippedContent>
</ikw:ClippedContent>
</ikw:SimpleStackPanel>
</Border>
</Viewbox>
Expand Down
17 changes: 9 additions & 8 deletions source/tools/WinUIResourcesConverter/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
xmlns:local="clr-namespace:WinUIResourcesConverter"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
Title="WinUI Resources Converter"
Width="800"
Height="450"
Expand All @@ -23,12 +24,12 @@
IsPaneOpen="True"
PanePlacement="Left">
<Grid>
<ui:SimpleStackPanel
<ikw:SimpleStackPanel
x:Name="MainContentPanel"
Margin="10"
VerticalAlignment="Center"
Spacing="20">
<ui:SimpleStackPanel Orientation="Vertical" Spacing="5">
<ikw:SimpleStackPanel Orientation="Vertical" Spacing="5">
<TextBlock Style="{DynamicResource BaseTextBlockStyle}" Text="Source Directory" />
<Grid>
<Grid.ColumnDefinitions>
Expand All @@ -50,8 +51,8 @@
<Bold>local WinUI repo clone</Bold>
<Run>that you want to the convert the resources for</Run>
</TextBlock>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel Orientation="Vertical" Spacing="5">
</ikw:SimpleStackPanel>
<ikw:SimpleStackPanel Orientation="Vertical" Spacing="5">
<TextBlock Style="{DynamicResource BaseTextBlockStyle}" Text="Destination Directory" />
<Grid>
<Grid.ColumnDefinitions>
Expand All @@ -71,8 +72,8 @@
<Bold>Strings</Bold>
<Run>directory of the target control that you want to the convert the resources for</Run>
</TextBlock>
</ui:SimpleStackPanel>
<ui:SimpleStackPanel
</ikw:SimpleStackPanel>
<ikw:SimpleStackPanel
HorizontalAlignment="Center"
Orientation="Horizontal"
Spacing="20">
Expand All @@ -85,8 +86,8 @@
Click="ConvertButton_Click"
Content="Convert"
Style="{DynamicResource AccentButtonStyle}" />
</ui:SimpleStackPanel>
</ui:SimpleStackPanel>
</ikw:SimpleStackPanel>
</ikw:SimpleStackPanel>
<ui:ProgressRing
x:Name="ProgressRing1"
Width="100"
Expand Down
Loading