File tree Expand file tree Collapse file tree 3 files changed +7
-8
lines changed Expand file tree Collapse file tree 3 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ public static IShellPage CurrentInstance
40
40
}
41
41
set
42
42
{
43
- if ( value != currentInstance )
43
+ if ( value != currentInstance && value != null )
44
44
{
45
45
currentInstance = value ;
46
46
}
Original file line number Diff line number Diff line change 1849
1849
Height =" 32.5"
1850
1850
Padding =" 2.5,0,0,0"
1851
1851
HorizontalAlignment =" Stretch"
1852
- VerticalAlignment =" Stretch "
1852
+ VerticalAlignment =" Center "
1853
1853
BorderBrush =" {ThemeResource TextBoxBorderThemeBrush}"
1854
1854
BorderThickness =" 1"
1855
1855
CornerRadius =" 2"
1867
1867
x : Name =" PathViewInteract"
1868
1868
x : FieldModifier =" public"
1869
1869
Margin =" 0"
1870
- VerticalAlignment =" Center "
1870
+ VerticalAlignment =" Stretch "
1871
1871
HorizontalContentAlignment =" Stretch"
1872
1872
VerticalContentAlignment =" Stretch"
1873
1873
Background =" {ThemeResource TextControlBackground}"
1874
1874
CanReorderItems =" False"
1875
1875
IsItemClickEnabled =" True"
1876
1876
ItemClick =" PathViewInteract_ItemClick"
1877
1877
ItemContainerStyle =" {StaticResource ListViewItemContainerStyle_NoRevealBorder}"
1878
- ItemsSource =" {x:Bind local:App.CurrentInstance.PathComponents}"
1878
+ ItemsSource =" {x:Bind local:App.CurrentInstance.PathComponents, Mode=OneWay }"
1879
1879
ScrollViewer.HorizontalScrollBarVisibility=" Auto"
1880
1880
ScrollViewer.HorizontalScrollMode=" Enabled"
1881
1881
ScrollViewer.VerticalScrollBarVisibility=" Disabled"
Original file line number Diff line number Diff line change @@ -130,6 +130,8 @@ public ProHome()
130
130
App . AppSettings . DrivesManager . ShowUserConsentOnInit = false ;
131
131
DisplayFilesystemConsentDialog ( ) ;
132
132
}
133
+
134
+ App . CurrentInstance = this as IShellPage ;
133
135
}
134
136
135
137
private async void DisplayFilesystemConsentDialog ( )
@@ -150,10 +152,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
150
152
151
153
private void Page_Loaded ( object sender , RoutedEventArgs e )
152
154
{
153
- if ( App . CurrentInstance == null && ItemViewModel . GetCurrentSelectedTabInstance < ProHome > ( ) . Equals ( this ) )
154
- {
155
- App . CurrentInstance = this as IShellPage ;
156
- }
155
+
157
156
158
157
viewModel = new ItemViewModel ( ) ;
159
158
interactionOperation = new Interaction ( ) ;
You can’t perform that action at this time.
0 commit comments