Revision: 28837
http://sourceforge.net/p/bibdesk/svn/28837
Author: hofman
Date: 2024-03-12 10:20:08 +0000 (Tue, 12 Mar 2024)
Log Message:
-----------
Add outlets for status bar control constraints
Modified Paths:
--------------
trunk/bibdesk/Base.lproj/BibDocument.xib
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument.m
trunk/bibdesk/BibDocument_UI.m
Modified: trunk/bibdesk/Base.lproj/BibDocument.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BibDocument.xib 2024-03-12 10:07:18 UTC (rev
28836)
+++ trunk/bibdesk/Base.lproj/BibDocument.xib 2024-03-12 10:20:08 UTC (rev
28837)
@@ -21,6 +21,7 @@
<outlet property="groupActionMenuButton" destination="872"
id="877"/>
<outlet property="groupAddButton" destination="101666"
id="101676"/>
<outlet property="groupButtonView" destination="101741"
id="101742"/>
+ <outlet property="groupButtonViewWidthConstraint"
destination="7QF-9x-IzU" id="ABc-X2-aZr"/>
<outlet property="groupFieldMenu" destination="101632"
id="101637"/>
<outlet property="groupMenu" destination="819" id="876"/>
<outlet property="groupOutlineView" destination="101527"
id="101535"/>
@@ -33,6 +34,7 @@
<outlet property="sideFileView" destination="101234"
id="101240"/>
<outlet property="sidePreviewButton" destination="101673"
id="101679"/>
<outlet property="sidePreviewButtonView"
destination="wyF-ch-LiL" id="uD2-1M-dtX"/>
+ <outlet property="sidePreviewButtonViewWidthConstraint"
destination="60d-JF-gyX" id="4Ie-A2-gGT"/>
<outlet property="sidePreviewTabView" destination="101224"
id="101259"/>
<outlet property="sidePreviewTextView" destination="101230"
id="101238"/>
<outlet property="splitView" destination="101581" id="101590"/>
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2024-03-12 10:07:18 UTC (rev 28836)
+++ trunk/bibdesk/BibDocument.h 2024-03-12 10:20:08 UTC (rev 28837)
@@ -154,6 +154,7 @@
NSView *groupButtonView;
NSMenu *groupFieldMenu;
NSMutableArray *groupSpinners;
+ NSLayoutConstraint *groupButtonViewWidthConstraint;
#pragma mark Side preview variables
@@ -163,6 +164,7 @@
NSSegmentedControl *sidePreviewButton;
NSView *sidePreviewButtonView;
+ NSLayoutConstraint *sidePreviewButtonViewWidthConstraint;
NSMenu *sideTemplatePreviewMenu;
BDSKPreviewDisplay sidePreviewDisplay;
@@ -313,6 +315,7 @@
@property (nonatomic, strong) IBOutlet NSPopUpButton *groupActionButton;
@property (nonatomic, strong) IBOutlet NSPopUpButton *groupAddButton;
@property (nonatomic, strong) IBOutlet NSView *groupButtonView;
+@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*groupButtonViewWidthConstraint;
@property (nonatomic, strong) IBOutlet NSMenu *groupFieldMenu;
@property (nonatomic, strong) IBOutlet NSTabView *sidePreviewTabView;
@property (nonatomic, strong) IBOutlet NSTextView *sidePreviewTextView;
@@ -319,6 +322,7 @@
@property (nonatomic, strong) IBOutlet FVFileView *sideFileView;
@property (nonatomic, strong) IBOutlet NSSegmentedControl *sidePreviewButton;
@property (nonatomic, strong) IBOutlet NSView *sidePreviewButtonView;
+@property (nonatomic, strong) IBOutlet NSLayoutConstraint
*sidePreviewButtonViewWidthConstraint;
@property (nonatomic, strong) IBOutlet NSTabView *bottomPreviewTabView;
@property (nonatomic, strong) IBOutlet NSTextView *bottomPreviewTextView;
@property (nonatomic, strong) IBOutlet FVFileView *bottomFileView;
Modified: trunk/bibdesk/BibDocument.m
===================================================================
--- trunk/bibdesk/BibDocument.m 2024-03-12 10:07:18 UTC (rev 28836)
+++ trunk/bibdesk/BibDocument.m 2024-03-12 10:20:08 UTC (rev 28837)
@@ -186,7 +186,7 @@
@implementation BibDocument
-@synthesize documentWindow, tableView, mainScrollView, splitView, mainBox,
mainView, controlContentView, statusBar, groupOutlineView, groupSplitView,
groupActionButton, groupAddButton, groupButtonView, groupFieldMenu,
sidePreviewTabView, sidePreviewTextView, sideFileView, sidePreviewButton,
sidePreviewButtonView, bottomPreviewTabView, bottomPreviewTextView,
bottomFileView, bottomPreviewButton, actionMenuButton, groupActionMenuButton,
searchField, groupMenu, actionMenu, alternateCopyMenu, sharingMenu,
publications, shownPublications, groups, documentInfo, macroResolver, basePath,
openDate;
+@synthesize documentWindow, tableView, mainScrollView, splitView, mainBox,
mainView, controlContentView, statusBar, groupOutlineView, groupSplitView,
groupActionButton, groupAddButton, groupButtonView,
groupButtonViewWidthConstraint, groupFieldMenu, sidePreviewTabView,
sidePreviewTextView, sideFileView, sidePreviewButton, sidePreviewButtonView,
sidePreviewButtonViewWidthConstraint, bottomPreviewTabView,
bottomPreviewTextView, bottomFileView, bottomPreviewButton, actionMenuButton,
groupActionMenuButton, searchField, groupMenu, actionMenu, alternateCopyMenu,
sharingMenu, publications, shownPublications, groups, documentInfo,
macroResolver, basePath, openDate;
@dynamic mainDocument, atomData, MODSData, endNoteData, wordXMLData,
numberOfSelectedPubs, numberOfClickedOrSelectedPubs, selectedPublications,
clickedOrSelectedPublications, singleSelectedPublication, selectedFileURLs,
clickedOrSelectedFileURLs, selectedRemoteURLs, clickedOrSelectedRemoteURLs,
documentStringEncoding, sharingServices;
+ (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key {
Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m 2024-03-12 10:07:18 UTC (rev 28836)
+++ trunk/bibdesk/BibDocument_UI.m 2024-03-12 10:20:08 UTC (rev 28837)
@@ -1152,8 +1152,6 @@
NSArray *subviews = [groupSplitView subviews];
BOOL isLeftHidden = [groupSplitView isSubviewCollapsed:[subviews
firstObject]];
BOOL isRightHidden = [groupSplitView isSubviewCollapsed:[subviews
lastObject]];
- NSLayoutConstraint *leftConstraint = [groupButtonView
constraintWithFirstItem:groupButtonView firstAttribute:NSLayoutAttributeWidth];
- NSLayoutConstraint *rightConstraint = [sidePreviewButtonView
constraintWithFirstItem:sidePreviewButtonView
firstAttribute:NSLayoutAttributeWidth];
CGFloat width;
if (aNotification == nil)
[statusBar layoutSubtreeIfNeeded];
@@ -1160,10 +1158,10 @@
[groupButtonView setHidden:isLeftHidden];
[sidePreviewButtonView setHidden:isRightHidden];
width = isLeftHidden ? 7.0 : fmax(7.0, NSWidth([[subviews firstObject]
frame]));
- [leftConstraint setConstant:width];
+ [groupButtonViewWidthConstraint setConstant:width];
[statusBar setLeftMargin:width + [bottomPreviewButton
fittingSize].width + 8.0];
width = isRightHidden ? 7.0 : fmax(7.0, NSWidth([[subviews lastObject]
frame]));
- [rightConstraint setConstant:width];
+ [sidePreviewButtonViewWidthConstraint setConstant:width];
[statusBar setRightMargin:width + 8.0];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
