Skip to content

Commit e63670e

Browse files
CodingOctocatCodingOctocat
committed
Fix scrollbar partially covered by Clear button
1 parent 474da45 commit e63670e

File tree

2 files changed

+32
-34
lines changed

2 files changed

+32
-34
lines changed

‎IPConfig/Themes/FixHandyControlSearchBarPlusTemplate.xaml‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,14 @@
3939
<ColumnDefinition />
4040
<ColumnDefinition Width="Auto" />
4141
</Grid.ColumnDefinitions>
42-
<Border Margin="4,0,-4,0"
43-
Padding="8,0,0,0"
42+
<Border Margin="8,0,0,0"
43+
Padding="0"
4444
HorizontalAlignment="Right"
45-
VerticalAlignment="Stretch"
45+
VerticalAlignment="Center"
4646
Panel.ZIndex="99"
4747
Background="{TemplateBinding Background}"
48-
BorderBrush="{x:Null}"
49-
BorderThickness="{TemplateBinding BorderThickness,
50-
Converter={StaticResource ThicknessSplitConverter},
51-
ConverterParameter='0,1,0,1'}"
52-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
48+
BorderThickness="0"
49+
CornerRadius="8"
5350
Visibility="{Binding ElementName=ButtonClear, Path=Visibility}">
5451
<Button Name="ButtonClear"
5552
Width="Auto"
@@ -58,10 +55,12 @@
5855
HorizontalAlignment="Center"
5956
VerticalAlignment="Center"
6057
HorizontalContentAlignment="Center"
58+
VerticalContentAlignment="Center"
6159
hc:BorderElement.CornerRadius="4"
6260
hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
6361
hc:IconElement.Width="14"
6462
Background="{TemplateBinding Background}"
63+
BorderThickness="0"
6564
Command="{x:Static hc:ControlCommands.Clear}"
6665
Foreground="{Binding BorderBrush, ElementName=border}"
6766
Style="{StaticResource ButtonIcon}"
@@ -79,7 +78,7 @@
7978
<ScrollViewer x:Name="PART_ContentHost"
8079
Grid.Row="0"
8180
Grid.Column="0"
82-
Margin="-2,0"
81+
Margin="2,0"
8382
Padding="{TemplateBinding Padding}"
8483
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
8584
Focusable="false"
@@ -163,17 +162,14 @@
163162
<ColumnDefinition />
164163
<ColumnDefinition Width="Auto" />
165164
</Grid.ColumnDefinitions>
166-
<Border Margin="4,0,-4,0"
167-
Padding="8,0,0,0"
165+
<Border Margin="8,0,0,0"
166+
Padding="0"
168167
HorizontalAlignment="Right"
169-
VerticalAlignment="Stretch"
168+
VerticalAlignment="Center"
170169
Panel.ZIndex="99"
171170
Background="{TemplateBinding Background}"
172-
BorderBrush="{x:Null}"
173-
BorderThickness="{TemplateBinding BorderThickness,
174-
Converter={StaticResource ThicknessSplitConverter},
175-
ConverterParameter='0,1,0,1'}"
176-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
171+
BorderThickness="0"
172+
CornerRadius="8"
177173
Visibility="{Binding ElementName=ButtonClear, Path=Visibility}">
178174
<Button Name="ButtonClear"
179175
Width="Auto"
@@ -182,10 +178,12 @@
182178
HorizontalAlignment="Center"
183179
VerticalAlignment="Center"
184180
HorizontalContentAlignment="Center"
181+
VerticalContentAlignment="Center"
185182
hc:BorderElement.CornerRadius="4"
186183
hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
187184
hc:IconElement.Width="14"
188185
Background="{TemplateBinding Background}"
186+
BorderThickness="0"
189187
Command="{x:Static hc:ControlCommands.Clear}"
190188
Foreground="{Binding BorderBrush, ElementName=border}"
191189
Style="{StaticResource ButtonIcon}"
@@ -203,7 +201,7 @@
203201
<ScrollViewer x:Name="PART_ContentHost"
204202
Grid.Row="0"
205203
Grid.Column="0"
206-
Margin="-2,0"
204+
Margin="2,0"
207205
Padding="{TemplateBinding Padding}"
208206
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
209207
Focusable="false"
@@ -254,6 +252,7 @@
254252
<Style x:Key="SearchBarPlusBaseStyle"
255253
BasedOn="{StaticResource SearchBarExtendBaseStyle}"
256254
TargetType="hc:SearchBar">
255+
<Setter Property="Padding" Value="4,0" />
257256
<Setter Property="Template" Value="{StaticResource SearchBarPlusTopTemplate}" />
258257
<Style.Triggers>
259258
<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">

