Skip to content

Commit 53194d2

Browse files
yaira2yaira2
authored
Fix: Fixed an issue where the title was displayed twice in the preview pane (#10796)
1 parent ac1160f commit 53194d2

File tree

2 files changed

+52
-134
lines changed

2 files changed

+52
-134
lines changed

‎src/Files.App/Constants.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,24 +174,6 @@ public static class PreviewPane
174174
/// The maximum file size, in bytes, that will attempted to be loaded as text if the extension is unknown.
175175
/// </summary>
176176
public const long TryLoadAsTextSizeLimit = 500000;
177-
178-
/// <summary>
179-
/// The number of thumbnails that will be shown for FolderPreviews
180-
/// </summary>
181-
public const int FolderPreviewThumbnailCount = 10;
182-
}
183-
184-
public static class PaneContent
185-
{
186-
public const string ContentKey = "PaneContent";
187-
188-
public const string HorizontalSizePxKey = "PaneHorizontalSizePx";
189-
190-
public const string VerticalSizePxKey = "PaneVerticalSizePx";
191-
192-
public const string MediaVolumeKey = "PaneMediaVolume";
193-
194-
public const string ShowPreviewOnlyKey = "ShowPreviewOnly";
195177
}
196178

197179
public static class ResourceFilePaths

‎src/Files.App/UserControls/Pane/PreviewPane.xaml

Lines changed: 52 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,10 @@
3838
Height="3*"
3939
MinHeight="100" />
4040
</Grid.RowDefinitions>
41-
<Grid.ColumnDefinitions>
42-
<ColumnDefinition Width="2*" MinWidth="120" />
43-
<ColumnDefinition
44-
x:Name="PropertiesColumn"
45-
Width="3*"
46-
MinWidth="120" />
47-
</Grid.ColumnDefinitions>
4841

4942
<Grid
5043
x:Name="RootPreviewGrid"
51-
Margin="5,5,5,5"
44+
Margin="8"
5245
HorizontalAlignment="Stretch"
5346
VerticalAlignment="Stretch"
5447
AutomationProperties.Name="{helpers:ResourceString Name=PreviewPaneFilePreview/AutomationProperties/Name}">
@@ -88,108 +81,59 @@
8881
Visibility="Collapsed" />
8982
</Grid>
9083

