Revision: 28839 http://sourceforge.net/p/bibdesk/svn/28839 Author: hofman Date: 2024-03-12 17:18:58 +0000 (Tue, 12 Mar 2024) Log Message: ----------- set bottom constraint for status bar in ivar
Modified Paths: -------------- trunk/bibdesk/BDSKStatusBar.h trunk/bibdesk/BDSKStatusBar.m trunk/bibdesk/Base.lproj/BDSKEditor.xib trunk/bibdesk/Base.lproj/BDSKFindPanel.xib trunk/bibdesk/Base.lproj/BibDocument.xib Modified: trunk/bibdesk/BDSKStatusBar.h =================================================================== --- trunk/bibdesk/BDSKStatusBar.h 2024-03-12 10:46:33 UTC (rev 28838) +++ trunk/bibdesk/BDSKStatusBar.h 2024-03-12 17:18:58 UTC (rev 28839) @@ -61,6 +61,7 @@ NSMutableArray *icons; NSLayoutConstraint *leadingConstraint; NSLayoutConstraint *trailingConstraint; + NSLayoutConstraint *bottomConstraint; NSLayoutConstraint *progressTrailingConstraint; __weak id<BDSKStatusBarDelegate> delegate; CGFloat leftMargin; @@ -70,6 +71,8 @@ - (void)toggleBelowView:(NSView *)view animate:(BOOL)animate; +@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint; + @property (nonatomic, readonly, getter=isVisible) BOOL visible; @property (nonatomic, strong) NSString *stringValue; Modified: trunk/bibdesk/BDSKStatusBar.m =================================================================== --- trunk/bibdesk/BDSKStatusBar.m 2024-03-12 10:46:33 UTC (rev 28838) +++ trunk/bibdesk/BDSKStatusBar.m 2024-03-12 17:18:58 UTC (rev 28839) @@ -64,7 +64,7 @@ @implementation BDSKStatusBar -@synthesize leftMargin, rightMargin, progressIndicator, delegate; +@synthesize leftMargin, rightMargin, progressIndicator, delegate, bottomConstraint; @dynamic visible, stringValue, font, progressIndicatorStyle, progressIndicatorValue, iconIdentifiers; - (instancetype)initWithFrame:(NSRect)frame { @@ -158,7 +158,7 @@ NSView *contentView = [view superview]; BOOL visible = (nil == [self superview]); NSView *bottomView = visible ? view : self; - NSLayoutConstraint *bottomConstraint = [contentView constraintWithSecondItem:bottomView secondAttribute:NSLayoutAttributeBottom]; + //NSLayoutConstraint *bottomConstraint = [contentView constraintWithSecondItem:bottomView secondAttribute:NSLayoutAttributeBottom]; CGFloat statusHeight = NSHeight([self frame]); NSMutableArray *constraints = [NSMutableArray array]; @@ -190,6 +190,7 @@ [[self window] setContentBorderThickness:0.0 forEdge:NSMinYEdge]; [self removeFromSuperview]; [NSLayoutConstraint activateConstraints:constraints]; + bottomConstraint = [constraints lastObject]; } else { // this fixes an AppKit bug, the window does not notice that its draggable areas change [[self window] setMovableByWindowBackground:YES]; @@ -202,6 +203,7 @@ [self removeFromSuperview]; [NSLayoutConstraint activateConstraints:constraints]; [contentView layoutSubtreeIfNeeded]; + bottomConstraint = [constraints lastObject]; } } Modified: trunk/bibdesk/Base.lproj/BDSKEditor.xib =================================================================== --- trunk/bibdesk/Base.lproj/BDSKEditor.xib 2024-03-12 10:46:33 UTC (rev 28838) +++ trunk/bibdesk/Base.lproj/BDSKEditor.xib 2024-03-12 17:18:58 UTC (rev 28839) @@ -135,6 +135,9 @@ <constraint firstItem="710" firstAttribute="leading" secondItem="587" secondAttribute="leading" constant="10" id="hA9-wo-bIP"/> <constraint firstAttribute="height" constant="24" id="hVR-vj-can"/> </constraints> + <connections> + <outlet property="bottomConstraint" destination="RCD-fy-k19" id="Cc9-W8-pem"/> + </connections> </customView> <splitView dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="847" customClass="BDSKSplitView"> <rect key="frame" x="0.0" y="24" width="700" height="376"/> Modified: trunk/bibdesk/Base.lproj/BDSKFindPanel.xib =================================================================== --- trunk/bibdesk/Base.lproj/BDSKFindPanel.xib 2024-03-12 10:46:33 UTC (rev 28838) +++ trunk/bibdesk/Base.lproj/BDSKFindPanel.xib 2024-03-12 17:18:58 UTC (rev 28839) @@ -48,6 +48,9 @@ <constraints> <constraint firstAttribute="height" constant="22" id="ava-o1-Vvf"/> </constraints> + <connections> + <outlet property="bottomConstraint" destination="coi-fb-sVp" id="Td9-tW-Tdk"/> + </connections> </customView> <customView translatesAutoresizingMaskIntoConstraints="NO" id="125"> <rect key="frame" x="0.0" y="22" width="585" height="270"/> Modified: trunk/bibdesk/Base.lproj/BibDocument.xib =================================================================== --- trunk/bibdesk/Base.lproj/BibDocument.xib 2024-03-12 10:46:33 UTC (rev 28838) +++ trunk/bibdesk/Base.lproj/BibDocument.xib 2024-03-12 17:18:58 UTC (rev 28839) @@ -882,6 +882,9 @@ <constraint firstAttribute="bottom" secondItem="101741" secondAttribute="bottom" id="cGq-4X-YzF"/> <constraint firstAttribute="trailing" secondItem="wyF-ch-LiL" secondAttribute="trailing" id="w36-rx-I71"/> </constraints> + <connections> + <outlet property="bottomConstraint" destination="auI-7e-NFx" id="YJM-XD-EYO"/> + </connections> </customView> </subviews> <constraints> 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