Skip to content

Commit cd47b86

Browse files
onesoundsonesounds
committed
- Adjust Item Margin
- Chagne placeholder implment in searchbox with inkore control
1 parent e0e5dc6 commit cd47b86

File tree

6 files changed

+29
-78
lines changed

6 files changed

+29
-78
lines changed

‎Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</ikw:SimpleStackPanel>
5252
</ui:SettingsCard>
5353

54-
<ui:SettingsCard Header="{DynamicResource releaseNotes}">
54+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource releaseNotes}">
5555
<ui:SettingsCard.HeaderIcon>
5656
<ui:FontIcon Glyph="&#xe8fd;" />
5757
</ui:SettingsCard.HeaderIcon>
@@ -82,7 +82,7 @@
8282
</StackPanel>
8383
</ui:SettingsCard>
8484

85-
<ui:SettingsCard Header="{DynamicResource icons}">
85+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource icons}">
8686
<ui:SettingsCard.HeaderIcon>
8787
<ui:FontIcon Glyph="&#xE8FE;" />
8888
</ui:SettingsCard.HeaderIcon>
@@ -137,7 +137,7 @@
137137
</ikw:SimpleStackPanel>
138138
</ui:SettingsCard>
139139

140-
<ui:SettingsExpander Margin="0 14 0 0" Header="{DynamicResource advanced}">
140+
<ui:SettingsExpander Margin="0 4 0 0" Header="{DynamicResource advanced}">
141141
<ui:SettingsExpander.HeaderIcon>
142142
<ui:FontIcon Glyph="&#xE8B7;" />
143143
</ui:SettingsExpander.HeaderIcon>

‎Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
Text="{DynamicResource hotkeys}"
2929
TextAlignment="left" />
3030

31-
<ui:SettingsCard Description="{DynamicResource flowlauncherHotkeyToolTip}" Header="{DynamicResource flowlauncherHotkey}">
31+
<ui:SettingsCard
32+
Margin="0 8 0 0"
33+
Description="{DynamicResource flowlauncherHotkeyToolTip}"
34+
Header="{DynamicResource flowlauncherHotkey}">
3235
<ui:SettingsCard.HeaderIcon>
3336
<ui:FontIcon Glyph="&#xeda7;" />
3437
</ui:SettingsCard.HeaderIcon>
@@ -41,7 +44,10 @@
4144
WindowTitle="{DynamicResource flowlauncherHotkey}" />
4245
</ui:SettingsCard>
4346

44-
<ui:SettingsCard Description="{DynamicResource previewHotkeyToolTip}" Header="{DynamicResource previewHotkey}">
47+
<ui:SettingsCard
48+
Margin="0 4 0 0"
49+
Description="{DynamicResource previewHotkeyToolTip}"
50+
Header="{DynamicResource previewHotkey}">
4551
<ui:SettingsCard.HeaderIcon>
4652
<ui:FontIcon Glyph="&#xe8a1;" />
4753
</ui:SettingsCard.HeaderIcon>
@@ -54,7 +60,7 @@
5460
</ui:SettingsCard>
5561

5662
<ui:SettingsCard
57-
Margin="0 12 0 0"
63+
Margin="0 14 0 0"
5864
Description="{DynamicResource openResultModifiersToolTip}"
5965
Header="{DynamicResource openResultModifiers}">
6066
<ComboBox
@@ -64,7 +70,10 @@
6470
SelectedValue="{Binding Settings.OpenResultModifiers}" />
6571
</ui:SettingsCard>
6672

67-
<ui:SettingsCard Description="{DynamicResource showOpenResultHotkeyToolTip}" Header="{DynamicResource showOpenResultHotkey}">
73+
<ui:SettingsCard
74+
Margin="0 4 0 0"
75+
Description="{DynamicResource showOpenResultHotkeyToolTip}"
76+
Header="{DynamicResource showOpenResultHotkey}">
6877
<ui:ToggleSwitch
6978
IsOn="{Binding Settings.ShowOpenResultHotkey}"
7079
OffContent="{DynamicResource disable}"

‎Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -112,44 +112,15 @@
112112
Height="34"
113113
Margin="0 0 26 0"
114114
HorizontalAlignment="Right"
115+
VerticalContentAlignment="Center"
116+
ui:ControlHelper.PlaceholderText="{DynamicResource searchplugin}"
115117
ContextMenu="{StaticResource TextBoxContextMenu}"
116118
DockPanel.Dock="Right"
117119
FontSize="14"
118120
Text="{Binding FilterText, UpdateSourceTrigger=PropertyChanged}"
119-
TextAlignment="Left"
120121
ToolTip="{DynamicResource searchpluginToolTip}"
121122
ToolTipService.InitialShowDelay="200"
122-
ToolTipService.Placement="Top">
123-
<TextBox.Style>
124-
<Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
125-
<Style.Resources>
126-
<VisualBrush
127-
x:Key="CueBannerBrush"
128-
AlignmentX="Left"
129-
AlignmentY="Center"
130-
Stretch="None">
131-
<VisualBrush.Visual>
132-
<Label
133-
Padding="10 0 0 0"
134-
Content="{DynamicResource searchplugin}"
135-
Foreground="{DynamicResource CustomContextDisabled}" />
136-
</VisualBrush.Visual>
137-
</VisualBrush>
138-
</Style.Resources>
139-
<Style.Triggers>
140-
<Trigger Property="Text" Value="{x:Static sys:String.Empty}">
141-
<Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
142-
</Trigger>
143-
<Trigger Property="Text" Value="{x:Null}">
144-
<Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
145-
</Trigger>
146-
<Trigger Property="IsKeyboardFocused" Value="True">
147-
<Setter Property="Background" Value="{DynamicResource Color02B}" />
148-
</Trigger>
149-
</Style.Triggers>
150-
</Style>
151-
</TextBox.Style>
152-
</TextBox>
123+
ToolTipService.Placement="Top" />
153124
</ikw:SimpleStackPanel>
154125

