Skip to content

Commit 1430fea

Browse files
authored
Code Quality: Wrap sync icon in border (#15615)
1 parent 6499dfc commit 1430fea

File tree

3 files changed

+34
-21
lines changed

3 files changed

+34
-21
lines changed

src/Files.App/Views/Layouts/ColumnLayoutPage.xaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,19 @@
309309
<Grid Grid.Column="2">
310310
<StackPanel Orientation="Horizontal" Spacing="4">
311311
<!-- Cloud Status -->
312-
<uc:OpacityIcon
312+
<Border
313313
x:Name="CloudDriveSyncStatusGlyph"
314-
Width="16"
315-
Height="16"
316314
HorizontalAlignment="Center"
317315
VerticalAlignment="Center"
318316
x:Load="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).LoadSyncStatus, Mode=OneWay}"
319317
x:Phase="2"
320-
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}"
321-
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}" />
318+
Background="Transparent"
319+
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}">
320+
<uc:OpacityIcon
321+
Width="16"
322+
Height="16"
323+
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}" />
324+
</Border>
322325

323326
<!-- Tag -->
324327
<Ellipse

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,6 +1255,7 @@
12551255
HorizontalAlignment="Stretch"
12561256
VerticalAlignment="Center"
12571257
AutomationProperties.Name="{x:Bind SyncStatusString, Mode=OneWay}"
1258+
Background="Transparent"
12581259
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}"
12591260
Visibility="{Binding ColumnsViewModel.StatusColumn.Visibility, ElementName=PageRoot, Mode=OneWay}">
12601261
<uc:OpacityIcon

src/Files.App/Views/Layouts/GridLayoutPage.xaml

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,20 @@
186186
<ColumnDefinition Width="*" />
187187
</Grid.ColumnDefinitions>
188188

189-
<uc:OpacityIcon
189+
<Border
190190
x:Name="CloudDriveSyncStatusGlyph"
191191
Grid.Column="0"
192-
Width="16"
193-
Height="16"
194-
Margin="0,0,4,0"
195192
HorizontalAlignment="Left"
196193
x:Load="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).LoadSyncStatus, Mode=OneWay}"
197194
x:Phase="2"
198-
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}"
199-
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}" />
195+
Background="Transparent"
196+
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}">
197+
<uc:OpacityIcon
198+
Width="16"
199+
Height="16"
200+
Margin="0,0,4,0"
201+
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}" />
202+
</Border>
200203

201204
<Ellipse
202205
Grid.Column="1"
@@ -395,17 +398,20 @@
395398
</TextBox>
396399

397400
<!-- Cloud Status -->
398-
<uc:OpacityIcon
401+
<Border
399402
x:Name="CloudDriveSyncStatusGlyph"
400403
Grid.Column="2"
401-
Width="16"
402-
Height="16"
403404
HorizontalAlignment="Center"
404405
VerticalAlignment="Center"
405406
x:Load="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).LoadSyncStatus, Mode=OneWay}"
406407
x:Phase="2"
407-
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}"
408-
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}" />
408+
Background="Transparent"
409+
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}">
410+
<uc:OpacityIcon
411+
Width="16"
412+
Height="16"
413+
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}" />
414+
</Border>
409415

410416
<!-- Visual Status Managing -->
411417
<VisualStateManager.VisualStateGroups>
@@ -459,14 +465,17 @@
459465
ToolTipService.ToolTip="{x:Bind FileTagsUI[0].Name, Mode=OneWay}"
460466
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}" />
461467

462-
<uc:OpacityIcon
468+
<Border
463469
x:Name="CloudDriveSyncStatusGlyph"
464-
Width="16"
465-
Height="16"
466470
x:Phase="2"
467-
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}"
471+
Background="Transparent"
468472
ToolTipService.ToolTip="{x:Bind SyncStatusUI.SyncStatusString, Mode=OneWay}"
469-
Visibility="{Binding InstanceViewModel.IsPageTypeCloudDrive, ElementName=PageRoot, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
473+
Visibility="{Binding InstanceViewModel.IsPageTypeCloudDrive, ElementName=PageRoot, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
474+
<uc:OpacityIcon
475+
Width="16"
476+
Height="16"
477+
Style="{x:Bind ((cloud:CloudDriveSyncStatusUI)SyncStatusUI).OpacityIcon, Mode=OneWay}" />
478+
</Border>
470479
</StackPanel>
471480

472481
<CheckBox

0 commit comments

Comments
 (0)