Revision: 15014 http://sourceforge.net/p/skim-app/code/15014 Author: hofman Date: 2025-03-24 15:47:29 +0000 (Mon, 24 Mar 2025) Log Message: ----------- rename macro
Modified Paths: -------------- trunk/SKColorSwatch.m Modified: trunk/SKColorSwatch.m =================================================================== --- trunk/SKColorSwatch.m 2025-03-24 15:31:20 UTC (rev 15013) +++ trunk/SKColorSwatch.m 2025-03-24 15:47:29 UTC (rev 15014) @@ -65,10 +65,8 @@ #define LARGE_SIZE_HEIGHT_OFFSET 10.0 #define LARGE_SIZE_WIDTH_OUTSET 6.0 +#define REGULAR_BEZEL_WIDTH_OFFSET 4.0 -#define BACKGROUND_WIDTH_OFFSET 4.0 -#define ALT_BACKGROUND_WIDTH_OFFSET 0.0 - @interface SKColorSwatchBackgroundView : NSControl @property (nonatomic) CGFloat bezelWidth; @property (nonatomic, readonly) CGFloat bezelHeight; @@ -885,7 +883,7 @@ NSSegmentedCell *cell = [[NSSegmentedCell alloc] init]; [cell setSegmentCount:1]; [cell setSegmentStyle:NSSegmentStyleTexturedSquare]; - [cell setWidth:fmax(0.0, NSWidth(frameRect) - BACKGROUND_WIDTH_OFFSET - 2.0 * BEZEL_INSET_LEFTRIGHT) forSegment:0]; + [cell setWidth:fmax(0.0, NSWidth(frameRect) - REGULAR_BEZEL_WIDTH_OFFSET - 2.0 * BEZEL_INSET_LEFTRIGHT) forSegment:0]; [self setCell:cell]; } return self; @@ -893,7 +891,7 @@ - (BOOL)canBecomeKeyView { return NO; } -#define WIDTH_OFFSET ([self controlSize] == NSControlSizeRegular ? BACKGROUND_WIDTH_OFFSET : ALT_BACKGROUND_WIDTH_OFFSET) +#define WIDTH_OFFSET ([self controlSize] == NSControlSizeRegular ? REGULAR_BEZEL_WIDTH_OFFSET : 0.0) - (CGFloat)bezelWidth { return [[self cell] widthForSegment:0] + WIDTH_OFFSET; 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