Revision: 26001
http://sourceforge.net/p/bibdesk/svn/26001
Author: hofman
Date: 2021-05-18 16:32:20 +0000 (Tue, 18 May 2021)
Log Message:
-----------
outlets for constraints we set
Modified Paths:
--------------
trunk/bibdesk/BDSKConditionController.h
trunk/bibdesk/BDSKConditionController.m
trunk/bibdesk/Base.lproj/BDSKCondition.xib
Modified: trunk/bibdesk/BDSKConditionController.h
===================================================================
--- trunk/bibdesk/BDSKConditionController.h 2021-05-18 16:17:51 UTC (rev
26000)
+++ trunk/bibdesk/BDSKConditionController.h 2021-05-18 16:32:20 UTC (rev
26001)
@@ -64,6 +64,9 @@
NSView *valueView;
NSButton *addButton;
NSButton *removeButton;
+ NSLayoutConstraint *comparisonWidthConstraint;
+ NSLayoutConstraint *valueWidthConstraint;
+ NSLayoutConstraint *stringvalueWidthConstraint;
NSArray *retainedViews;
BDSKFilterController *filterController;
NSArray *keys;
@@ -91,6 +94,9 @@
@property (nonatomic, assign) IBOutlet NSView *valueView;
@property (nonatomic, assign) IBOutlet NSButton *addButton;
@property (nonatomic, assign) IBOutlet NSButton *removeButton;
+@property (nonatomic, assign) IBOutlet NSLayoutConstraint
*comparisonWidthConstraint;
+@property (nonatomic, assign) IBOutlet NSLayoutConstraint
*valueWidthConstraint;
+@property (nonatomic, assign) IBOutlet NSLayoutConstraint
*stringvalueWidthConstraint;
- (id)initWithCondition:(BDSKCondition *)aCondition;
Modified: trunk/bibdesk/BDSKConditionController.m
===================================================================
--- trunk/bibdesk/BDSKConditionController.m 2021-05-18 16:17:51 UTC (rev
26000)
+++ trunk/bibdesk/BDSKConditionController.m 2021-05-18 16:32:20 UTC (rev
26001)
@@ -60,7 +60,7 @@
@implementation BDSKConditionController
-@synthesize objectController, keyComboBox, comparisonPopUp,
attachmentComparisonPopUp, dateComparisonPopUp, valueTextField, countTextField,
numberTextField, andNumberTextField, dateTextField, toDateTextField, agoText,
periodPopUp, booleanButton, triStateButton, ratingButton, colorWell,
comparisonView, valueView, addButton, removeButton, filterController, keys;
+@synthesize objectController, keyComboBox, comparisonPopUp,
attachmentComparisonPopUp, dateComparisonPopUp, valueTextField, countTextField,
numberTextField, andNumberTextField, dateTextField, toDateTextField, agoText,
periodPopUp, booleanButton, triStateButton, ratingButton, colorWell,
comparisonView, valueView, addButton, removeButton, comparisonWidthConstraint,
valueWidthConstraint, stringvalueWidthConstraint, filterController, keys;
@dynamic condition;
+ (void)initialize
@@ -103,21 +103,6 @@
[super dealloc];
}
-static inline CGFloat largestWidth(NSArray *views) {
- CGFloat width = 0.0;
- for (NSView *view in views)
- width = fmax(width, [[view superview] fittingSize].width);
- return width;
-}
-
-static inline NSLayoutConstraint *widthConstraint(NSView *view) {
- for (NSLayoutConstraint *constraint in [view constraints]) {
- if ([constraint firstAttribute] == NSLayoutAttributeWidth)
- return constraint;
- }
- return nil;
-}
-
- (void)loadView {
[super loadView];
@@ -144,11 +129,15 @@
[fieldFormatter setKnownFieldNames:keys];
[keyComboBox setFormatter:fieldFormatter];
- CGFloat width = largestWidth([NSArray arrayWithObjects:comparisonPopUp,
dateComparisonPopUp, attachmentComparisonPopUp, nil]);
- [widthConstraint(comparisonView) setConstant:width];
- width = largestWidth([NSArray arrayWithObjects:[numberTextField
superview], [dateTextField superview], [colorWell superview], nil]);
- [widthConstraint(valueView) setConstant:width];
- [widthConstraint([valueTextField superview]) setConstant:width];
+ CGFloat width = 0.0;
+ for (NSView *view in [NSArray arrayWithObjects:comparisonPopUp,
dateComparisonPopUp, attachmentComparisonPopUp, nil])
+ width = fmax(width, [[view superview] fittingSize].width);
+ [comparisonWidthConstraint setConstant:width];
+ width = 0.0;
+ for (NSView *view in [NSArray arrayWithObjects:[numberTextField
superview], [dateTextField superview], [colorWell superview], nil])
+ width = fmax(width, [[view superview] fittingSize].width);
+ [valueWidthConstraint setConstant:width];
+ [stringvalueWidthConstraint setConstant:width];
[self layoutComparisonControls];
[self layoutValueControls];
Modified: trunk/bibdesk/Base.lproj/BDSKCondition.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BDSKCondition.xib 2021-05-18 16:17:51 UTC (rev
26000)
+++ trunk/bibdesk/Base.lproj/BDSKCondition.xib 2021-05-18 16:32:20 UTC (rev
26001)
@@ -17,6 +17,7 @@
<outlet property="colorWell" destination="bjW-G5-P4U"
id="Ggu-7C-DOu"/>
<outlet property="comparisonPopUp" destination="225" id="238"/>
<outlet property="comparisonView" destination="0gC-VL-mI4"
id="fa2-qW-DRm"/>
+ <outlet property="comparisonWidthConstraint"
destination="YRk-AL-o36" id="4pI-zP-IuT"/>
<outlet property="countTextField" destination="371" id="374"/>
<outlet property="dateComparisonPopUp" destination="208"
id="237"/>
<outlet property="dateTextField" destination="201" id="240"/>
@@ -26,10 +27,12 @@
<outlet property="periodPopUp" destination="188" id="244"/>
<outlet property="ratingButton" destination="320" id="321"/>
<outlet property="removeButton" destination="270" id="288"/>
+ <outlet property="stringvalueWidthConstraint"
destination="oVe-Bn-vmA" id="lZN-4U-6zD"/>
<outlet property="toDateTextField" destination="197" id="241"/>
<outlet property="triStateButton" destination="315" id="318"/>
<outlet property="valueTextField" destination="206" id="239"/>
<outlet property="valueView" destination="z1V-0e-oWA"
id="yNt-gu-Zmr"/>
+ <outlet property="valueWidthConstraint"
destination="khh-IA-HtI" id="EOg-9E-mDV"/>
<outlet property="view" destination="1Np-fm-P1q"
id="6Hv-v3-PMP"/>
</connections>
</customObject>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
