Skip to content

Commit 76d64e8

Browse files
authored
Fixed layout for RTL text in download panel (#905)
1 parent 51e7ad9 commit 76d64e8

1 file changed

Lines changed: 7 additions & 11 deletions

File tree

src/Pages/LibraryPage.xaml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,29 +156,25 @@
156156
<ColumnDefinition Width="Auto" />
157157
</Grid.ColumnDefinitions>
158158

159-
<Grid Grid.Column="0" VerticalAlignment="Center" >
159+
<Grid Grid.Column="0" VerticalAlignment="Center">
160160
<Grid.ColumnDefinitions>
161161
<ColumnDefinition Width="*" />
162162
<ColumnDefinition Width="Auto" />
163-
<ColumnDefinition Width="Auto" />
164163
</Grid.ColumnDefinitions>
165164
<Grid.RowDefinitions>
166165
<RowDefinition Height="Auto" />
167166
<RowDefinition Height="Auto" />
168167
</Grid.RowDefinitions>
169168

170-
<ProgressBar Grid.Row="0" Grid.ColumnSpan="3" Minimum="0" Maximum="100" IsIndeterminate="{x:Bind LocalRecord.FileDownloader.IsIndeterminate, Mode=OneWay}" Value="{x:Bind LocalRecord.FileDownloader.Percent, Mode=OneWay}" VerticalAlignment="Top" />
169+
<ProgressBar Grid.Row="0" Grid.ColumnSpan="2" Minimum="0" Maximum="100" IsIndeterminate="{x:Bind LocalRecord.FileDownloader.IsIndeterminate, Mode=OneWay}" Value="{x:Bind LocalRecord.FileDownloader.Percent, Mode=OneWay}" VerticalAlignment="Top" />
171170

172171
<TextBlock Grid.Row="1" Grid.Column="0" Visibility="{x:Bind LocalRecord.FileDownloader.TotalBytesToDownload, Mode=OneWay, Converter={StaticResource TotalBytesVisbilityConverter}}" Text="{x:Bind system:String.Format('{0:0.0}%', LocalRecord.FileDownloader.Percent), Mode=OneWay}" />
173172

174-
<TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right">
175-
<Run Text="{x:Bind LocalRecord.FileDownloader.DownloadedBytes, Mode=OneWay, Converter={StaticResource BytesToMegaBytesConverter}}" />
176-
</TextBlock>
177-
178-
<TextBlock Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right" Visibility="{x:Bind LocalRecord.FileDownloader.TotalBytesToDownload, Mode=OneWay, Converter={StaticResource TotalBytesVisbilityConverter}}">
179-
<Run Text=" / " />
180-
<Run Text="{x:Bind LocalRecord.FileDownloader.TotalBytesToDownload, Mode=OneWay, Converter={StaticResource BytesToMegaBytesConverter}}" />
181-
</TextBlock>
173+
<StackPanel Grid.Row="1" Grid.Column="1" Spacing="2" Orientation="Horizontal" Visibility="{x:Bind LocalRecord.FileDownloader.TotalBytesToDownload, Mode=OneWay, Converter={StaticResource TotalBytesVisbilityConverter}}">
174+
<TextBlock Text="{x:Bind LocalRecord.FileDownloader.DownloadedBytes, Mode=OneWay, Converter={StaticResource BytesToMegaBytesConverter}}" />
175+
<TextBlock Text="/" />
176+
<TextBlock Text="{x:Bind LocalRecord.FileDownloader.TotalBytesToDownload, Mode=OneWay, Converter={StaticResource BytesToMegaBytesConverter}}" />
177+
</StackPanel>
182178

183179
</Grid>
184180

0 commit comments

Comments
 (0)