diff --git a/VoidLink/Base.lproj/iPad.storyboard b/VoidLink/Base.lproj/iPad.storyboard index 2aae85ee..97b827ae 100644 --- a/VoidLink/Base.lproj/iPad.storyboard +++ b/VoidLink/Base.lproj/iPad.storyboard @@ -3171,7 +3171,7 @@ - + @@ -3221,12 +3221,13 @@ + - + diff --git a/VoidLink/Input/StreamView.m b/VoidLink/Input/StreamView.m index 90f597c8..f88a3316 100644 --- a/VoidLink/Input/StreamView.m +++ b/VoidLink/Input/StreamView.m @@ -373,6 +373,11 @@ static const double X1_MOUSE_SPEED_DIVISOR = 2.5; UIBarButtonItem *flexibleSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil]; [customToolbarView setItems:[NSArray arrayWithObjects:doneBarButton, windowsBarButton, escapeBarButton, tabBarButton, shiftBarButton, controlBarButton, altBarButton, deleteBarButton, flexibleSpace, nil]]; + if (@available(iOS 26.0, *)) { + for(UIBarButtonItem *button in customToolbarView.items){ + button.hidesSharedBackground = true; + } + } keyInputField.inputAccessoryView = customToolbarView; } #endif diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m b/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m index 8b186332..4206468c 100644 --- a/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m +++ b/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m @@ -20,9 +20,11 @@ const double NAV_BAR_HEIGHT = 50; @interface OSCProfilesTableViewController () +@property (weak, nonatomic) IBOutlet UINavigationItem *profileTableViewNavigationItem; @end + @implementation OSCProfilesTableViewController { OSCProfilesManager *profilesManager; } @@ -70,6 +72,11 @@ const double NAV_BAR_HEIGHT = 50; self.profileTableViewNavigationBar.layer.masksToBounds = true; // 使圆角生效 self.profileTableViewNavigationBar.layer.mask = maskLayer; + if (GenericUtils.liquidGlassEnabled) { + if (@available(iOS 13.0, *)) { + self.profileTableViewNavigationBar.layer.backgroundColor = UIColor.systemFillColor.CGColor; + } + } self.tableView.layer.cornerRadius = 15; // 设置圆角半径 self.tableView.layer.masksToBounds = true; // 使圆角生效 @@ -101,6 +108,17 @@ const double NAV_BAR_HEIGHT = 50; tap.delegate = (id)self; [self.view addGestureRecognizer:tap]; + + if(GenericUtils.liquidGlassEnabled){ + if (@available(iOS 26.0, *)) { + for(UIBarButtonItem* button in self.profileTableViewNavigationItem.leftBarButtonItems){ + button.hidesSharedBackground = true; + } + for(UIBarButtonItem* button in self.profileTableViewNavigationItem.rightBarButtonItems){ + button.hidesSharedBackground = true; + } + } + } } - (void)dismissSelf {