From 89268ef88ec5f369a8712113eb9cc6e1294eff75 Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Fri, 3 Dec 2021 20:43:21 +0100 Subject: [PATCH] Made scrollview in groups inspector tab actually work --- MacPass/Base.lproj/DatabaseSettingsWindow.xib | 4 +- MacPass/Base.lproj/GroupInspectorView.xib | 315 +++++++++--------- MacPass/MPGroupInspectorViewController.m | 6 +- 3 files changed, 169 insertions(+), 156 deletions(-) diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib index 1561ca77..f6dbceae 100644 --- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib +++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib @@ -84,7 +84,7 @@ Gw - + @@ -421,7 +421,7 @@ Gw - + diff --git a/MacPass/Base.lproj/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib index f13aa10c..504fdb3c 100644 --- a/MacPass/Base.lproj/GroupInspectorView.xib +++ b/MacPass/Base.lproj/GroupInspectorView.xib @@ -1,8 +1,8 @@ - + - + @@ -21,166 +21,179 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - @@ -193,7 +206,7 @@ - + diff --git a/MacPass/MPGroupInspectorViewController.m b/MacPass/MPGroupInspectorViewController.m index 986c4632..ed13bccd 100644 --- a/MacPass/MPGroupInspectorViewController.m +++ b/MacPass/MPGroupInspectorViewController.m @@ -62,17 +62,17 @@ scrollView.showBottomShadow = NO; scrollView.hasVerticalRuler = YES; scrollView.drawsBackground = NO; - scrollView.translatesAutoresizingMaskIntoConstraints = NO; + /*scrollView.translatesAutoresizingMaskIntoConstraints = NO; NSView *clipView = scrollView.contentView; - scrollView.documentView = self.contentView; + //scrollView.documentView = self.contentView; NSDictionary *views = NSDictionaryOfVariableBindings(_contentView); [clipView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[_contentView]|" options:0 metrics:nil views:views]]; - [self.view layoutSubtreeIfNeeded]; + [self.view layoutSubtreeIfNeeded];*/ NSMenu *autotypeMenu = self.autotypePopupButton.menu; NSMenuItem *inheritAutotype = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"AUTOTYPE_INHERIT", "Inherit autotype settings menu item") action:NULL keyEquivalent:@""];