Skip to content
Open
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions ios/Classes/PTFlutterDocumentController.m
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ - (void)didOpenDocument

- (BOOL)isTopToolbarEnabled
{
return (!self.topAppNavBarHidden && !self.topToolbarsHidden);
return !self.topToolbarsHidden;
}

- (BOOL)areTopToolbarsEnabled
Expand All @@ -157,6 +157,9 @@ - (BOOL)controlsHidden
{
if (self.navigationController) {
if ([self isTopToolbarEnabled]) {
if (![self isNavigationBarEnabled]) {
return NO;
}
return [self.navigationController isNavigationBarHidden];
}
if ([self isBottomToolbarEnabled]) {
Expand Down Expand Up @@ -1031,10 +1034,12 @@ - (void)applyViewerSettings
}
self.toolManager.pencilTool = self.useStylusAsPen ? pencilTool : [PTPanTool class];

const BOOL hideNav = (self.topAppNavBarHidden || self.topToolbarsHidden);
self.controlsHidden = hideNav;
const BOOL hideTopToolbars = self.topToolbarsHidden;
self.controlsHidden = hideTopToolbars;

const BOOL translucent = hideNav;
const BOOL hideTopAppNavBar = (self.topAppNavBarHidden || self.topToolbarsHidden);
const BOOL translucent = hideTopAppNavBar;
[self.navigationController setNavigationBarHidden:hideTopAppNavBar animated:NO];
self.navigationController.navigationBar.translucent = translucent;
self.thumbnailSliderController.toolbar.translucent = translucent;

Expand Down Expand Up @@ -1917,7 +1922,7 @@ - (void)setLeadingNavButtonIcon:(NSString *)leadingNavButtonIcon
- (BOOL)shouldSetNavigationBarHidden:(BOOL)navigationBarHidden animated:(BOOL)animated
{
if (!navigationBarHidden) {
return [self isTopToolbarEnabled];
return [self isNavigationBarEnabled] && !self.topToolbarsHidden;
}
return YES;
Comment thread
eslamwael74 marked this conversation as resolved.
}
Expand Down
Loading