Skip to content

Commit f7d099d

Browse files
committed
Fix wpf drawing issue
1 parent 5252d3e commit f7d099d

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

+29-29
Original file line numberDiff line numberDiff line change
@@ -16,55 +16,53 @@
1616
mc:Ignorable="d">
1717
<UserControl.Resources>
1818
<Style x:Key="ExplorerTabItem" TargetType="{x:Type TabItem}">
19+
<Setter Property="MinWidth" Value="120" />
1920
<Setter Property="Template">
2021
<Setter.Value>
2122
<ControlTemplate TargetType="{x:Type TabItem}">
22-
2323
<Border
2424
x:Name="LayoutRoot"
25-
Margin="0 0 0 0"
25+
Margin="0"
2626
Padding="{TemplateBinding Padding}"
2727
SnapsToDevicePixels="True">
2828
<Grid>
29+
<Grid.ColumnDefinitions>
30+
<ColumnDefinition Width="Auto" />
31+
<ColumnDefinition Width="*" />
32+
</Grid.ColumnDefinitions>
33+
2934
<Border
3035
x:Name="TabSeparator"
3136
Width="0"
32-
Margin="{DynamicResource TabViewItemSeparatorMargin}"
37+
Margin="0"
3338
HorizontalAlignment="Right"
3439
BorderBrush="{DynamicResource TabViewItemSeparator}"
3540
BorderThickness="1" />
41+
3642
<Border
3743
x:Name="TabContainer"
3844
Grid.Column="1"
39-
Padding="{DynamicResource TabViewItemHeaderPadding}"
40-
Background="{DynamicResource TabViewItemHeaderBackground}"
45+
Padding="10,5"
46+
Background="{DynamicResource Color06B}"
4147
BorderBrush="{TemplateBinding BorderBrush}"
4248
BorderThickness="{TemplateBinding BorderThickness}">
43-
<Grid>
44-
<Grid.ColumnDefinitions>
45-
<ColumnDefinition Width="Auto" />
46-
<ColumnDefinition Width="*" />
47-
<ColumnDefinition Width="Auto" />
48-
</Grid.ColumnDefinitions>
49-
<ContentPresenter
50-
x:Name="ContentPresenter"
51-
Grid.Column="1"
52-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
53-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
54-
ContentSource="Header"
55-
Focusable="False"
56-
RecognizesAccessKey="True"
57-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
58-
TextElement.FontSize="{DynamicResource TabViewItemHeaderFontSize}"
59-
TextElement.FontWeight="{TemplateBinding FontWeight}"
60-
TextElement.Foreground="{DynamicResource Color05B}" />
61-
</Grid>
49+
<ContentPresenter
50+
x:Name="ContentPresenter"
51+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
52+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
53+
ContentSource="Header"
54+
Focusable="False"
55+
RecognizesAccessKey="True"
56+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
57+
TextElement.FontSize="{TemplateBinding FontSize}"
58+
TextElement.FontWeight="{TemplateBinding FontWeight}"
59+
TextElement.Foreground="{DynamicResource Color08B}" />
6260
</Border>
6361
</Grid>
6462
</Border>
6563

6664
<ControlTemplate.Triggers>
67-
<!-- PointerOver -->
65+
<!-- Default -->
6866
<Trigger Property="IsMouseOver" Value="False">
6967
<Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
7068
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color08B}" />
@@ -73,13 +71,11 @@
7371
<Trigger Property="IsMouseOver" Value="True">
7472
<Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color06B}" />
7573
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
76-
7774
</Trigger>
7875
<!-- Selected -->
7976
<Trigger Property="IsSelected" Value="True">
8077
<Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
8178
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
82-
8379
<Setter Property="Panel.ZIndex" Value="1" />
8480
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
8581
</Trigger>
@@ -91,11 +87,10 @@
9187
</MultiTrigger.Conditions>
9288
<Setter TargetName="TabContainer" Property="Background" Value="{DynamicResource Color00B}" />
9389
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource Color05B}" />
94-
9590
<Setter Property="Panel.ZIndex" Value="1" />
9691
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold" />
9792
</MultiTrigger>
98-
<!-- Disabled -->
93+
<!-- 비활성화 -->
9994
<Trigger Property="IsEnabled" Value="False">
10095
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundDisabled}" />
10196
</Trigger>
@@ -175,6 +170,11 @@
175170
BorderThickness="0"
176171
SelectedIndex="0"
177172
TabStripPlacement="Top">
173+
<TabControl.ItemsPanel>
174+
<ItemsPanelTemplate>
175+
<WrapPanel IsItemsHost="True" Orientation="Horizontal"/>
176+
</ItemsPanelTemplate>
177+
</TabControl.ItemsPanel>
178178
<TabItem
179179
Width="Auto"
180180
Header="{DynamicResource plugin_explorer_generalsetting_header}"

0 commit comments

Comments
 (0)