Skip to content

Drive Widget details are now hidden when they are not available #2704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 25, 2020
Merged

Drive Widget details are now hidden when they are not available #2704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0930ba1
Hidden Drive Widget details when they cannot be provided
d2dyno1 Dec 25, 2020
5cfb8df
Apply suggestions from code review
yaira2 Dec 25, 2020
7b07123
Changed RowSpacing to Margin + replaced Grid with StackPanel
d2dyno1 Dec 25, 2020
8ff1c04
Changed RowSpacing to Margin + reverted to StackPanel
d2dyno1 Dec 25, 2020
ec18309
Changed RowSpacing to Margin + reverted to StackPanel
d2dyno1 Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Files/Filesystem/DriveItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ public ByteSize SpaceUsed
set => SetProperty(ref spaceUsed, value);
}

public Visibility ShowDriveDetails
{
get => MaxSpace.Bytes > 0d ? Visibility.Visible : Visibility.Collapsed;
}

private DriveType type;

public DriveType Type
Expand Down
14 changes: 9 additions & 5 deletions Files/UserControls/Widgets/DrivesWidget.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,28 @@
Grid.Column="1"
Margin="12,0,0,0"
VerticalAlignment="Center"
Orientation="Vertical"
Spacing="8">
Orientation="Vertical">
<TextBlock
x:Name="ItemLocationName"
FontSize="14"
FontWeight="Medium"
Text="{x:Bind Text, Mode=OneWay}"
TextWrapping="NoWrap" />
TextWrapping="NoWrap"
VerticalAlignment="Center"
Margin="0,0,0,8"/>
<muxc:ProgressBar
AutomationProperties.AccessibilityView="Raw"
Maximum="{x:Bind MaxSpace.GigaBytes, Mode=OneWay}"
Value="{x:Bind SpaceUsed.GigaBytes, Mode=OneWay}" />
Value="{x:Bind SpaceUsed.GigaBytes, Mode=OneWay}"
Visibility="{x:Bind ShowDriveDetails, Mode=OneWay}"
Margin="0,0,0,8"/>
<TextBlock
FontSize="12"
MaxLines="2"
Text="{x:Bind SpaceText, Mode=OneWay}"
Visibility="{x:Bind ShowDriveDetails, Mode=OneWay}"
TextWrapping="Wrap"
ToolTipService.ToolTip="{x:Bind SpaceText, Mode=OneWay}" />
ToolTipService.ToolTip="{x:Bind SpaceText, Mode=OneWay}"/>
</StackPanel>
</Grid>
</Button>
Expand Down