Skip to content

Commit 316a7ed

Browse files
committed
chore: Use light theme by default
1 parent ea98bf2 commit 316a7ed

File tree

6 files changed

+12
-20
lines changed

6 files changed

+12
-20
lines changed

UI/WindowingSamples/WindowingSamples/App.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
<Application x:Class="WindowingSamples.App"
1+
<Application x:Class="WindowingSamples.App"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:wasm="http://platform.uno/wasm"
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
RequestedTheme="Light"
67
mc:Ignorable="wasm">
78

89
<Application.Resources>

UI/WindowingSamples/WindowingSamples/CustomWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<controls:WindowTitleControl Text="Custom window" Glyph="&#xE161;" />
1717

1818
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Spacing="8">
19-
<TextBlock x:Name="WindowText" HorizontalAlignment="Center" Text="This is custom window" FontSize="40" />
19+
<TextBlock Foreground="White" x:Name="WindowText" HorizontalAlignment="Center" Text="This is custom window" FontSize="40" />
2020
<Button HorizontalAlignment="Center" Click="CloseClick">Close</Button>
2121
</StackPanel>
2222
</Grid>

UI/WindowingSamples/WindowingSamples/MainPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
<TextBlock Text="Custom window" />
3030
</StackPanel>
3131
</Button>
32-
<!--<Button Click="{x:Bind WindowTitleSample}">
32+
<Button Click="{x:Bind WindowTitleSample}">
3333
<StackPanel Orientation="Horizontal" Spacing="8">
3434
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE737;" />
3535
<TextBlock Text="Window title" />
3636
</StackPanel>
37-
</Button>-->
37+
</Button>
3838
<Button Click="{x:Bind FullScreenModeSample}">
3939
<StackPanel Orientation="Horizontal" Spacing="8">
4040
<FontIcon FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE740;" />

UI/WindowingSamples/WindowingSamples/MainPage.xaml.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ namespace WindowingSamples;
44

55
public sealed partial class MainPage : Page
66
{
7-
public MainPage()
8-
{
9-
this.InitializeComponent();
10-
}
7+
public MainPage() => InitializeComponent();
118

129
public void BasicWindowSample()
1310
{
@@ -39,11 +36,11 @@ public void BasicWindowSample()
3936

4037
public void CustomWindowSample() => new CustomWindow().Activate();
4138

42-
public void FullScreenModeSample() => new FullScreenModeWindow().Activate();
39+
public void FullScreenModeSample() => new FullScreenModeWindow().Activate();
4340

44-
public void MinimizeMaximizeSample() => new MinimizeMaximizeWindow().Activate();
41+
public void MinimizeMaximizeSample() => new MinimizeMaximizeWindow().Activate();
4542

46-
public void WindowTitleSample() => new WindowTitleWindow().Activate();
43+
public void WindowTitleSample() => new WindowTitleWindow().Activate();
4744

48-
public void StayOnTopSample() => new StayOnTopWindow().Activate();
45+
public void StayOnTopSample() => new StayOnTopWindow().Activate();
4946
}

UI/WindowingSamples/WindowingSamples/WindowTitleWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Spacing="8">
1919
<TextBlock HorizontalAlignment="Center" Text="Type to change the window title" FontSize="20" />
20-
<TextBox Width="320" Grid.Row="1" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{x:Bind WindowTitle, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
20+
<TextBox Width="320" Grid.Row="1" FontSize="24" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{x:Bind Title, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
2121
</StackPanel>
2222
</Grid>
2323
</Window>

UI/WindowingSamples/WindowingSamples/WindowTitleWindow.xaml.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ public sealed partial class WindowTitleWindow : Window
1010
public WindowTitleWindow()
1111
{
1212
InitializeComponent();
13-
WindowTitle = "Test Window Title";
14-
}
15-
16-
public string WindowTitle
17-
{
18-
get => AppWindow.Title;
19-
set => AppWindow.Title = value;
13+
Title = "Test Window Title";
2014
}
2115
}

0 commit comments

Comments
 (0)