|
63 | 63 | <StackPanel Orientation="Vertical"> |
64 | 64 | <Grid |
65 | 65 | x:Name="IDEConfigGrid" |
66 | | - Padding="60,12,16,12" |
| 66 | + Padding="32,12" |
67 | 67 | ColumnSpacing="16" |
68 | 68 | RowSpacing="12"> |
69 | 69 | <Grid.ColumnDefinitions> |
|
108 | 108 | <TeachingTip |
109 | 109 | x:Name="InvalidFriendlyNameWarning" |
110 | 110 | Title="{helpers:ResourceString Name=InvalidFriendlyNameError}" |
| 111 | + IsLightDismissEnabled="True" |
111 | 112 | IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}" |
112 | | - PreferredPlacement="BottomLeft" |
| 113 | + PreferredPlacement="Bottom" |
113 | 114 | Target="{x:Bind IDEFriendlyNameTextBox}" /> |
114 | 115 | </TextBox.Resources> |
115 | 116 | <TextBox.Header> |
|
137 | 138 | TextTrimming="CharacterEllipsis" |
138 | 139 | Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource InvertedBoolVisibilityConverter}, Mode=OneWay}" /> |
139 | 140 |
|
140 | | - <Grid |
| 141 | + <StackPanel |
141 | 142 | x:Name="IDEPathGrid" |
142 | 143 | Grid.Row="1" |
143 | 144 | Grid.ColumnSpan="3" |
144 | 145 | Margin="0,8,0,0" |
145 | | - ColumnSpacing="8" |
| 146 | + Orientation="Horizontal" |
| 147 | + Spacing="8" |
146 | 148 | 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 | | - |
160 | 149 | <TextBox |
161 | 150 | x:Name="IDEPathTextBox" |
162 | 151 | Width="300" |
|
165 | 154 | Text="{x:Bind ViewModel.IDEPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"> |
166 | 155 | <TextBox.Resources> |
167 | 156 | <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}" /> |
168 | 165 | </TextBox.Resources> |
169 | 166 | <TextBox.Header> |
170 | 167 | <TextBlock Text="{helpers:ResourceString Name=PathOrAlias}" /> |
|
173 | 170 |
|
174 | 171 | <SplitButton |
175 | 172 | x:Name="PickIDEExe" |
176 | | - Grid.Column="1" |
177 | 173 | VerticalAlignment="Bottom" |
178 | 174 | Command="{x:Bind ViewModel.OpenFilePickerForIDECommand, Mode=OneWay}" |
179 | 175 | Content="{helpers:ResourceString Name=Browse}"> |
|
188 | 184 | </MenuFlyout> |
189 | 185 | </SplitButton.Flyout> |
190 | 186 | </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> |
231 | 188 |
|
232 | 189 | <!-- Edit --> |
233 | 190 | <Button |
|
245 | 202 |
|
246 | 203 | <StackPanel |
247 | 204 | x:Name="SaveAndEditButtons" |
248 | | - Padding="60,0,16,12" |
| 205 | + Padding="32,0,32,12" |
249 | 206 | HorizontalAlignment="Right" |
250 | 207 | x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}" |
251 | 208 | Orientation="Horizontal" |
|
302 | 259 | <Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="2" /> |
303 | 260 | <Setter Target="PickIDEExe.(Grid.Column)" Value="1" /> |
304 | 261 | <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" /> |
310 | 264 | </VisualState.Setters> |
311 | 265 | </VisualState> |
312 | 266 | <VisualState x:Name="CompactState"> |
|
319 | 273 | <Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="3" /> |
320 | 274 | <Setter Target="PickIDEExe.(Grid.Column)" Value="3" /> |
321 | 275 | <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" /> |
327 | 278 | </VisualState.Setters> |
328 | 279 | </VisualState> |
329 | 280 | </VisualStateGroup> |
|
0 commit comments