91-
<Grid x:Name="RootPropertiesGrid" Grid.Row="2">
92-
<TextBlock
93-
x:Name="DetailsErrorText"
94-
HorizontalAlignment="Center"
95-
VerticalAlignment="Center"
96-
Text="{x:Bind GetLocalizedResource('NoItemSelected')}"
97-
TextWrapping="WrapWholeWords"
98-
Visibility="Visible" />
99-
<ScrollViewer
100-
x:Name="FileDetailsScrollViewer"
101-
AutomationProperties.Name="{helpers:ResourceString Name=PreviewPaneFileDetails/AutomationProperties/Name}"
102-
Visibility="Visible">
103-
<StackPanel Orientation="Vertical">
104-
<StackPanel
105-
x:Name="DetailsListHeader"
106-
Margin="8,8,8,0"
107-
Orientation="Vertical"
108-
Spacing="5"
109-
Visibility="Collapsed">
110-
<TextBlock
111-
FontSize="20"
112-
FontWeight="Bold"
113-
HorizontalTextAlignment="Center"
114-
IsTextSelectionEnabled="True"
115-
Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
116-
TextAlignment="Center"
117-
TextWrapping="Wrap" />
118-
<TextBlock
119-
HorizontalAlignment="Stretch"
120-
FontSize="18"
121-
HorizontalTextAlignment="Center"
122-
IsTextSelectionEnabled="True"
123-
Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
124-
TextAlignment="Center"
125-
TextWrapping="Wrap" />
126-
</StackPanel>
127-
<ItemsControl
128-
x:Name="FileDetailsRepeater"
129-
Margin="8"
130-
ItemsSource="{x:Bind ViewModel.SelectedItem.FileDetails, Mode=OneWay}"
131-
Visibility="Collapsed">
132-
<ItemsControl.ItemContainerTransitions>
133-
<TransitionCollection>
134-
<EntranceThemeTransition IsStaggeringEnabled="False" />
135-
</TransitionCollection>
136-
</ItemsControl.ItemContainerTransitions>
137-
<ItemsControl.ItemTemplate>
138-
<DataTemplate x:DataType="properties:FileProperty">
139-
<Grid
140-
Padding="0,0,0,8"
84+
<ScrollViewer
85+
x:Name="RootPropertiesScrollViewer"
86+
Grid.Row="1"
87+
AutomationProperties.Name="{helpers:ResourceString Name=PreviewPaneFileDetails/AutomationProperties/Name}"
88+
Visibility="Visible">
89+
<StackPanel Orientation="Vertical">
90+
<TextBlock
91+
x:Name="DetailsListHeader"
92+
FontSize="20"
93+
FontWeight="Bold"
94+
HorizontalAlignment="Center"
95+
IsTextSelectionEnabled="True"
96+
Text="{x:Bind ViewModel.SelectedItem.Name, Mode=OneWay}"
97+
TextAlignment="Center"
98+
TextWrapping="Wrap"
99+
Visibility="Collapsed" />
100+
101+
<ItemsControl
102+
x:Name="FileDetailsRepeater"
103+
Margin="12"
104+
ItemsSource="{x:Bind ViewModel.SelectedItem.FileDetails, Mode=OneWay}"
105+
Visibility="Collapsed">
106+
<ItemsControl.ItemTemplate>
107+
<DataTemplate x:DataType="properties:FileProperty">
108+
<Grid HorizontalAlignment="Stretch" AutomationProperties.Name="{x:Bind Name, Mode=OneWay}">
109+
<Grid.ColumnDefinitions>
110+
<ColumnDefinition />
111+
<ColumnDefinition />
112+
</Grid.ColumnDefinitions>
113+
<!-- Property -->
114+
<TextBlock
141115
HorizontalAlignment="Stretch"
142-
AutomationProperties.Name="{x:Bind Name, Mode=OneWay}">
143-
<Grid.RowDefinitions>
144-
<RowDefinition />
145-
<RowDefinition />
146-
</Grid.RowDefinitions>
147-
<TextBlock
148-
HorizontalAlignment="Stretch"
149-
Style="{StaticResource BodyTextBlockStyle}"
150-
Text="{x:Bind Name, Mode=OneWay}" />
151-
<TextBlock
152-
x:Name="PropertyValueTemplateTextBox"
153-
Grid.Row="1"
154-
HorizontalAlignment="Stretch"
155-
IsTextSelectionEnabled="True"
156-
Style="{StaticResource CaptionTextBlockStyle}"
157-
Text="{x:Bind ValueText, Mode=TwoWay}"
158-
TextWrapping="Wrap" />
159-
</Grid>
160-
</DataTemplate>
161-
</ItemsControl.ItemTemplate>
162-
</ItemsControl>
163-
</StackPanel>
164-
</ScrollViewer>
165-
</Grid>
116+
MaxLines="2"
117+
Style="{StaticResource BodyTextBlockStyle}"
118+
Text="{x:Bind Name, Mode=OneWay}" />
119+
120+
<!-- Value -->
121+
<TextBox
122+
x:Name="PropertyValueTemplateTextBox"
123+
Grid.Column="1"
124+
HorizontalAlignment="Stretch"
125+
Background="Transparent"
126+
BorderBrush="Transparent"
127+
Text="{x:Bind ValueText, Mode=TwoWay}"
128+
TextWrapping="Wrap" />
129+
</Grid>
130+
</DataTemplate>
131+
</ItemsControl.ItemTemplate>
132+
</ItemsControl>
133+
</StackPanel>
134+
</ScrollViewer>
166135

