diff --git a/Frameworks/FileBrowser/src/OFB/OFBActionsView.mm b/Frameworks/FileBrowser/src/OFB/OFBActionsView.mm index 02c430e8..c4fa28c3 100644 --- a/Frameworks/FileBrowser/src/OFB/OFBActionsView.mm +++ b/Frameworks/FileBrowser/src/OFB/OFBActionsView.mm @@ -65,13 +65,8 @@ static NSButton* OakCreateImageButton (NSImage* image) [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-8-[create]-8-[divider(==1)]-8-[actions(==31)]-(>=8)-[reload]-4-[search]-4-[favorites]-4-[scm]-(12)-|" options:NSLayoutFormatAlignAllCenterY metrics:nil views:views]]; [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[topDivider]|" options:0 metrics:nil views:views]]; - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[topDivider(==1)]-4-[divider]-5-|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[topDivider(==1)]-4-[divider(==15)]-5-|" options:0 metrics:nil views:views]]; } return self; } - -- (NSSize)intrinsicContentSize -{ - return NSMakeSize(NSViewNoIntrinsicMetric, 25); -} @end diff --git a/Frameworks/FileBrowser/src/OFB/OFBHeaderView.mm b/Frameworks/FileBrowser/src/OFB/OFBHeaderView.mm index 8c5bf11c..2a5db5f9 100644 --- a/Frameworks/FileBrowser/src/OFB/OFBHeaderView.mm +++ b/Frameworks/FileBrowser/src/OFB/OFBHeaderView.mm @@ -59,13 +59,8 @@ static NSPopUpButton* OakCreateFolderPopUpButton () [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(-3)-[folder(>=75)]-(3)-[divider(==1)]-(2)-[back(==22)]-(2)-[forward(==back)]-(3)-|" options:NSLayoutFormatAlignAllCenterY metrics:nil views:views]]; [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[bottomDivider]|" options:0 metrics:nil views:views]]; - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(4)-[divider(==15@250)]-(4)-[bottomDivider(==1)]|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(4)-[divider(==15)]-(4)-[bottomDivider(==1)]|" options:0 metrics:nil views:views]]; } return self; } - -- (NSSize)intrinsicContentSize -{ - return NSMakeSize(NSViewNoIntrinsicMetric, 24); -} @end diff --git a/Frameworks/HTMLOutput/src/browser/HOStatusBar.mm b/Frameworks/HTMLOutput/src/browser/HOStatusBar.mm index 28f9c122..99b3acec 100644 --- a/Frameworks/HTMLOutput/src/browser/HOStatusBar.mm +++ b/Frameworks/HTMLOutput/src/browser/HOStatusBar.mm @@ -87,11 +87,6 @@ static NSTextField* OakCreateTextField () return self; } -- (NSSize)intrinsicContentSize -{ - return NSMakeSize(NSViewNoIntrinsicMetric, 25); -} - - (void)updateConstraints { if(_layoutConstraints) @@ -110,7 +105,7 @@ static NSTextField* OakCreateTextField () }; NSArray* layout = @[ - @"H:|[topDivider]|", @"V:|[topDivider(==1)]-4-[divider]-5-|", @"V:[status]-5-|" + @"H:|[topDivider]|", @"V:|[topDivider(==1)]-4-[divider(==15)]-5-|", @"V:[status]-5-|" ]; for(NSString* str in layout) diff --git a/Frameworks/OakTextView/src/OTVStatusBar.mm b/Frameworks/OakTextView/src/OTVStatusBar.mm index db2fb2b5..5287c570 100644 --- a/Frameworks/OakTextView/src/OTVStatusBar.mm +++ b/Frameworks/OakTextView/src/OTVStatusBar.mm @@ -154,7 +154,7 @@ static NSButton* OakCreateImageToggleButton (NSImage* image, NSString* accessibi // Center non-text control [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:[selection]-(>=1)-[dividerOne]-(>=1)-[dividerTwo]-(>=1)-[dividerThree]-(>=1)-[items]-(>=1)-[dividerFour]-(>=1)-[dividerFive]-(>=1)-[recording]" options:NSLayoutFormatAlignAllCenterY metrics:nil views:views]]; - [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-5-[dividerOne(==15@250,==dividerTwo,==dividerThree,==dividerFour,==dividerFive)]-5-|" options:0 metrics:nil views:views]]; + [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-5-[dividerOne(==15,==dividerTwo,==dividerThree,==dividerFour,==dividerFive)]-5-|" options:0 metrics:nil views:views]]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(grammarPopUpButtonWillPopUp:) name:NSPopUpButtonWillPopUpNotification object:self.grammarPopUp]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(bundleItemsPopUpButtonWillPopUp:) name:NSPopUpButtonWillPopUpNotification object:self.bundleItemsPopUp]; @@ -187,11 +187,6 @@ static NSButton* OakCreateImageToggleButton (NSImage* image, NSString* accessibi [self setupTabSizeMenu:self]; } -- (NSSize)intrinsicContentSize -{ - return NSMakeSize(NSViewNoIntrinsicMetric, 25); -} - - (void)updateMacroRecordingAnimation:(NSTimer*)aTimer { CGFloat fraction = std::clamp(0.70 + 0.30 * cos(M_PI + _recordingTime), 0.00, 1.0);