Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'hotfix/1.9.8' into master

Browse source
This commit is contained in:
ismailgulek 2022-10-13 13:28:25 +03:00
parent 7f48870521
commit 9b489db992
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Riot/Categories/UIViewController+RiotSearch.m
View file

@ -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;

10
Riot/Modules/Common/SwiftUI/VectorHostingController.swift
View file

@ -88,9 +88,13 @@ class VectorHostingController: UIHostingController<AnyView> {
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
if let navigationController = navigationController, navigationController.isNavigationBarHidden != isNavigationBarHidden {
navigationController.isNavigationBarHidden = isNavigationBarHidden
}
guard
let navigationController = navigationController,
navigationController.topViewController == self,
navigationController.isNavigationBarHidden != isNavigationBarHidden
else { return }
navigationController.isNavigationBarHidden = isNavigationBarHidden
}
override func viewDidLayoutSubviews() {

1
changelog.d/6762.bugfix Normal file
View file

@ -0,0 +1 @@
Element freezes after searching in a room.

1
changelog.d/6833.bugfix Normal file
View file

@ -0,0 +1 @@
All Chats: Fix a header glitch when aborting a pop gesture.