mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Merge branch 'hotfix/1.9.8' into develop
This commit is contained in:
commit
ff8d3df86a
4 changed files with 17 additions and 6 deletions
|
@ -89,8 +89,12 @@
|
|||
self.navigationItem.leftBarButtonItem = nil;
|
||||
|
||||
// Add the search bar
|
||||
self.navigationItem.titleView = self.searchBar;
|
||||
UIView *searchBarContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44)];
|
||||
searchBarContainer.backgroundColor = [UIColor clearColor];
|
||||
searchBarContainer.autoresizingMask = UIViewAutoresizingFlexibleWidth;
|
||||
|
||||
self.navigationItem.titleView = searchBarContainer;
|
||||
[searchBarContainer addSubview:self.searchBar];
|
||||
self.extendedLayoutIncludesOpaqueBars = YES;
|
||||
|
||||
// On iPad, there is no cancel button inside the UISearchBar
|
||||
|
@ -177,8 +181,9 @@
|
|||
// Initialise internal data at the first call
|
||||
searchInternals = [[UIViewControllerRiotSearchInternals alloc] init];
|
||||
|
||||
UISearchBar *searchBar = [[UISearchBar alloc] init];
|
||||
UISearchBar *searchBar = [[UISearchBar alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 44)];
|
||||
searchBar.showsCancelButton = YES;
|
||||
searchBar.autoresizingMask = UIViewAutoresizingFlexibleWidth;
|
||||
searchBar.delegate = (id<UISearchBarDelegate>)self;
|
||||
searchInternals.searchBar = searchBar;
|
||||
|
||||
|
|
|
@ -88,10 +88,14 @@ class VectorHostingController: UIHostingController<AnyView> {
|
|||
override func viewWillLayoutSubviews() {
|
||||
super.viewWillLayoutSubviews()
|
||||
|
||||
if let navigationController = navigationController, navigationController.isNavigationBarHidden != isNavigationBarHidden {
|
||||
guard
|
||||
let navigationController = navigationController,
|
||||
navigationController.topViewController == self,
|
||||
navigationController.isNavigationBarHidden != isNavigationBarHidden
|
||||
else { return }
|
||||
|
||||
navigationController.isNavigationBarHidden = isNavigationBarHidden
|
||||
}
|
||||
}
|
||||
|
||||
override func viewDidLayoutSubviews() {
|
||||
super.viewDidLayoutSubviews()
|
||||
|
|
1
changelog.d/6762.bugfix
Normal file
1
changelog.d/6762.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Element freezes after searching in a room.
|
1
changelog.d/6833.bugfix
Normal file
1
changelog.d/6833.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
All Chats: Fix a header glitch when aborting a pop gesture.
|
Loading…
Reference in a new issue