Fix Querybar text invade magnifying glass area

(This is due to the problem that the size of the window changes when the shadow is turned on.)
- remove all querybox/suggest querybox width of themes
- Add padding for Magnifying glass area
This commit is contained in:
Dobin Park 2021-10-14 15:28:15 +09:00
parent d4fbe33626
commit c7ab6c05b9
8 changed files with 18 additions and 26 deletions

View file

@ -8,14 +8,13 @@
<Setter Property="FontSize" Value="28" />
<Setter Property="FontWeight" Value="Regular" />
<Setter Property="Margin" Value="16 7 0 7" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Padding" Value="0 4 68 0" />
<Setter Property="Background" Value="#2F2F2F" />
<Setter Property="Width" Value="664" />
<Setter Property="Height" Value="48" />
<Setter Property="Foreground" Value="#E3E0E3" />
<Setter Property="CaretBrush" Value="#E3E0E3" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
<Setter Property="Template">
<Setter.Value>
@ -42,10 +41,9 @@
<Setter Property="Foreground" Value="DarkGray" />
<Setter Property="Height" Value="48" />
<Setter Property="Margin" Value="16 7 0 7" />
<Setter Property="Width" Value="664" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="HorizontalAlignment" Value="Left" />
<Setter Property="Padding" Value="0 4 68 0" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>

View file

@ -12,16 +12,16 @@
<Setter Property="Background" Value="#36393f" />
<Setter Property="CaretBrush" Value="#ffffff" />
<Setter Property="SelectionBrush" Value="#0a68d8"/>
<Setter Property="Width" Value="490" />
<Setter Property="Height" Value="42" />
<Setter Property="FontSize" Value="24" />
<Setter Property="Padding" Value="0 0 66 0" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="#72767d" />
<Setter Property="Background" Value="#36393f" />
<Setter Property="Width" Value="490" />
<Setter Property="Height" Value="42" />
<Setter Property="FontSize" Value="24" />
<Setter Property="Padding" Value="0 0 66 0" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="2" />

View file

@ -6,7 +6,7 @@
<Setter Property="Background" Value="#161614"/>
<Setter Property="Foreground" Value="#b88f3a" />
<Setter Property="CaretBrush" Value="#b88f3a" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 0 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
@ -15,7 +15,7 @@
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#161614"/>
<Setter Property="Foreground" Value="#a09b8c" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 0 66 0" />
<Setter Property="Height" Value="42" />
</Style>

View file

@ -8,10 +8,12 @@
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="Background" Value="#001e4e"/>
<Setter Property="Padding" Value="0 0 18 0" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Foreground" Value="#344c71" />
<Setter Property="Background" Value="#001e4e" />
<Setter Property="Padding" Value="0 0 18 0" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

View file

@ -13,17 +13,15 @@
<Setter Property="Foreground" Value="#d2d8e5" />
<Setter Property="CaretBrush" Value="#FFAA47" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Width" Value="490" />
<Setter Property="Height" Value="42" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Padding" Value="0 4 66 0" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#303840" />
<Setter Property="Foreground" Value="#798189" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Width" Value="490" />
<Setter Property="Height" Value="42" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Padding" Value="0 4 66 0" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
<Setter Property="BorderThickness" Value="2" />

View file

@ -16,16 +16,14 @@
<Setter Property="BorderBrush" Value="Black"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="FontSize" Value="28" />
<Setter Property="Width" Value="490" />
<Setter Property="Height" Value="42" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Padding" Value="0 4 66 0" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#dddddd" />
<Setter Property="Foreground" Value="#c6c6c6" />
<Setter Property="FontSize" Value="28" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

View file

@ -14,16 +14,14 @@
<Setter Property="Foreground" Value="#FFFFFF" />
<Setter Property="CaretBrush" Value="#FFFFFF" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#202020" />
<Setter Property="Foreground" Value="#7b7b7b" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">

View file

@ -14,16 +14,14 @@
<Setter Property="Foreground" Value="#000000" />
<Setter Property="CaretBrush" Value="#000000" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
<Setter Property="Background" Value="#f3f3f3" />
<Setter Property="Foreground" Value="#b5b5b5" />
<Setter Property="FontSize" Value="26" />
<Setter Property="Padding" Value="0 4 0 0" />
<Setter Property="Width" Value="490" />
<Setter Property="Padding" Value="0 4 66 0" />
<Setter Property="Height" Value="42" />
</Style>
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">