Skip to content

Commit 1473f16

Browse files
refactor: prepare for new theme version
1 parent 6e9cff7 commit 1473f16

3 files changed

Lines changed: 13 additions & 6 deletions

File tree

OC.OfficeLiteServer/MainWindow.xaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
<theme:Window.TitleBarContent>
1616
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
1717
<Button
18-
FontFamily="{DynamicResource SymbolThemeFontFamily}"
1918
FontSize="14"
2019
ToolTip="Settings"
21-
Content="&#xE712;"
22-
Click="SettingsOnClick"/>
20+
Click="SettingsOnClick">
21+
<ContentControl
22+
Margin="0 -3 2 3"
23+
Template="{DynamicResource IconTemplate}"
24+
Content="{DynamicResource IconMore}"/>
25+
</Button>
2326
<Border Width="1" Background="{DynamicResource White4Brush}" Margin="6 8 0 8"/>
2427
</StackPanel>
2528
</theme:Window.TitleBarContent>
26-
<theme:LogViewer x:Name="LogViewer" Background="Transparent"/>
29+
<theme:LogViewer x:Name="LogViewer"/>
2730
</theme:Window>

OC.OfficeLiteServer/MainWindow.xaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ private async void SettingsOnClick(object sender, RoutedEventArgs e)
3333
try
3434
{
3535
var settings = new SettingsView();
36-
var result = await Modal.Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
36+
var result = await Assistant.Theme.MessageBox
37+
.Show("Settings", settings, MessageBoxButton.OKCancel, MessageBoxImage.None);
3738
if (result != MessageBoxResult.OK || !settings.Apply()) return;
3839

3940
Logger.LogInfo(this, "Restarting server...");

OC.OfficeLiteServer/OC.OfficeLiteServer.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>
3131
<PackageReference Include="OC.Assistant.Sdk" Version="1.7.1" />
32-
<PackageReference Include="OC.Assistant.Theme" Version="2.0.1" />
3332
<PackageReference Include="System.Text.Json" Version="9.0.5" />
3433
</ItemGroup>
3534

35+
<ItemGroup>
36+
<ProjectReference Include="..\..\..\Theme\OC.Assistant.Theme\OC.Assistant.Theme.csproj" />
37+
</ItemGroup>
38+
3639
</Project>

0 commit comments

Comments
 (0)