Skip to content

Commit 6e92971

Browse files
committed
样式优化
1 parent 6a2f506 commit 6e92971

1 file changed

Lines changed: 25 additions & 29 deletions

File tree

DirectorPrompt/Views/MainWindow.axaml

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</StackPanel>
135135

136136
<Button x:Name="LanSharingButton"
137-
Grid.Column="2"
137+
Grid.Row="0" Grid.Column="2"
138138
Margin="0,0,8,0"
139139
Padding="12,6"
140140
Command="{Binding OpenLanSharingCommand}"
@@ -146,7 +146,7 @@
146146
</Button>
147147

148148
<Button x:Name="SettingsButton"
149-
Grid.Column="3"
149+
Grid.Row="0" Grid.Column="3"
150150
Padding="12,6"
151151
Command="{Binding OpenSettingsCommand}">
152152
<StackPanel Orientation="Horizontal" Spacing="6">
@@ -157,7 +157,7 @@
157157

158158
<Grid x:Name="MobileProjectToolbar"
159159
Grid.Row="1"
160-
Grid.ColumnSpan="4"
160+
Grid.ColumnSpan="4" Grid.Column="0"
161161
ColumnDefinitions="*,*,*,*"
162162
Margin="0,6,0,0"
163163
IsVisible="False">
@@ -365,17 +365,25 @@
365365
Duration="0:0:0.18"
366366
Easing="QuadraticEaseOut" />
367367
<DoubleTransition Property="Opacity"
368-
Duration="0:0:0.14" />
368+
Duration="0:0:0.14" />
369369
</Transitions>
370370
</Setter>
371371
</Style>
372372
<Style Selector="Border.message-actions.open">
373-
<Setter Property="Width" Value="134" />
373+
<Setter Property="Width" Value="90" />
374374
<Setter Property="Opacity" Value="1" />
375375
</Style>
376-
<Style Selector="Button.message-menu.open">
377-
<Setter Property="Background" Value="{DynamicResource AccentFillColorSecondaryBrush}" />
378-
<Setter Property="Foreground" Value="{DynamicResource AccentFillColorDefaultBrush}" />
376+
<Style Selector="Border.message-actions Button">
377+
<Setter Property="Width" Value="26" />
378+
<Setter Property="Height" Value="26" />
379+
<Setter Property="Padding" Value="0" />
380+
<Setter Property="VerticalAlignment" Value="Center" />
381+
</Style>
382+
<Style Selector="Button.message-menu">
383+
<Setter Property="Width" Value="28" />
384+
<Setter Property="Height" Value="28" />
385+
<Setter Property="Padding" Value="0" />
386+
<Setter Property="VerticalAlignment" Value="Center" />
379387
</Style>
380388
</ListBox.Styles>
381389
<ListBox.ItemTemplate>
@@ -399,44 +407,33 @@
399407
FontWeight="SemiBold"
400408
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
401409
Margin="0,0,8,0"
402-
VerticalAlignment="Top" />
410+
VerticalAlignment="Center" />
403411

404412
<StackPanel Grid.Column="2"
405413
Orientation="Horizontal"
406414
Spacing="4"
407-
VerticalAlignment="Top">
415+
VerticalAlignment="Center">
408416
<Border x:Name="MessageActionsPanel"
409417
Classes="message-actions"
410418
Classes.open="{Binding IsMenuOpen}"
411419
IsHitTestVisible="{Binding IsMenuOpen}"
412-
Height="42"
413-
Background="{DynamicResource ControlFillColorSecondaryBrush}"
414-
BorderBrush="{DynamicResource ControlElevationBorderBrush}"
415-
BorderThickness="1"
416-
CornerRadius="6"
417-
Padding="4,2">
418-
<StackPanel Orientation="Horizontal" Spacing="2">
420+
Height="28"
421+
Background="Transparent"
422+
BorderThickness="0"
423+
Padding="0">
424+
<StackPanel Orientation="Horizontal" Spacing="6" Width="90">
419425
<Button Tag="{Binding}"
420426
Click="OnCopyEntry"
421-
Width="40"
422-
Height="36"
423-
Padding="0"
424427
ToolTip.Tip="{Binding [Common.Copy], Source={x:Static loc:Loc.Instance}}">
425428
<fa:FASymbolIcon Symbol="Copy" />
426429
</Button>
427430
<Button Tag="{Binding}"
428431
Click="OnEditEntry"
429-
Width="40"
430-
Height="36"
431-
Padding="0"
432432
ToolTip.Tip="{Binding [Dialog.Edit], Source={x:Static loc:Loc.Instance}}">
433433
<fa:FASymbolIcon Symbol="Edit" />
434434
</Button>
435435
<Button Tag="{Binding}"
436436
Click="OnRollbackRound"
437-
Width="40"
438-
Height="36"
439-
Padding="0"
440437
ToolTip.Tip="{Binding [Dialog.Rollback], Source={x:Static loc:Loc.Instance}}">
441438
<fa:FASymbolIcon Symbol="Undo" />
442439
</Button>
@@ -447,8 +444,7 @@
447444
Classes.open="{Binding IsMenuOpen}"
448445
Click="OnMoreButtonClick"
449446
Tag="{Binding}"
450-
Padding="6,2"
451-
VerticalAlignment="Top"
447+
VerticalAlignment="Center"
452448
IsEnabled="{Binding DataContext.IsNotProcessing, RelativeSource={RelativeSource AncestorType=ListBox}}">
453449
<fa:FASymbolIcon Symbol="MoreVertical" />
454450
</Button>
@@ -1060,7 +1056,7 @@
10601056
</Button>
10611057

10621058
<Border x:Name="MobileNavigation"
1063-
Grid.ColumnSpan="4"
1059+
Grid.ColumnSpan="4" Grid.Column="0"
10641060
VerticalAlignment="Bottom"
10651061
IsVisible="False"
10661062
Background="{DynamicResource SolidBackgroundFillColorBaseBrush}"

0 commit comments

Comments
 (0)