Skip to content

Commit b3fda37

Browse files
feat: implement new Theme package
1 parent 0d395e8 commit b3fda37

2 files changed

Lines changed: 24 additions & 34 deletions

File tree

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,23 @@
1-
<Window x:Class="OC.OfficeLiteServer.MainWindow"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
xmlns:theme="http://schemas.open-commissioning-assistant.com/2024"
7-
mc:Ignorable="d"
8-
theme:WindowStyle.UseTheme="True"
9-
WindowStartupLocation="CenterScreen"
10-
Title="OfficeLiteServer" Height="350" Width="525"
11-
Closing="MainWindow_OnClosing">
12-
<Grid>
13-
<Border>
14-
<Border.Effect><BlurEffect x:Name="BlurEffect" Radius="0"></BlurEffect></Border.Effect>
15-
<Grid>
16-
<theme:LogViewer x:Name="LogViewer" Background="Transparent"/>
17-
<Button
18-
VerticalAlignment="Top"
19-
HorizontalAlignment="Right"
20-
Click="SettingsOnClick"
21-
Margin="1"
22-
Height="26"
23-
Width="40"
24-
FontSize="14"
25-
Padding="0"
26-
FontFamily="{DynamicResource SymbolThemeFontFamily}">
27-
28-
</Button>
29-
</Grid>
30-
</Border>
31-
<theme:Modal BlurEffect="{x:Reference BlurEffect}"></theme:Modal>
32-
</Grid>
33-
</Window>
1+
<theme:Window x:Class="OC.OfficeLiteServer.MainWindow"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
xmlns:theme="http://schemas.open-commissioning-assistant.com/2024"
7+
mc:Ignorable="d"
8+
WindowStartupLocation="CenterScreen"
9+
Title="OfficeLiteServer"
10+
Height="350" Width="525"
11+
MinHeight="300" MinWidth="400"
12+
ShowIcon="True"
13+
ShowTitle="True"
14+
Closing="MainWindow_OnClosing">
15+
<theme:Window.TitleBarContent>
16+
<Button HorizontalAlignment="Right"
17+
FontFamily="{DynamicResource SymbolThemeFontFamily}"
18+
FontSize="14"
19+
Content="&#xE713;"
20+
Click="SettingsOnClick"/>
21+
</theme:Window.TitleBarContent>
22+
<theme:LogViewer x:Name="LogViewer" Background="Transparent"/>
23+
</theme:Window>

OC.OfficeLiteServer/OC.OfficeLiteServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>
3131
<PackageReference Include="OC.Assistant.Sdk" Version="1.7.1" />
32-
<PackageReference Include="OC.Assistant.Theme" Version="1.5.0" />
32+
<PackageReference Include="OC.Assistant.Theme" Version="2.0.0" />
3333
<PackageReference Include="System.Text.Json" Version="9.0.5" />
3434
</ItemGroup>
3535

0 commit comments

Comments
 (0)