Revision: 7280
http://skim-app.svn.sourceforge.net/skim-app/?rev=7280&view=rev
Author: hofman
Date: 2011-06-17 23:19:28 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Use maximum effective size for find bar
Modified Paths:
--------------
trunk/FindBar.xib
trunk/SKFindController.h
trunk/SKFindController.m
trunk/SKGradientView.h
trunk/SKGradientView.m
Modified: trunk/FindBar.xib
===================================================================
--- trunk/FindBar.xib 2011-06-17 22:52:37 UTC (rev 7279)
+++ trunk/FindBar.xib 2011-06-17 23:19:28 UTC (rev 7280)
@@ -45,7 +45,7 @@
<object class="NSButton" id="479786172">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{199,
3}, {42, 19}}</string>
+ <string key="NSFrame">{{109,
3}, {42, 19}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell"
key="NSCell" id="1028549383">
@@ -69,7 +69,7 @@
<object class="NSSegmentedControl"
id="667040164">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{99, 3},
{43, 20}}</string>
+ <string key="NSFrame">{{8, 3},
{43, 20}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell"
key="NSCell" id="89567464">
@@ -111,7 +111,7 @@
<object class="NSSearchField"
id="930853778">
<reference
key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{149,
4}, {42, 19}}</string>
+ <string key="NSFrame">{{58, 4},
{43, 19}}</string>
<reference key="NSSuperview"
ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object
class="NSSearchFieldCell" key="NSCell" id="505043563">
@@ -191,7 +191,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{250, 25}</string>
+ <string key="NSFrameSize">{160, 25}</string>
<string
key="NSClassName">SKGradientView</string>
</object>
<object class="NSObjectController" id="766371852">
@@ -271,14 +271,6 @@
<int key="connectionID">24</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection"
key="connection">
- <string
key="label">previousNextButton</string>
- <reference key="source"
ref="1001"/>
- <reference key="destination"
ref="667040164"/>
- </object>
- <int key="connectionID">25</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection"
key="connection">
<string
key="label">find:</string>
<reference key="source"
ref="1001"/>
@@ -404,7 +396,7 @@
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
- <string>{{284, 790}, {250, 25}}</string>
+ <string>{{284, 790}, {160, 25}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{628, 654}</string>
<string>{{217, 442}, {480,
272}}</string>
@@ -645,14 +637,12 @@
<string>doneButton</string>
<string>findField</string>
<string>ownerController</string>
-
<string>previousNextButton</string>
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>NSSearchField</string>
<string>NSObjectController</string>
-
<string>NSSegmentedControl</string>
</object>
</object>
<object class="NSMutableDictionary"
key="toOneOutletInfosByName">
@@ -662,7 +652,6 @@
<string>doneButton</string>
<string>findField</string>
<string>ownerController</string>
-
<string>previousNextButton</string>
</object>
<object class="NSMutableArray"
key="dict.values">
<bool
key="EncodedWithXMLCoder">YES</bool>
@@ -678,10 +667,6 @@
<string
key="name">ownerController</string>
<string
key="candidateClassName">NSObjectController</string>
</object>
- <object
class="IBToOneOutletInfo">
- <string
key="name">previousNextButton</string>
- <string
key="candidateClassName">NSSegmentedControl</string>
- </object>
</object>
</object>
<object
class="IBClassDescriptionSource" key="sourceIdentifier">
Modified: trunk/SKFindController.h
===================================================================
--- trunk/SKFindController.h 2011-06-17 22:52:37 UTC (rev 7279)
+++ trunk/SKFindController.h 2011-06-17 23:19:28 UTC (rev 7280)
@@ -44,7 +44,6 @@
@interface SKFindController : SKViewController {
NSSearchField *findField;
NSButton *doneButton;
- NSSegmentedControl *previousNextButton;
NSObjectController *ownerController;
NSString *findString;
NSInteger lastChangeCount;
@@ -55,7 +54,6 @@
@property (nonatomic, retain) IBOutlet NSSearchField *findField;
@property (nonatomic, retain) IBOutlet NSButton *doneButton;
-@property (nonatomic, retain) IBOutlet NSSegmentedControl *previousNextButton;
@property (nonatomic, retain) IBOutlet NSObjectController *ownerController;
@property (nonatomic, retain) NSString *findString;
@property (nonatomic, readonly) NSInteger findOptions;
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2011-06-17 22:52:37 UTC (rev 7279)
+++ trunk/SKFindController.m 2011-06-17 23:19:28 UTC (rev 7280)
@@ -48,7 +48,7 @@
@implementation SKFindController
-@synthesize findField, doneButton, previousNextButton, ownerController,
findString, mainController;
+@synthesize findField, doneButton, ownerController, findString, mainController;
@dynamic findOptions, fieldEditor;
- (void)dealloc {
@@ -58,7 +58,6 @@
SKDESTROY(findField);
SKDESTROY(ownerController);
SKDESTROY(doneButton);
- SKDESTROY(previousNextButton);
[super dealloc];
}
@@ -72,12 +71,16 @@
CGFloat dx = NSWidth([doneButton frame]);
[doneButton sizeToFit];
dx -= NSWidth([doneButton frame]);
- SKShiftAndResizeViews([NSArray arrayWithObjects:previousNextButton,
findField, doneButton, nil], dx, 0.0);
+ SKShiftAndResizeViews([NSArray arrayWithObjects:doneButton, nil], dx, 0.0);
+ SKShiftAndResizeViews([NSArray arrayWithObjects:findField, nil], 0.0, dx);
SKGradientView *gradientView = (SKGradientView *)[self view];
[gradientView setEdges:SKMinYEdgeMask];
[gradientView setClipEdges:SKMinXEdgeMask | SKMaxYEdgeMask];
- [gradientView setMinSize:[gradientView contentRect].size];
+ NSSize size = [gradientView contentRect].size;
+ [gradientView setMinSize:size];
+ size.width = 500.0;
+ [gradientView setMaxSize:size];
[gradientView setGradient:[[[NSGradient alloc]
initWithStartingColor:[NSColor colorWithCalibratedWhite:0.82 alpha:1.0]
endingColor:[NSColor colorWithCalibratedWhite:0.914 alpha:1.0]] autorelease]];
[gradientView setAlternateGradient:nil];
Modified: trunk/SKGradientView.h
===================================================================
--- trunk/SKGradientView.h 2011-06-17 22:52:37 UTC (rev 7279)
+++ trunk/SKGradientView.h 2011-06-17 23:19:28 UTC (rev 7280)
@@ -44,18 +44,17 @@
NSGradient *gradient;
NSGradient *alternateGradient;
NSSize minSize;
+ NSSize maxSize;
SKRectEdges edges;
SKRectEdges clipEdges;
BOOL autoEdges;
}
@property (nonatomic, retain) id contentView;
-@property (nonatomic, retain) NSGradient *gradient;
-@property (nonatomic, retain) NSGradient *alternateGradient;
+@property (nonatomic, retain) NSGradient *gradient, *alternateGradient;
@property (nonatomic, readonly) NSRect contentRect;
-@property (nonatomic) NSSize minSize;
-@property (nonatomic) SKRectEdges edges;
-@property (nonatomic) SKRectEdges clipEdges;
+@property (nonatomic) NSSize minSize, maxSize;
+@property (nonatomic) SKRectEdges edges, clipEdges;
@property (nonatomic) BOOL autoEdges;
@end
Modified: trunk/SKGradientView.m
===================================================================
--- trunk/SKGradientView.m 2011-06-17 22:52:37 UTC (rev 7279)
+++ trunk/SKGradientView.m 2011-06-17 23:19:28 UTC (rev 7280)
@@ -43,13 +43,14 @@
@implementation SKGradientView
-@synthesize contentView, gradient, alternateGradient, minSize, edges,
clipEdges, autoEdges;
+@synthesize contentView, gradient, alternateGradient, minSize, maxSize, edges,
clipEdges, autoEdges;
@dynamic contentRect;
- (id)initWithFrame:(NSRect)frame {
self = [super initWithFrame:frame];
if (self) {
minSize = NSZeroSize;
+ maxSize = NSMakeSize(CGFLOAT_MAX, CGFLOAT_MAX);
edges = SKNoEdgeMask; // we start with no edge, so we can use this in
IB without getting weird offsets
clipEdges = SKMaxXEdgeMask | SKMaxYEdgeMask;
autoEdges = NO;
@@ -215,11 +216,21 @@
rect.origin.x -= minSize.width - NSWidth(rect);
rect.size.width = minSize.width;
}
+ else if (rect.size.width > maxSize.width) {
+ if (clipEdges & SKMinXEdgeMask)
+ rect.origin.x -= maxSize.width - NSWidth(rect);
+ rect.size.width = maxSize.width;
+ }
if (rect.size.height < minSize.height) {
if (clipEdges & SKMinYEdgeMask)
rect.origin.y -= minSize.height - NSHeight(rect);
rect.size.height = minSize.height;
}
+ else if (rect.size.height > maxSize.height) {
+ if (clipEdges & SKMinYEdgeMask)
+ rect.origin.y -= maxSize.height - NSHeight(rect);
+ rect.size.height = maxSize.height;
+ }
return rect;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
