Skip to content

Commit f19a114

Browse files
committed
更新 Overlay 样式设置
在 `Styles.xaml` 文件中,移除了 `Overlay` 的 `Visibility` 设置,新增了 `Margin`、`BorderThickness` 和 `CornerRadius` 设置。`Overlay` 的 `Margin` 被设置为 `0,0,0,0`,`BorderThickness` 为 `1,1,1,1`,`CornerRadius` 绑定到 `TemplatedParent` 的 `CornerRadius` 属性。同时,调整了 `Overlay` 的 `Grid` 结构,移除了原有的 `Border`,并将 `Grid` 的 `Margin` 设置为 `{ThemeResource TabViewSelectedItemHeaderMargin}`,保持 `IsHitTestVisible` 为 `False`,确保 `Visibility` 仍为 `Collapsed`。
1 parent f7e47ad commit f19a114

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/WinUI.Dock/Themes/Styles.xaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,9 @@
589589
<Setter Target="LeftRadiusRenderArc.Opacity" Value="0" />
590590
<Setter Target="TabContainer.BorderThickness" Value="0" />
591591
<Setter Target="BottomBorderLine.Opacity" Value="0" />
592-
<Setter Target="Overlay.Visibility" Value="Collapsed" />
592+
<Setter Target="Overlay.Margin" Value="0,0,0,0" />
593+
<Setter Target="Overlay.BorderThickness" Value="1,1,1,1" />
594+
<Setter Target="Overlay.CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius}" />
593595
</VisualState.Setters>
594596
</VisualState>
595597
</VisualStateGroup>
@@ -701,20 +703,17 @@
701703
Visibility="Collapsed" />
702704
</Grid>
703705

704-
<Border x:Name="Overlay"
705-
Grid.Column="1"
706-
Padding="0,0,0,4"
707-
IsHitTestVisible="False"
708-
Visibility="Collapsed">
709-
<Grid Margin="{ThemeResource TabViewSelectedItemHeaderMargin}"
710-
Padding="{ThemeResource TabViewSelectedItemHeaderPadding}"
706+
<Grid Grid.Column="1"
707+
Margin="{ThemeResource TabViewSelectedItemHeaderMargin}"
708+
IsHitTestVisible="False">
709+
<Grid x:Name="Overlay"
710+
Margin="0,0,0,4"
711711
Background="{ThemeResource TabViewItemHeaderBackground}"
712712
BorderBrush="{TemplateBinding BorderBrush}"
713713
BorderThickness="{ThemeResource TabViewSelectedItemBorderThickness}"
714-
Control.IsTemplateFocusTarget="True"
715714
CornerRadius="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={StaticResource TopCornerRadiusFilterConverter}}"
716-
FocusVisualMargin="{TemplateBinding FocusVisualMargin}" />
717-
</Border>
715+
Visibility="Collapsed" />
716+
</Grid>
718717
</Grid>
719718
</ControlTemplate>
720719
</Setter.Value>

0 commit comments

Comments
 (0)