167136
<VisualStateManager.VisualStateGroups>
168-
<VisualStateGroup>
169-
<VisualState>
170-
<VisualState.StateTriggers>
171-
<triggers:IsEqualStateTrigger Value="{x:Bind Context.IsHorizontal, Mode=OneWay}" To="True" />
172-
</VisualState.StateTriggers>
173-
<VisualState.Setters>
174-
<Setter Target="RootPropertiesGrid.(Grid.Row)" Value="0" />
175-
<Setter Target="RootPropertiesGrid.(Grid.Column)" Value="1" />
176-
<Setter Target="PropertiesRow.MinHeight" Value="0" />
177-
<Setter Target="PropertiesRow.Height" Value="0" />
178-
</VisualState.Setters>
179-
</VisualState>
180-
<VisualState>
181-
<VisualState.StateTriggers>
182-
<triggers:IsEqualStateTrigger Value="{x:Bind Context.IsHorizontal, Mode=OneWay}" To="False" />
183-
</VisualState.StateTriggers>
184-
<VisualState.Setters>
185-
<Setter Target="RootPropertiesGrid.(Grid.Row)" Value="1" />
186-
<Setter Target="RootPropertiesGrid.(Grid.Column)" Value="0" />
187-
<Setter Target="PropertiesColumn.Width" Value="0" />
188-
<Setter Target="PropertiesColumn.MinWidth" Value="0" />
189-
</VisualState.Setters>
190-
</VisualState>
191-
<VisualState />
192-
</VisualStateGroup>
193137
<VisualStateGroup>
194138
<VisualState x:Name="NoItemSelected">
195139
<VisualState.StateTriggers>
@@ -204,7 +148,6 @@
204148
<VisualState.Setters>
205149
<Setter Target="PreviewErrorText.Visibility" Value="Visible" />
206150
<Setter Target="PreviewErrorText.Text" Value="{x:Bind GetLocalizedResource('DetailsPanePreviewNotAvaliableText')}" />
207-
<Setter Target="DetailsErrorText.Visibility" Value="Collapsed" />
208151
<Setter Target="FileDetailsRepeater.Visibility" Value="Visible" />
209152
<Setter Target="DetailsListHeader.Visibility" Value="Visible" />
210153
<Setter Target="PreviewControlPresenter.Visibility" Value="Collapsed" />
@@ -217,8 +160,6 @@
217160
<VisualState.Setters>
218161
<Setter Target="PreviewErrorText.Visibility" Value="Visible" />
219162
<Setter Target="PreviewErrorText.Text" Value="{x:Bind GetLocalizedResource('DetailsPanePreviewNotAvaliableText')}" />
220-
<Setter Target="DetailsErrorText.Visibility" Value="Visible" />
221-
<Setter Target="DetailsErrorText.Text" Value="{x:Bind GetLocalizedResource('PreviewPaneDetailsNotAvailableText')}" />
222163
<Setter Target="FileDetailsRepeater.Visibility" Value="Collapsed" />
223164
<Setter Target="PreviewControlPresenter.Visibility" Value="Collapsed" />
224165
</VisualState.Setters>
@@ -229,7 +170,6 @@
229170
</VisualState.StateTriggers>
230171
<VisualState.Setters>
231172
<Setter Target="PreviewErrorText.Visibility" Value="Collapsed" />
232-
<Setter Target="DetailsErrorText.Visibility" Value="Collapsed" />
233173
<Setter Target="FileDetailsRepeater.Visibility" Value="Visible" />
234174
<Setter Target="PreviewControlPresenter.Visibility" Value="Visible" />
235175
<Setter Target="DetailsListHeader.Visibility" Value="Visible" />
@@ -241,7 +181,6 @@
241181
</VisualState.StateTriggers>
242182
<VisualState.Setters>
243183
<Setter Target="PreviewErrorText.Visibility" Value="Collapsed" />
244-
<Setter Target="DetailsErrorText.Visibility" Value="Collapsed" />
245184
<Setter Target="FileDetailsRepeater.Visibility" Value="Collapsed" />
246185
<Setter Target="DetailsListHeader.Visibility" Value="Visible" />
247186
<Setter Target="PreviewControlPresenter.Visibility" Value="Collapsed" />
@@ -260,10 +199,7 @@
260199
<triggers:IsEqualStateTrigger Value="{x:Bind PaneSettingsService.ShowPreviewOnly, Mode=OneWay}" To="True" />
261200
</VisualState.StateTriggers>
262201
<VisualState.Setters>
263-
<Setter Target="RootPropertiesGrid.Visibility" Value="Collapsed" />
264-
<Setter Target="RootPropertiesGrid.Visibility" Value="Collapsed" />
265-
<Setter Target="RootPreviewGrid.(RowSpan)" Value="2" />
266-
<Setter Target="RootPreviewGrid.(ColumnSpan)" Value="2" />
202+
<Setter Target="RootPropertiesScrollViewer.Visibility" Value="Collapsed" />
267203
</VisualState.Setters>
268204
</VisualState>
269205
</VisualStateGroup>

0 commit comments

Comments
 (0)