155126
</DockPanel>

‎Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,43 +72,14 @@
7272
Width="150"
7373
Height="34"
7474
Margin="0 0 26 0"
75+
VerticalContentAlignment="Center"
76+
ui:ControlHelper.PlaceholderText="{DynamicResource searchplugin}"
7577
ContextMenu="{StaticResource TextBoxContextMenu}"
7678
FontSize="14"
7779
Text="{Binding FilterText, UpdateSourceTrigger=PropertyChanged}"
78-
TextAlignment="Left"
7980
ToolTip="{DynamicResource searchpluginToolTip}"
8081
ToolTipService.InitialShowDelay="200"
81-
ToolTipService.Placement="Top">
82-
<TextBox.Style>
83-
<Style BasedOn="{StaticResource DefaultTextBoxStyle}" TargetType="TextBox">
84-
<Style.Resources>
85-
<VisualBrush
86-
x:Key="CueBannerBrush"
87-
AlignmentX="Left"
88-
AlignmentY="Center"
89-
Stretch="None">
90-
<VisualBrush.Visual>
91-
<Label
92-
Padding="10 0 0 0"
93-
Content="{DynamicResource searchplugin}"
94-
Foreground="{DynamicResource CustomContextDisabled}" />
95-
</VisualBrush.Visual>
96-
</VisualBrush>
97-
</Style.Resources>
98-
<Style.Triggers>
99-
<Trigger Property="Text" Value="{x:Static sys:String.Empty}">
100-
<Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
101-
</Trigger>
102-
<Trigger Property="Text" Value="{x:Null}">
103-
<Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
104-
</Trigger>
105-
<Trigger Property="IsKeyboardFocused" Value="True">
106-
<Setter Property="Background" Value="{DynamicResource Color02B}" />
107-
</Trigger>
108-
</Style.Triggers>
109-
</Style>
110-
</TextBox.Style>
111-
</TextBox>
82+
ToolTipService.Placement="Top" />
11283
</ikw:SimpleStackPanel>
11384
</DockPanel>
11485

‎Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,35 +37,35 @@
3737
OnContent="{DynamicResource enable}" />
3838
</ui:SettingsCard>
3939

40-
<ui:SettingsCard Header="{DynamicResource server}">
40+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource server}">
4141
<TextBox
4242
Width="300"
4343
IsEnabled="{Binding Settings.Proxy.Enabled}"
4444
Text="{Binding Settings.Proxy.Server}" />
4545
</ui:SettingsCard>
4646

47-
<ui:SettingsCard Header="{DynamicResource port}">
47+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource port}">
4848
<TextBox
4949
Width="100"
5050
IsEnabled="{Binding Settings.Proxy.Enabled}"
5151
Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
5252
</ui:SettingsCard>
5353

54-
<ui:SettingsCard Header="{DynamicResource userName}">
54+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource userName}">
5555
<TextBox
5656
Width="200"
5757
IsEnabled="{Binding Settings.Proxy.Enabled}"
5858
Text="{Binding Settings.Proxy.UserName}" />
5959
</ui:SettingsCard>
6060

61-
<ui:SettingsCard Header="{DynamicResource password}">
61+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource password}">
6262
<TextBox
6363
Width="200"
6464
IsEnabled="{Binding Settings.Proxy.Enabled}"
6565
Text="{Binding Settings.Proxy.Password}" />
6666
</ui:SettingsCard>
6767

68-
<ui:SettingsCard Margin="0 8 0 0" Header="{DynamicResource testProxy}">
68+
<ui:SettingsCard Margin="0 14 0 0" Header="{DynamicResource testProxy}">
6969
<Button
7070
Width="150"
7171
Command="{Binding TestProxyClickedCommand}"

‎Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507
</ui:SettingsCard>
508508

509509
<!-- Drop shadow effect -->
510-
<ui:SettingsCard Margin="0 0 0 0" Header="{DynamicResource queryWindowShadowEffect}">
510+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource queryWindowShadowEffect}">
511511
<ui:SettingsCard.HeaderIcon>
512512
<ui:FontIcon Glyph="&#xeb91;" />
513513
</ui:SettingsCard.HeaderIcon>
@@ -585,7 +585,7 @@
585585
</StackPanel>
586586
</ui:SettingsCard>
587587

588-
<ui:SettingsCard Header="{DynamicResource Date}">
588+
<ui:SettingsCard Margin="0 4 0 0" Header="{DynamicResource Date}">
589589
<ui:SettingsCard.HeaderIcon>
590590
<ui:FontIcon Glyph="&#xe787;" />
591591
</ui:SettingsCard.HeaderIcon>

0 commit comments

Comments
 (0)