Skip to content

Fix right pane being always loaded #7376

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 1 commit into from
Dec 29, 2021
Merged

Fix right pane being always loaded #7376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 20 additions & 26 deletions src/Files/Views/PaneHolderPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,38 +60,32 @@
Width="0"
MinWidth="0" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>

<local:ModernShellPage
x:Name="PaneLeft"
Grid.Row="1"
BorderBrush="{ThemeResource ControlStrokeColorDefault}"
ContentChanged="Pane_ContentChanged"
CurrentInstanceBorderThickness="0,0,0,1"
IsPageMainPane="True"
Loaded="PaneLeft_Loaded"
NavParams="{x:Bind NavParamsLeft, Mode=OneWay}"
PaneHolder="{x:Bind}" />
<Border x:Name="PaneLeftBorder">
<local:ModernShellPage
x:Name="PaneLeft"
ContentChanged="Pane_ContentChanged"
IsPageMainPane="True"
Loaded="PaneLeft_Loaded"
NavParams="{x:Bind NavParamsLeft, Mode=OneWay}"
PaneHolder="{x:Bind}" />
</Border>

<local:ModernShellPage
x:Name="PaneRight"
Grid.Row="1"
<Border
x:Name="PaneRightBorder"
Grid.Column="1"
x:Load="{x:Bind IsRightPaneVisible, Mode=OneWay}"
BorderBrush="{ThemeResource ControlStrokeColorDefault}"
ContentChanged="Pane_ContentChanged"
CurrentInstanceBorderThickness="0,0,0,1"
IsPageMainPane="False"
Loaded="PaneRight_Loaded"
NavParams="{x:Bind NavParamsRight, Mode=OneWay}"
PaneHolder="{x:Bind}" />
x:Load="{x:Bind IsRightPaneVisible, Mode=OneWay}">
<local:ModernShellPage
x:Name="PaneRight"
ContentChanged="Pane_ContentChanged"
IsPageMainPane="False"
Loaded="PaneRight_Loaded"
NavParams="{x:Bind NavParamsRight, Mode=OneWay}"
PaneHolder="{x:Bind}" />
</Border>

<Custom:GridSplitter
x:Name="PaneResizer"
Grid.Row="1"
Grid.Column="1"
Width="5"
MinWidth="5"
Expand Down
2 changes: 1 addition & 1 deletion src/Files/Views/PaneHolderPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ private void Pane_ContentChanged(object sender, TabItemArguments e)
InitialPageType = typeof(PaneHolderPage),
NavigationArg = new PaneNavigationArguments()
{
LeftPaneNavPathParam = e.NavigationArg as string ?? PaneLeft.TabItemArguments?.NavigationArg as string,
LeftPaneNavPathParam = e?.NavigationArg as string ?? PaneLeft.TabItemArguments?.NavigationArg as string,
RightPaneNavPathParam = IsRightPaneVisible ? PaneRight?.TabItemArguments?.NavigationArg as string : null
}
};
Expand Down