Revision: 6457
http://skim-app.svn.sourceforge.net/skim-app/?rev=6457&view=rev
Author: hofman
Date: 2010-04-10 10:21:33 +0000 (Sat, 10 Apr 2010)
Log Message:
-----------
combine functions
Modified Paths:
--------------
trunk/NSGeometry_SKExtensions.h
trunk/NSGeometry_SKExtensions.m
trunk/SKConversionProgressController.m
trunk/SKDownloadPreferenceController.m
trunk/SKFindController.m
trunk/SKGeneralPreferences.m
trunk/SKNoteTypeSheetController.m
trunk/SKPreferenceController.m
trunk/SKPresentationOptionsSheetController.m
trunk/SKTextFieldSheetController.m
Modified: trunk/NSGeometry_SKExtensions.h
===================================================================
--- trunk/NSGeometry_SKExtensions.h 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/NSGeometry_SKExtensions.h 2010-04-10 10:21:33 UTC (rev 6457)
@@ -175,6 +175,5 @@
#pragma mark -
extern void SKShiftAndResizeViews(NSArray *views, CGFloat dx, CGFloat dw);
-extern void SKAutoSizeRightButtons(NSArray *buttons);
-extern void SKAutoSizeLeftButtons(NSArray *buttons);
+extern void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign);
extern CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls,
BOOL resizeControls);
Modified: trunk/NSGeometry_SKExtensions.m
===================================================================
--- trunk/NSGeometry_SKExtensions.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/NSGeometry_SKExtensions.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -124,44 +124,31 @@
}
}
-void SKAutoSizeRightButtons(NSArray *buttons) {
+void SKAutoSizeButtons(NSArray *buttons, BOOL rightAlign) {
if ([buttons count] == 0)
return;
- CGFloat x = NSMaxX([[buttons objectAtIndex:0] frame]);
+ NSButton *button = [buttons objectAtIndex:0];
+ CGFloat x = rightAlign ? NSMaxX([button frame]) : NSMinX([button frame]);
CGFloat width = 0.0;
- for (NSButton *button in buttons) {
+ for (button in buttons) {
[button sizeToFit];
width = fmax(width, NSWidth([button frame]));
}
width = fmin(MAX_BUTTON_WIDTH, fmax(MIN_BUTTON_WIDTH, width));
- for (NSButton *button in buttons) {
+ for (button in buttons) {
NSRect frame = [button frame];
frame.size.width = fmax(width, NSWidth(frame));
- x -= NSWidth(frame);
- frame.origin.x = x;
+ if (rightAlign) {
+ x -= NSWidth(frame);
+ frame.origin.x = x;
+ } else {
+ frame.origin.x = x;
+ x += NSWidth(frame);
+ }
[button setFrame:frame];
}
}
-void SKAutoSizeLeftButtons(NSArray *buttons) {
- if ([buttons count] == 0)
- return;
- CGFloat x = NSMinX([[buttons objectAtIndex:0] frame]);
- CGFloat width = 0.0;
- for (NSButton *button in buttons) {
- [button sizeToFit];
- width = fmax(width, NSWidth([button frame]));
- }
- width = fmin(MAX_BUTTON_WIDTH, fmax(MIN_BUTTON_WIDTH, width));
- for (NSButton *button in buttons) {
- NSRect frame = [button frame];
- frame.size.width = fmax(width, NSWidth(frame));
- frame.origin.x = x;
- x += NSWidth(frame);
- [button setFrame:frame];
- }
-}
-
CGFloat SKAutoSizeLabelFields(NSArray *labelFields, NSArray *controls, BOOL
resizeControls) {
if ([labelFields count] == 0)
return 0.0;
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2010-04-09 11:29:31 UTC (rev
6456)
+++ trunk/SKConversionProgressController.m 2010-04-10 10:21:33 UTC (rev
6457)
@@ -216,7 +216,7 @@
- (void)setButtonTitle:(NSString *)title action:(SEL)action {
[cancelButton setTitle:title];
[cancelButton setAction:action];
- SKAutoSizeRightButtons([NSArray arrayWithObjects:cancelButton, nil]);
+ SKAutoSizeButtons([NSArray arrayWithObjects:cancelButton, nil], YES);
}
#pragma mark PostScript
Modified: trunk/SKDownloadPreferenceController.m
===================================================================
--- trunk/SKDownloadPreferenceController.m 2010-04-09 11:29:31 UTC (rev
6456)
+++ trunk/SKDownloadPreferenceController.m 2010-04-10 10:21:33 UTC (rev
6457)
@@ -55,7 +55,7 @@
}
- (void)windowDidLoad {
- SKAutoSizeRightButtons([NSArray arrayWithObjects:doneButton, nil]);
+ SKAutoSizeButtons([NSArray arrayWithObjects:doneButton, nil], YES);
NSRect frame = [[self window] frame];
frame.size.width = 0.0;
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/SKFindController.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -73,7 +73,7 @@
}
- (void)windowDidLoad {
- SKAutoSizeRightButtons(buttons);
+ SKAutoSizeButtons(buttons, YES);
SKAutoSizeLabelFields([NSArray arrayWithObjects:labelField, nil], [NSArray
arrayWithObjects:findField, ignoreCaseCheckbox, nil], YES);
[self setWindowFrameAutosaveName:SKFindPanelFrameAutosaveName];
Modified: trunk/SKGeneralPreferences.m
===================================================================
--- trunk/SKGeneralPreferences.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/SKGeneralPreferences.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -84,7 +84,7 @@
- (void)loadView {
[super loadView];
- SKAutoSizeLeftButtons(revertPDFSettingsButtons);
+ SKAutoSizeButtons(revertPDFSettingsButtons, NO);
SKAutoSizeLabelFields([NSArray arrayWithObjects:openFilesLabelField, nil],
[NSArray arrayWithObjects:openFilesMatrix, nil], NO);
SKAutoSizeLabelFields([NSArray arrayWithObjects:updateIntervalLabelField,
nil], [NSArray arrayWithObjects:updateIntervalPopUpButton, nil], NO);
[openFilesMatrix sizeToFit];
Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/SKNoteTypeSheetController.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -60,7 +60,7 @@
[messageField sizeToFit];
- SKAutoSizeRightButtons(buttons);
+ SKAutoSizeButtons(buttons, YES);
NSRect frame = [[self window] frame];
NSRect matrixFrame = [matrix frame];
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/SKPreferenceController.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -102,7 +102,7 @@
[self setWindowFrameAutosaveName:SKPreferenceWindowFrameAutosaveName];
- SKAutoSizeLeftButtons(resetButtons);
+ SKAutoSizeButtons(resetButtons, NO);
SKPreferencePane *pane;
NSView *view;
Modified: trunk/SKPresentationOptionsSheetController.m
===================================================================
--- trunk/SKPresentationOptionsSheetController.m 2010-04-09 11:29:31 UTC
(rev 6456)
+++ trunk/SKPresentationOptionsSheetController.m 2010-04-10 10:21:33 UTC
(rev 6457)
@@ -151,7 +151,7 @@
[separateCheckButton sizeToFit];
[[transitionControls lastObject] sizeToFit];
- SKAutoSizeRightButtons(buttons);
+ SKAutoSizeButtons(buttons, YES);
CGFloat dw = SKAutoSizeLabelFields(transitionLabels, transitionControls,
NO);
Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m 2010-04-09 11:29:31 UTC (rev 6456)
+++ trunk/SKTextFieldSheetController.m 2010-04-10 10:21:33 UTC (rev 6457)
@@ -60,7 +60,7 @@
NSRect frame = [[self window] frame];
CGFloat buttonMargin = NSWidth(frame) - NSMaxX([[buttons objectAtIndex:0]
frame]);
NSButton *cancelButton = [buttons lastObject];
- SKAutoSizeRightButtons(buttons);
+ SKAutoSizeButtons(buttons, YES);
if (NSMinX([cancelButton frame]) < buttonMargin) {
frame.size.width += buttonMargin - NSMinX([cancelButton frame]);
[[self window] setFrame:frame display:NO];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit