update: 微调颜色

Author: chenxuuu

llcomNext/LLCOM/Styles/MainStyle.axaml

@@ -1,8 +1,8 @@
 <Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
         <StackPanel>
-            <Button Classes="IconButton" Content="&#xEB56;" />
-            <Button Classes="IconButtonActive" Content="&#xEB56;" />
+            <Button Classes="IconButton Tertiary" Content="&#xEB56;" />
+            <Button Classes="IconButtonActive Tertiary" Content="&#xEB56;" />
         </StackPanel>
     </Design.PreviewWith>
 
@@ -18,10 +18,19 @@
     </Style>
     <Style Selector="Button.IconButtonActive">
         <Setter Property="FontFamily" Value="{DynamicResource Phosphor}" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorSecondary}" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
+        <Setter Property="Theme" Value="{DynamicResource LightButton}" />
         <Setter Property="Height" Value="40" />
         <Setter Property="Width" Value="40" />
         <Setter Property="FontSize" Value="20" />
     </Style>
+
+    <Style Selector="Button.NotActiveButton">
+        <Setter Property="Theme" Value="{DynamicResource BorderlessButton}" />
+    </Style>
+    <Style Selector="Button.ActiveButton">
+        <Setter Property="Theme" Value="{DynamicResource LightButton}" />
+        <Setter Property="Foreground" Value="{DynamicResource SemiColorSecondary}" />
+    </Style>
 </Styles>

llcomNext/LLCOM/ViewModels/MainViewModel.cs

@@ -53,8 +53,13 @@ public MainViewModel(Func<Type, ViewModelBase> getService)
 
     //以下代码用于切换DataPage中的子页面
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IsPacketDataActive), nameof(IsTerminalActive), nameof(IsWaveformActive))]
     private ViewModelBase _currentDataPage;
 
+    public bool IsPacketDataActive => CurrentDataPage is PacketDataViewModel;
+    public bool IsTerminalActive => CurrentDataPage is TerminalViewModel;
+    public bool IsWaveformActive => CurrentDataPage is WaveformViewModel;
+    
     [RelayCommand]
     private void PacketDataButton() => CurrentDataPage = _getService(typeof(PacketDataViewModel));
     [RelayCommand]

llcomNext/LLCOM/Views/MainView.axaml

@@ -22,32 +22,32 @@
             <Panel Margin="5">
                 <StackPanel Spacing="5">
                     <Button
-                        Classes="IconButton Secondary"
+                        Classes="IconButton Tertiary"
                         Classes.IconButtonActive="{Binding IsDataPageActive}"
                         Command="{Binding DataPageButtonCommand}"
                         Content="&#xEB56;"
                         ToolTip.Tip="数据收发" />
                     <Button
-                        Classes="IconButton Secondary"
+                        Classes="IconButton Tertiary"
                         Classes.IconButtonActive="{Binding IsToolsPageActive}"
                         Command="{Binding ToolsPageButtonCommand}"
                         Content="&#xECA0;"
                         ToolTip.Tip="调试工具" />
                     <Button
-                        Classes="IconButton Secondary"
+                        Classes="IconButton Tertiary"
                         Classes.IconButtonActive="{Binding IsScriptPageActive}"
                         Command="{Binding ScriptPageButtonCommand}"
                         Content="&#xEAFE;"
                         ToolTip.Tip="自动脚本" />
                     <Button
-                        Classes="IconButton Secondary"
+                        Classes="IconButton Tertiary"
                         Classes.IconButtonActive="{Binding IsOnlinePageActive}"
                         Command="{Binding OnlinePageButtonCommand}"
                         Content="&#xE288;"
                         ToolTip.Tip="在线功能" />
                 </StackPanel>
                 <Button
-                    Classes="IconButton Secondary"
+                    Classes="IconButton Tertiary"
                     Classes.IconButtonActive="{Binding IsSettingPageActive}"
                     Command="{Binding SettingPageButtonCommand}"
                     Content="&#xE270;"
@@ -59,44 +59,47 @@
         <GridSplitter Grid.Column="2" ResizeDirection="Columns" />
         <Grid Grid.Column="3" RowDefinitions="Auto,*">
             <Border BorderBrush="{DynamicResource SemiColorBorder}" BorderThickness="0,0,0,1">
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                    <RadioButton
-                        Classes="Large Secondary"
-                        Command="{Binding PacketDataButtonCommand}"
-                        IsChecked="True"
-                        Theme="{DynamicResource ButtonRadioButton}">
+                <StackPanel
+                    HorizontalAlignment="Center"
+                    Margin="0,5"
+                    Orientation="Horizontal"
+                    Spacing="5">
+                    <Button
+                        Classes="NotActiveButton Tertiary"
+                        Classes.ActiveButton="{Binding IsPacketDataActive}"
+                        Command="{Binding PacketDataButtonCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="{DynamicResource Phosphor}"
                                 FontSize="20"
                                 Text="&#xE5A2;" />
                             <TextBlock>分包数据</TextBlock>
                         </StackPanel>
-                    </RadioButton>
-                    <RadioButton
-                        Classes="Large"
-                        Command="{Binding TerminalButtonCommand}"
-                        Theme="{DynamicResource ButtonRadioButton}">
+                    </Button>
+                    <Button
+                        Classes="NotActiveButton Tertiary"
+                        Classes.ActiveButton="{Binding IsTerminalActive}"
+                        Command="{Binding TerminalButtonCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="{DynamicResource Phosphor}"
                                 FontSize="20"
                                 Text="&#xEAE8;" />
                             <TextBlock>虚拟终端</TextBlock>
                         </StackPanel>
-                    </RadioButton>
-                    <RadioButton
-                        Classes="Large"
-                        Command="{Binding WaveformButtonCommand}"
-                        Theme="{DynamicResource ButtonRadioButton}">
+                    </Button>
+                    <Button
+                        Classes="NotActiveButton Tertiary"
+                        Classes.ActiveButton="{Binding IsWaveformActive}"
+                        Command="{Binding WaveformButtonCommand}">
                         <StackPanel Orientation="Horizontal">
                             <TextBlock
                                 FontFamily="{DynamicResource Phosphor}"
                                 FontSize="20"
                                 Text="&#xEA9A;" />
                             <TextBlock>波形显示</TextBlock>
                         </StackPanel>
-                    </RadioButton>
+                    </Button>
                 </StackPanel>
             </Border>
             <UserControl Content="{Binding CurrentDataPage}" Grid.Row="1" />