[Skim-app-commit] SF.net SVN: skim-app:[12485] trunk/SKSnapshotPDFView.m

[hofman--- via Skim-app-commit]

Revision: 12485
          http://sourceforge.net/p/skim-app/code/12485
Author:   hofman
Date:     2021-10-30 18:30:09 +0000 (Sat, 30 Oct 2021)
Log Message:
-----------
Use auto layout for content of snapshot pdfview control view

Modified Paths:
--------------
    trunk/SKSnapshotPDFView.m

Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m   2021-10-30 18:14:48 UTC (rev 12484)
+++ trunk/SKSnapshotPDFView.m   2021-10-30 18:30:09 UTC (rev 12485)
@@ -165,11 +165,6 @@
             [curItem setRepresentedObject:(SKDefaultScaleMenuFactors[cnt] > 
0.0 ? [NSNumber numberWithDouble:SKDefaultScaleMenuFactors[cnt]] : nil)];
         }
         
-        // Make sure the popup is big enough to fit the largest cell
-        [scalePopUpButton sizeToFit];
-        [scalePopUpButton setFrameSize:NSMakeSize(NSWidth([scalePopUpButton 
frame]) - CONTROL_WIDTH_OFFSET, CONTROL_HEIGHT)];
-        [scalePopUpButton setAutoresizingMask:NSViewMaxXMargin | 
NSViewMaxYMargin];
-        
         // select the appropriate item, adjusting the scaleFactor if necessary
         if([self autoFits] || [self autoScales])
             [self setScaleFactor:0.0 adjustPopup:YES];
@@ -185,19 +180,21 @@
                // don't let it become first responder
                [scalePopUpButton setRefusesFirstResponder:YES];
         
-        SKTopBarView *topBar = [[SKTopBarView alloc] 
initWithFrame:[scalePopUpButton frame]];
-        [topBar setMinSize:[scalePopUpButton frame].size];
+        SKTopBarView *topBar = [[SKTopBarView alloc] 
initWithFrame:NSMakeRect(0.0, 0.0, 0.0, CONTROL_HEIGHT)];
         if (RUNNING_BEFORE(10_14)) {
             [topBar setBackgroundColors:[NSArray arrayWithObjects:[NSColor 
pdfControlBackgroundColor], nil]];
             [topBar setAlternateBackgroundColors:nil];
         }
+        [scalePopUpButton setTranslatesAutoresizingMaskIntoConstraints:NO];
         [topBar addSubview:scalePopUpButton];
         
         controlView = topBar;
         [controlView setTranslatesAutoresizingMaskIntoConstraints:NO];
-        NSLayoutConstraint *heightConstraint = [NSLayoutConstraint 
constraintWithItem:controlView attribute:NSLayoutAttributeHeight 
relatedBy:NSLayoutRelationEqual toItem:nil 
attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 
constant:NSHeight([controlView bounds])];
-        [heightConstraint setActive:YES];
         
+        [NSLayoutConstraint activateConstraints:[NSArray arrayWithObjects:
+             [NSLayoutConstraint constraintWithItem:controlView 
attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil 
attribute:NSLayoutAttributeNotAnAttribute multiplier:0.0 
constant:CONTROL_HEIGHT],
+             [NSLayoutConstraint constraintWithItem:scalePopUpButton 
attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual 
toItem:controlView attribute:NSLayoutAttributeLeading multiplier:1.0 
constant:5.0],
+             [NSLayoutConstraint constraintWithItem:scalePopUpButton 
attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual 
toItem:controlView attribute:NSLayoutAttributeCenterY multiplier:1.0 
constant:0.0], nil]];
         [self updateTrackingAreas];
     }
 }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit