Skip to content

Commit 98f6892

Browse files
Use light dismiss tooltips
1 parent b1ccde0 commit 98f6892

File tree

1 file changed

+20
-69
lines changed

1 file changed

+20
-69
lines changed

src/Files.App/Views/Settings/DevToolsPage.xaml

Lines changed: 20 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<StackPanel Orientation="Vertical">
6464
<Grid
6565
x:Name="IDEConfigGrid"
66-
Padding="60,12,16,12"
66+
Padding="32,12"
6767
ColumnSpacing="16"
6868
RowSpacing="12">
6969
<Grid.ColumnDefinitions>
@@ -108,8 +108,9 @@
108108
<TeachingTip
109109
x:Name="InvalidFriendlyNameWarning"
110110
Title="{helpers:ResourceString Name=InvalidFriendlyNameError}"
111+
IsLightDismissEnabled="True"
111112
IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
112-
PreferredPlacement="BottomLeft"
113+
PreferredPlacement="Bottom"
113114
Target="{x:Bind IDEFriendlyNameTextBox}" />
114115
</TextBox.Resources>
115116
<TextBox.Header>
@@ -137,26 +138,14 @@
137138
TextTrimming="CharacterEllipsis"
138139
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource InvertedBoolVisibilityConverter}, Mode=OneWay}" />
139140

140-
<Grid
141+
<StackPanel
141142
x:Name="IDEPathGrid"
142143
Grid.Row="1"
143144
Grid.ColumnSpan="3"
144145
Margin="0,8,0,0"
145-
ColumnSpacing="8"
146+
Orientation="Horizontal"
147+
Spacing="8"
146148
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
147-
<Grid.ColumnDefinitions>
148-
<ColumnDefinition Width="Auto" />
149-
<ColumnDefinition Width="Auto" />
150-
<ColumnDefinition Width="Auto" />
151-
<ColumnDefinition Width="*" />
152-
</Grid.ColumnDefinitions>
153-
154-
<Grid.RowDefinitions>
155-
<RowDefinition Height="*" />
156-
<RowDefinition Height="Auto" />
157-
<RowDefinition Height="Auto" />
158-
</Grid.RowDefinitions>
159-
160149
<TextBox
161150
x:Name="IDEPathTextBox"
162151
Width="300"
@@ -165,6 +154,14 @@
165154
Text="{x:Bind ViewModel.IDEPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
166155
<TextBox.Resources>
167156
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
157+
<TeachingTip
158+
x:Name="InvalidPathWarning"
159+
Title="{helpers:ResourceString Name=InvalidPath}"
160+
IsLightDismissEnabled="True"
161+
IsOpen="{x:Bind ViewModel.IsIDEPathValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
162+
KeyTipHorizontalOffset="-80"
163+
PreferredPlacement="Bottom"
164+
Target="{x:Bind IDEPathTextBox}" />
168165
</TextBox.Resources>
169166
<TextBox.Header>
170167
<TextBlock Text="{helpers:ResourceString Name=PathOrAlias}" />
@@ -173,7 +170,6 @@
173170

174171
<SplitButton
175172
x:Name="PickIDEExe"
176-
Grid.Column="1"
177173
VerticalAlignment="Bottom"
178174
Command="{x:Bind ViewModel.OpenFilePickerForIDECommand, Mode=OneWay}"
179175
Content="{helpers:ResourceString Name=Browse}">
@@ -188,46 +184,7 @@
188184
</MenuFlyout>
189185
</SplitButton.Flyout>
190186
</SplitButton>
191-
192-
<Grid
193-
x:Name="InvalidPathWarning"
194-
Grid.Column="2"
195-
Padding="12,6"
196-
VerticalAlignment="Bottom"
197-
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}"
198-
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
199-
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
200-
BorderThickness="1"
201-
ColumnSpacing="8"
202-
CornerRadius="4"
203-
ToolTipService.ToolTip="{helpers:ResourceString Name=InvalidLocation}"
204-
Visibility="{x:Bind ViewModel.IsIDEPathValid, Mode=OneWay, Converter={StaticResource InvertedBoolVisibilityConverter}}">
205-
<Grid.ColumnDefinitions>
206-
<ColumnDefinition Width="Auto" />
207-
<ColumnDefinition Width="Auto" />
208-
</Grid.ColumnDefinitions>
209-
210-
<TextBlock
211-
VerticalAlignment="Center"
212-
AutomationProperties.AccessibilityView="Raw"
213-
FontFamily="{ThemeResource SymbolThemeFontFamily}"
214-
FontSize="{StaticResource InfoBarIconFontSize}"
215-
Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
216-
Text="{StaticResource InfoBarIconBackgroundGlyph}" />
217-
218-
<TextBlock
219-
VerticalAlignment="Center"
220-
FontFamily="{ThemeResource SymbolThemeFontFamily}"
221-
FontSize="{StaticResource InfoBarIconFontSize}"
222-
Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}"
223-
Text="{StaticResource InfoBarErrorIconGlyph}" />
224-
225-
<TextBlock
226-
Grid.Column="1"
227-
VerticalAlignment="Center"
228-
Text="{helpers:ResourceString Name=InvalidPath}" />
229-
</Grid>
230-
</Grid>
187+
</StackPanel>
231188

232189
<!-- Edit -->
233190
<Button
@@ -245,7 +202,7 @@
245202

246203
<StackPanel
247204
x:Name="SaveAndEditButtons"
248-
Padding="60,0,16,12"
205+
Padding="32,0,32,12"
249206
HorizontalAlignment="Right"
250207
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}"
251208
Orientation="Horizontal"
@@ -302,11 +259,8 @@
302259
<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="2" />
303260
<Setter Target="PickIDEExe.(Grid.Column)" Value="1" />
304261
<Setter Target="PickIDEExe.(Grid.Row)" Value="0" />
305-
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="2" />
306-
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="0" />
307-
<Setter Target="InvalidPathWarning.VerticalAlignment" Value="Bottom" />
308-
<Setter Target="IDEPathGrid.RowSpacing" Value="0" />
309-
<Setter Target="IDEPathGrid.ColumnSpacing" Value="8" />
262+
<Setter Target="IDEPathGrid.Spacing" Value="8" />
263+
<Setter Target="IDEPathGrid.Orientation" Value="Horizontal" />
310264
</VisualState.Setters>
311265
</VisualState>
312266
<VisualState x:Name="CompactState">
@@ -319,11 +273,8 @@
319273
<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="3" />
320274
<Setter Target="PickIDEExe.(Grid.Column)" Value="3" />
321275
<Setter Target="PickIDEExe.(Grid.Row)" Value="1" />
322-
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="3" />
323-
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="2" />
324-
<Setter Target="InvalidPathWarning.VerticalAlignment" Value="Stretch" />
325-
<Setter Target="IDEPathGrid.RowSpacing" Value="12" />
326-
<Setter Target="IDEPathGrid.ColumnSpacing" Value="0" />
276+
<Setter Target="IDEPathGrid.Spacing" Value="12" />
277+
<Setter Target="IDEPathGrid.Orientation" Value="Vertical" />
327278
</VisualState.Setters>
328279
</VisualState>
329280
</VisualStateGroup>

0 commit comments

Comments
 (0)