javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix theme toggle in composer

Browse Source
This commit is contained in:
Aleh Khantsevich
2024-07-06 18:23:44 +02:00
parent e65733754c
commit c18f6d3978
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wino.Mail/JS/editor.js
View File

@@ -1,7 +1,7 @@
const editor = Jodit.make("#editor", { const editor = Jodit.make("#editor", {
"useSearch": false, "useSearch": false,
"toolbar": true, "toolbar": true,
"buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align", "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align,lineHeight,table",
"inline": true, "inline": true,
"toolbarAdaptive": false, "toolbarAdaptive": false,
"toolbarInlineForSelection": false, "toolbarInlineForSelection": false,

33
Wino.Mail/Views/ComposePage.xaml
View File

@@ -151,13 +151,25 @@
OverflowButtonVisibility="Collapsed"> OverflowButtonVisibility="Collapsed">
<CommandBar.PrimaryCommands> <CommandBar.PrimaryCommands>
<AppBarButton <AppBarButton
x:Name="ComposerThemeToggleButton"
Click="InvertComposerThemeClicked" Click="InvertComposerThemeClicked"
LabelPosition="Collapsed"> LabelPosition="Collapsed"
ToolTipService.ToolTip="Light Theme"
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}">
<AppBarButton.Icon>
<controls:WinoFontIcon Icon="LightEditor" />
</AppBarButton.Icon>
</AppBarButton>
<AppBarButton
Click="InvertComposerThemeClicked"
LabelPosition="Collapsed"
ToolTipService.ToolTip="Dark Theme"
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
<AppBarButton.Icon> <AppBarButton.Icon>
<controls:WinoFontIcon Icon="DarkEditor" /> <controls:WinoFontIcon Icon="DarkEditor" />
</AppBarButton.Icon> </AppBarButton.Icon>
</AppBarButton> </AppBarButton>
<AppBarButton Command="{x:Bind ViewModel.DiscardCommand}" Label="Discard"> <AppBarButton Command="{x:Bind ViewModel.DiscardCommand}" Label="Discard">
<AppBarButton.Icon> <AppBarButton.Icon>
<controls:WinoFontIcon Icon="Delete" /> <controls:WinoFontIcon Icon="Delete" />
@@ -603,23 +615,6 @@
</Grid> </Grid>
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="ComposerThemeToggleButtonStates">
<VisualState x:Name="DarkMode">
<VisualState.StateTriggers>
<StateTrigger IsActive="{x:Bind IsComposerDarkMode, Mode=OneWay}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ComposerThemeToggleButton.Label" Value="Light Reader" />
<Setter Target="ComposerThemeToggleButton.Icon">
<Setter.Value>
<controls:WinoFontIcon Icon="LightEditor" />
</Setter.Value>
</Setter>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="LightMode" />
</VisualStateGroup>
<VisualStateGroup x:Name="DropZoneState"> <VisualStateGroup x:Name="DropZoneState">
<VisualState x:Name="Hovered"> <VisualState x:Name="Hovered">
<VisualState.StateTriggers> <VisualState.StateTriggers>