‎IPConfig/Themes/FixHandyControlTextBoxPlusTemplate.xaml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,21 @@
4646
Visibility="{TemplateBinding Text,
4747
Converter={StaticResource String2VisibilityReConverter}}" />
4848
<ScrollViewer Name="PART_ContentHost"
49-
Margin="-2,0"
49+
Margin="0"
5050
Padding="{TemplateBinding Padding}"
5151
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
5252
Focusable="false"
5353
ScrollViewer.HorizontalScrollBarVisibility="Hidden"
5454
ScrollViewer.VerticalScrollBarVisibility="Hidden" />
55-
<Border Margin="8,0,0,0"
56-
Padding="8,0"
55+
<Border Margin="8,0"
56+
Padding="0"
5757
HorizontalAlignment="Right"
58-
VerticalAlignment="Stretch"
58+
VerticalAlignment="Center"
5959
Panel.ZIndex="99"
6060
Background="{TemplateBinding Background}"
6161
BorderBrush="{x:Null}"
62-
BorderThickness="{TemplateBinding BorderThickness,
63-
Converter={StaticResource ThicknessSplitConverter},
64-
ConverterParameter='0,1,1,1'}"
65-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
62+
BorderThickness="0"
63+
CornerRadius="8"
6664
Visibility="{Binding ElementName=ButtonClear, Path=Visibility}">
6765
<Button Name="ButtonClear"
6866
Width="Auto"
@@ -76,6 +74,7 @@
7674
hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
7775
hc:IconElement.Width="14"
7876
Background="{TemplateBinding Background}"
77+
BorderThickness="0"
7978
Command="{x:Static hc:ControlCommands.Clear}"
8079
Foreground="{Binding BorderBrush, ElementName=border}"
8180
Style="{StaticResource ButtonIcon}"
@@ -145,23 +144,21 @@
145144
Visibility="{TemplateBinding Text,
146145
Converter={StaticResource String2VisibilityReConverter}}" />
147146
<ScrollViewer x:Name="PART_ContentHost"
148-
Margin="-2,0,0,0"
147+
Margin="0"
149148
Padding="{TemplateBinding Padding}"
150149
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
151150
Focusable="false"
152151
HorizontalScrollBarVisibility="Hidden"
153152
VerticalScrollBarVisibility="Hidden" />
154-
<Border Margin="8,0,0,0"
155-
Padding="8,0"
153+
<Border Margin="8,0"
154+
Padding="0"
156155
HorizontalAlignment="Right"
157-
VerticalAlignment="Stretch"
156+
VerticalAlignment="Center"
158157
Panel.ZIndex="99"
159158
Background="{TemplateBinding Background}"
160159
BorderBrush="{x:Null}"
161-
BorderThickness="{TemplateBinding BorderThickness,
162-
Converter={StaticResource ThicknessSplitConverter},
163-
ConverterParameter='0,1,1,1'}"
164-
CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
160+
BorderThickness="0"
161+
CornerRadius="8"
165162
Visibility="{Binding ElementName=ButtonClear, Path=Visibility}">
166163
<Button Name="ButtonClear"
167164
Width="Auto"
@@ -175,6 +172,7 @@
175172
hc:IconElement.Geometry="{StaticResource DeleteFillCircleGeometry}"
176173
hc:IconElement.Width="14"
177174
Background="{TemplateBinding Background}"
175+
BorderThickness="0"
178176
Command="{x:Static hc:ControlCommands.Clear}"
179177
Foreground="{Binding BorderBrush, ElementName=border}"
180178
Style="{StaticResource ButtonIcon}"
@@ -207,6 +205,7 @@
207205
<Style x:Key="TextBoxPlusBaseStyle"
208206
BasedOn="{StaticResource TextBoxExtendBaseStyle}"
209207
TargetType="hc:TextBox">
208+
<Setter Property="Padding" Value="4,0" />
210209
<Setter Property="Template" Value="{StaticResource TextBoxPlusTopTemplate}" />
211210
<Style.Triggers>
212211
<Trigger Property="hc:InfoElement.TitlePlacement" Value="Left">

0 commit comments

Comments
 (0)