feat(app): support to edit screenshot area
- relocate or resize the area - add anotations on the area
This commit is contained in:
+332
-6
@@ -7,9 +7,10 @@ package main
|
||||
#cgo LDFLAGS: -framework AppKit -framework CoreGraphics
|
||||
#include <math.h>
|
||||
#include <dispatch/dispatch.h>
|
||||
#import <objc/runtime.h>
|
||||
#import <AppKit/AppKit.h>
|
||||
|
||||
extern void nativeOverlayConfirm(int x, int y, int w, int h);
|
||||
extern void nativeOverlayConfirm(int x, int y, int w, int h, const char *annotationsJSON);
|
||||
extern void nativeOverlayCancel(void);
|
||||
|
||||
static NSWindow *nativeOverlayWindow = nil;
|
||||
@@ -27,11 +28,25 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
@property BOOL hasSelection;
|
||||
@property BOOL creating;
|
||||
@property BOOL moving;
|
||||
@property BOOL resizing;
|
||||
@property BOOL annotating;
|
||||
@property NSRect selection;
|
||||
@property NSPoint anchor;
|
||||
@property NSPoint moveOffset;
|
||||
@property NSRect resizeStart;
|
||||
@property NSString *resizeHandle;
|
||||
@property NSString *activeTool;
|
||||
@property(strong) NSColor *activeColor;
|
||||
@property(strong) NSMutableArray<NSDictionary *> *annotations;
|
||||
@property(strong) NSMutableDictionary *draftAnnotation;
|
||||
@property(strong) NSButton *cancelButton;
|
||||
@property(strong) NSButton *uploadButton;
|
||||
@property(strong) NSButton *penButton;
|
||||
@property(strong) NSButton *rectButton;
|
||||
@property(strong) NSButton *ellipseButton;
|
||||
@property(strong) NSButton *colorButton;
|
||||
@property(strong) NSButton *undoButton;
|
||||
@property(strong) NSView *paletteView;
|
||||
@property(strong) NSTextField *sizeLabel;
|
||||
@property(strong) NSTextField *hintLabel;
|
||||
- (void)syncControls;
|
||||
@@ -50,17 +65,28 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
[self setWantsLayer:YES];
|
||||
[[self layer] setBackgroundColor:[[NSColor clearColor] CGColor]];
|
||||
|
||||
_activeTool = nil;
|
||||
_activeColor = [NSColor colorWithCalibratedRed:239.0/255.0 green:68.0/255.0 blue:68.0/255.0 alpha:1.0];
|
||||
_annotations = [NSMutableArray array];
|
||||
|
||||
_cancelButton = [NSButton buttonWithTitle:@"Cancel" target:self action:@selector(cancelSelection)];
|
||||
_uploadButton = [NSButton buttonWithTitle:@"Upload & copy" target:self action:@selector(confirmSelection)];
|
||||
_penButton = [NSButton buttonWithTitle:@"" target:self action:@selector(selectPen)];
|
||||
_rectButton = [NSButton buttonWithTitle:@"" target:self action:@selector(selectRect)];
|
||||
_ellipseButton = [NSButton buttonWithTitle:@"" target:self action:@selector(selectEllipse)];
|
||||
_colorButton = [NSButton buttonWithTitle:@"" target:self action:@selector(togglePalette)];
|
||||
_undoButton = [NSButton buttonWithTitle:@"" target:self action:@selector(undoAnnotation)];
|
||||
_paletteView = [[NSView alloc] initWithFrame:NSZeroRect];
|
||||
_sizeLabel = [NSTextField labelWithString:@""];
|
||||
_hintLabel = [NSTextField labelWithString:@"Drag to select an area · Esc to cancel"];
|
||||
[self styleControls];
|
||||
|
||||
for (NSView *view in @[_cancelButton, _uploadButton, _sizeLabel, _hintLabel]) {
|
||||
for (NSView *view in @[_cancelButton, _uploadButton, _penButton, _rectButton, _ellipseButton, _colorButton, _undoButton, _paletteView, _sizeLabel, _hintLabel]) {
|
||||
[self addSubview:view];
|
||||
}
|
||||
[_cancelButton setHidden:YES];
|
||||
[_uploadButton setHidden:YES];
|
||||
for (NSView *view in @[_cancelButton, _uploadButton, _penButton, _rectButton, _ellipseButton, _colorButton, _undoButton, _paletteView]) {
|
||||
[view setHidden:YES];
|
||||
}
|
||||
[_sizeLabel setHidden:YES];
|
||||
|
||||
[_sizeLabel setTextColor:[NSColor whiteColor]];
|
||||
@@ -79,6 +105,21 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
return self;
|
||||
}
|
||||
|
||||
- (NSString *)hexForColor:(NSColor *)color {
|
||||
NSColor *rgb = [color colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
|
||||
NSInteger r = (NSInteger)llround([rgb redComponent] * 255.0);
|
||||
NSInteger g = (NSInteger)llround([rgb greenComponent] * 255.0);
|
||||
NSInteger b = (NSInteger)llround([rgb blueComponent] * 255.0);
|
||||
return [NSString stringWithFormat:@"#%02lx%02lx%02lx", (long)r, (long)g, (long)b];
|
||||
}
|
||||
|
||||
- (NSImage *)iconFromSVG:(NSString *)svg {
|
||||
NSData *data = [svg dataUsingEncoding:NSUTF8StringEncoding];
|
||||
NSImage *image = [[NSImage alloc] initWithData:data];
|
||||
[image setTemplate:YES];
|
||||
return image;
|
||||
}
|
||||
|
||||
- (void)styleButton:(NSButton *)button background:(NSColor *)background foreground:(NSColor *)foreground {
|
||||
[button setBordered:NO];
|
||||
[button setBezelStyle:NSBezelStyleRegularSquare];
|
||||
@@ -91,6 +132,20 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
[button setAttributedTitle:title];
|
||||
}
|
||||
|
||||
- (void)styleIconButton:(NSButton *)button image:(NSImage *)image {
|
||||
[button setBordered:NO];
|
||||
[button setBezelStyle:NSBezelStyleRegularSquare];
|
||||
[button setImagePosition:NSImageOnly];
|
||||
[button setImageScaling:NSImageScaleProportionallyDown];
|
||||
if (@available(macOS 10.14, *)) {
|
||||
[button setContentTintColor:[NSColor whiteColor]];
|
||||
}
|
||||
[button setImage:image];
|
||||
[button setWantsLayer:YES];
|
||||
[[button layer] setCornerRadius:5];
|
||||
[[button layer] setBackgroundColor:[[NSColor clearColor] CGColor]];
|
||||
}
|
||||
|
||||
- (void)styleControls {
|
||||
[self styleButton:_cancelButton
|
||||
background:[NSColor colorWithCalibratedWhite:0.12 alpha:0.96]
|
||||
@@ -98,6 +153,14 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
[self styleButton:_uploadButton
|
||||
background:[NSColor colorWithCalibratedRed:59.0/255.0 green:130.0/255.0 blue:246.0/255.0 alpha:1.0]
|
||||
foreground:[NSColor whiteColor]];
|
||||
[self styleIconButton:_penButton image:[self iconFromSVG:@"<svg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg'><path d='M742.72 752.064c-29.696 28.576-42.976 48.96-42.976 77.12 0 98.4 143.776 142.464 229.728 65.536l-21.344-23.84c-66.976 59.936-176.384 26.4-176.384-41.696 0-16.832 9.28-31.104 33.184-54.08l13.44-12.736c61.024-58.016 75.328-102.72 29.312-179.84-43.84-73.44-96.8-88.288-162.784-50.56-47.232 27.04-68.64 47.456-208.32 190.4-70.624 72.288-153.92 77.088-217.344 26.784-59.712-47.328-79.872-127.36-42.176-188.64 24.512-39.84 62.656-72.896 136.64-124.48 5.952-4.192 27.04-18.816 31.104-21.664 12.16-8.448 21.536-15.104 30.4-21.536 107.552-78.272 140.8-139.136 86.048-219.904-76.992-113.472-202.304-90.016-367.744 61.472l21.6 23.616c153.088-140.224 256.896-159.616 319.68-67.104 41.632 61.408 16.896 106.688-78.4 176.032-8.64 6.304-17.92 12.832-29.888 21.184l-31.136 21.632c-77.504 54.08-117.984 89.184-145.536 133.984-46.784 76.032-22.176 173.664 49.536 230.496 76.224 60.416 177.952 54.56 260.096-29.504 136.16-139.36 158.08-160.224 201.312-184.96 50.656-28.96 84.416-19.52 119.424 39.168 36.896 61.824 27.52 91.392-23.808 140.16 0.096-0.064-10.976 10.368-13.632 12.96z' fill='white'/></svg>"]];
|
||||
[self styleIconButton:_rectButton image:[self iconFromSVG:@"<svg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg'><path d='M96 96h832v832H96V96z m32 32v768h768V128H128z' fill='white'/></svg>"]];
|
||||
[self styleIconButton:_ellipseButton image:[self iconFromSVG:@"<svg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg'><path d='M512 928c229.76 0 416-186.24 416-416S741.76 96 512 96 96 282.24 96 512s186.24 416 416 416z m0-32C299.936 896 128 724.064 128 512S299.936 128 512 128s384 171.936 384 384-171.936 384-384 384z' fill='white'/></svg>"]];
|
||||
[self styleIconButton:_colorButton image:nil];
|
||||
[self styleIconButton:_undoButton image:[self iconFromSVG:@"<svg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg'><g transform='translate(1024 0) scale(-1 1)'><path d='M838.976 288l-169.344-162.56a16 16 0 1 1 22.144-23.04l213.632 204.992-213.312 215.84a16 16 0 0 1-22.784-22.464L847.936 320H454.56c-164.192 0-297.28 128.96-297.28 288s133.088 288 297.28 288H704v32h-242.784C266.88 928 128 784.736 128 608S266.88 288 461.248 288h377.728z' fill='white'/></g></svg>"]];
|
||||
[_paletteView setWantsLayer:YES];
|
||||
[[_paletteView layer] setCornerRadius:8];
|
||||
[[_paletteView layer] setBackgroundColor:[[NSColor colorWithCalibratedWhite:0.11 alpha:0.96] CGColor]];
|
||||
}
|
||||
|
||||
- (void)drawRect:(NSRect)dirtyRect {
|
||||
@@ -133,23 +196,156 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
[corners lineToPoint:NSMakePoint(NSMinX(_selection), NSMaxY(_selection) - corner)];
|
||||
[corners setLineWidth:3];
|
||||
[corners stroke];
|
||||
|
||||
[self drawAnnotations];
|
||||
[self drawResizeHandles];
|
||||
} else {
|
||||
NSRectFill(self.bounds);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)drawResizeHandles {
|
||||
NSArray *points = @[
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMinY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMidX(_selection), NSMinY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMinY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMidY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMaxY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMidX(_selection), NSMaxY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMaxY(_selection))],
|
||||
[NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMidY(_selection))]
|
||||
];
|
||||
[[NSColor whiteColor] setStroke];
|
||||
[[NSColor colorWithCalibratedRed:59.0/255.0 green:130.0/255.0 blue:246.0/255.0 alpha:1.0] setFill];
|
||||
for (NSValue *value in points) {
|
||||
NSPoint p = [value pointValue];
|
||||
NSRect handleRect = NSMakeRect(p.x - 5, p.y - 5, 10, 10);
|
||||
NSBezierPath *path = [NSBezierPath bezierPathWithRect:handleRect];
|
||||
[path fill];
|
||||
[path stroke];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)drawAnnotations {
|
||||
NSMutableArray *items = [NSMutableArray arrayWithArray:_annotations];
|
||||
if (_draftAnnotation != nil) {
|
||||
[items addObject:_draftAnnotation];
|
||||
}
|
||||
for (NSDictionary *item in items) {
|
||||
NSString *tool = item[@"tool"];
|
||||
NSColor *color = item[@"nsColor"];
|
||||
NSArray *points = item[@"points"];
|
||||
if (points.count == 0) {
|
||||
continue;
|
||||
}
|
||||
[color setStroke];
|
||||
NSBezierPath *path = [NSBezierPath bezierPath];
|
||||
[path setLineWidth:3];
|
||||
[path setLineCapStyle:NSLineCapStyleRound];
|
||||
[path setLineJoinStyle:NSLineJoinStyleRound];
|
||||
if ([tool isEqualToString:@"pen"]) {
|
||||
NSPoint first = [points[0] pointValue];
|
||||
[path moveToPoint:NSMakePoint(_selection.origin.x + first.x, _selection.origin.y + first.y)];
|
||||
for (NSUInteger i = 1; i < points.count; i++) {
|
||||
NSPoint point = [points[i] pointValue];
|
||||
[path lineToPoint:NSMakePoint(_selection.origin.x + point.x, _selection.origin.y + point.y)];
|
||||
}
|
||||
[path stroke];
|
||||
} else if (points.count >= 2) {
|
||||
NSPoint a = [points[0] pointValue];
|
||||
NSPoint b = [[points lastObject] pointValue];
|
||||
NSRect r = NSMakeRect(
|
||||
_selection.origin.x + MIN(a.x, b.x),
|
||||
_selection.origin.y + MIN(a.y, b.y),
|
||||
fabs(b.x - a.x),
|
||||
fabs(b.y - a.y));
|
||||
if ([tool isEqualToString:@"rect"]) {
|
||||
NSBezierPath *rectPath = [NSBezierPath bezierPathWithRect:r];
|
||||
[rectPath setLineWidth:3];
|
||||
[rectPath stroke];
|
||||
} else if ([tool isEqualToString:@"ellipse"]) {
|
||||
NSBezierPath *ellipsePath = [NSBezierPath bezierPathWithOvalInRect:r];
|
||||
[ellipsePath setLineWidth:3];
|
||||
[ellipsePath stroke];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)resizeHandleAtPoint:(NSPoint)p {
|
||||
if (!_hasSelection) {
|
||||
return nil;
|
||||
}
|
||||
CGFloat t = 9;
|
||||
NSDictionary *handles = @{
|
||||
@"nw": [NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMinY(_selection))],
|
||||
@"n": [NSValue valueWithPoint:NSMakePoint(NSMidX(_selection), NSMinY(_selection))],
|
||||
@"ne": [NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMinY(_selection))],
|
||||
@"e": [NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMidY(_selection))],
|
||||
@"se": [NSValue valueWithPoint:NSMakePoint(NSMaxX(_selection), NSMaxY(_selection))],
|
||||
@"s": [NSValue valueWithPoint:NSMakePoint(NSMidX(_selection), NSMaxY(_selection))],
|
||||
@"sw": [NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMaxY(_selection))],
|
||||
@"w": [NSValue valueWithPoint:NSMakePoint(NSMinX(_selection), NSMidY(_selection))]
|
||||
};
|
||||
for (NSString *key in handles) {
|
||||
NSPoint hp = [handles[key] pointValue];
|
||||
if (fabs(p.x - hp.x) <= t && fabs(p.y - hp.y) <= t) {
|
||||
return key;
|
||||
}
|
||||
}
|
||||
BOOL nearX = p.x >= NSMinX(_selection) - t && p.x <= NSMaxX(_selection) + t;
|
||||
BOOL nearY = p.y >= NSMinY(_selection) - t && p.y <= NSMaxY(_selection) + t;
|
||||
if (nearX && fabs(p.y - NSMinY(_selection)) <= t) return @"n";
|
||||
if (nearX && fabs(p.y - NSMaxY(_selection)) <= t) return @"s";
|
||||
if (nearY && fabs(p.x - NSMinX(_selection)) <= t) return @"w";
|
||||
if (nearY && fabs(p.x - NSMaxX(_selection)) <= t) return @"e";
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSPoint)localPoint:(NSPoint)p {
|
||||
return NSMakePoint(
|
||||
MAX(0, MIN(p.x - _selection.origin.x, _selection.size.width)),
|
||||
MAX(0, MIN(p.y - _selection.origin.y, _selection.size.height)));
|
||||
}
|
||||
|
||||
- (void)mouseDown:(NSEvent *)event {
|
||||
NSPoint p = [self convertPoint:[event locationInWindow] fromView:nil];
|
||||
if (_hasSelection && NSPointInRect(p, _selection)) {
|
||||
NSString *handle = [self resizeHandleAtPoint:p];
|
||||
if (handle != nil) {
|
||||
_resizing = YES;
|
||||
_creating = NO;
|
||||
_moving = NO;
|
||||
_annotating = NO;
|
||||
_resizeHandle = handle;
|
||||
_resizeStart = _selection;
|
||||
} else if (_hasSelection && NSPointInRect(p, _selection) && _activeTool != nil) {
|
||||
_annotating = YES;
|
||||
_creating = NO;
|
||||
_moving = NO;
|
||||
_resizing = NO;
|
||||
NSPoint local = [self localPoint:p];
|
||||
_draftAnnotation = [@{
|
||||
@"tool": _activeTool,
|
||||
@"color": [self hexForColor:_activeColor],
|
||||
@"nsColor": _activeColor,
|
||||
@"points": [NSMutableArray arrayWithObject:[NSValue valueWithPoint:local]]
|
||||
} mutableCopy];
|
||||
} else if (_hasSelection && NSPointInRect(p, _selection)) {
|
||||
_moving = YES;
|
||||
_creating = NO;
|
||||
_resizing = NO;
|
||||
_annotating = NO;
|
||||
_moveOffset = NSMakePoint(p.x - _selection.origin.x, p.y - _selection.origin.y);
|
||||
} else {
|
||||
_creating = YES;
|
||||
_moving = NO;
|
||||
_resizing = NO;
|
||||
_annotating = NO;
|
||||
_hasSelection = YES;
|
||||
_anchor = p;
|
||||
_selection = NSMakeRect(p.x, p.y, 0, 0);
|
||||
[_annotations removeAllObjects];
|
||||
_draftAnnotation = nil;
|
||||
}
|
||||
[self syncControls];
|
||||
}
|
||||
@@ -166,6 +362,32 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
x = MAX(0, MIN(x, self.bounds.size.width - _selection.size.width));
|
||||
y = MAX(0, MIN(y, self.bounds.size.height - _selection.size.height));
|
||||
_selection.origin = NSMakePoint(x, y);
|
||||
} else if (_resizing) {
|
||||
CGFloat left = NSMinX(_resizeStart);
|
||||
CGFloat top = NSMinY(_resizeStart);
|
||||
CGFloat right = NSMaxX(_resizeStart);
|
||||
CGFloat bottom = NSMaxY(_resizeStart);
|
||||
if ([_resizeHandle containsString:@"w"]) left = p.x;
|
||||
if ([_resizeHandle containsString:@"e"]) right = p.x;
|
||||
if ([_resizeHandle containsString:@"n"]) top = p.y;
|
||||
if ([_resizeHandle containsString:@"s"]) bottom = p.y;
|
||||
left = MAX(0, MIN(left, self.bounds.size.width));
|
||||
right = MAX(0, MIN(right, self.bounds.size.width));
|
||||
top = MAX(0, MIN(top, self.bounds.size.height));
|
||||
bottom = MAX(0, MIN(bottom, self.bounds.size.height));
|
||||
_selection = NSMakeRect(MIN(left, right), MIN(top, bottom), fabs(right - left), fabs(bottom - top));
|
||||
} else if (_annotating && _draftAnnotation != nil) {
|
||||
NSMutableArray *points = _draftAnnotation[@"points"];
|
||||
NSPoint local = [self localPoint:p];
|
||||
if ([_activeTool isEqualToString:@"pen"]) {
|
||||
[points addObject:[NSValue valueWithPoint:local]];
|
||||
} else {
|
||||
if (points.count == 1) {
|
||||
[points addObject:[NSValue valueWithPoint:local]];
|
||||
} else {
|
||||
points[1] = [NSValue valueWithPoint:local];
|
||||
}
|
||||
}
|
||||
}
|
||||
[self syncControls];
|
||||
[self setNeedsDisplay:YES];
|
||||
@@ -174,6 +396,12 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
- (void)mouseUp:(NSEvent *)event {
|
||||
_creating = NO;
|
||||
_moving = NO;
|
||||
_resizing = NO;
|
||||
if (_annotating && _draftAnnotation != nil) {
|
||||
[_annotations addObject:_draftAnnotation];
|
||||
_draftAnnotation = nil;
|
||||
}
|
||||
_annotating = NO;
|
||||
if (_hasSelection && (_selection.size.width < 4 || _selection.size.height < 4)) {
|
||||
_hasSelection = NO;
|
||||
}
|
||||
@@ -199,6 +427,11 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
BOOL visible = _hasSelection && _selection.size.width >= 4 && _selection.size.height >= 4;
|
||||
[_cancelButton setHidden:!visible];
|
||||
[_uploadButton setHidden:!visible];
|
||||
[_penButton setHidden:!visible];
|
||||
[_rectButton setHidden:!visible];
|
||||
[_ellipseButton setHidden:!visible];
|
||||
[_colorButton setHidden:!visible];
|
||||
[_undoButton setHidden:!visible];
|
||||
[_sizeLabel setHidden:!visible];
|
||||
[_hintLabel setHidden:_hasSelection];
|
||||
|
||||
@@ -220,6 +453,98 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
|
||||
[_cancelButton setFrame:NSMakeRect(x, y, 86, 32)];
|
||||
[_uploadButton setFrame:NSMakeRect(x + 92, y, 128, 32)];
|
||||
|
||||
CGFloat markW = 170;
|
||||
CGFloat markX = MAX(0, MIN(_selection.origin.x, self.bounds.size.width - markW));
|
||||
[_penButton setFrame:NSMakeRect(markX + 4, y + 4, 28, 28)];
|
||||
[_rectButton setFrame:NSMakeRect(markX + 36, y + 4, 28, 28)];
|
||||
[_ellipseButton setFrame:NSMakeRect(markX + 68, y + 4, 28, 28)];
|
||||
[_colorButton setFrame:NSMakeRect(markX + 104, y + 7, 22, 22)];
|
||||
[_undoButton setFrame:NSMakeRect(markX + 134, y + 4, 28, 28)];
|
||||
[[_colorButton layer] setBackgroundColor:[_activeColor CGColor]];
|
||||
[_undoButton setEnabled:_annotations.count > 0];
|
||||
[_paletteView setFrame:NSMakeRect(markX, MAX(0, y - 78), 150, 70)];
|
||||
[self updateToolButtonStates];
|
||||
}
|
||||
|
||||
- (void)updateToolButtonStates {
|
||||
NSDictionary *buttons = @{@"pen": _penButton, @"rect": _rectButton, @"ellipse": _ellipseButton};
|
||||
for (NSString *tool in buttons) {
|
||||
NSButton *button = buttons[tool];
|
||||
NSColor *bg = [tool isEqualToString:_activeTool]
|
||||
? [NSColor colorWithCalibratedWhite:1.0 alpha:0.14]
|
||||
: [NSColor clearColor];
|
||||
[[button layer] setBackgroundColor:[bg CGColor]];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)toggleTool:(NSString *)tool {
|
||||
_activeTool = [_activeTool isEqualToString:tool] ? nil : tool;
|
||||
[self syncControls];
|
||||
}
|
||||
- (void)selectPen { [self toggleTool:@"pen"]; }
|
||||
- (void)selectRect { [self toggleTool:@"rect"]; }
|
||||
- (void)selectEllipse { [self toggleTool:@"ellipse"]; }
|
||||
- (void)undoAnnotation {
|
||||
if (_annotations.count > 0) {
|
||||
[_annotations removeLastObject];
|
||||
[self syncControls];
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)togglePalette {
|
||||
[_paletteView setHidden:![_paletteView isHidden]];
|
||||
if (![_paletteView isHidden] && _paletteView.subviews.count == 0) {
|
||||
NSArray *colors = @[
|
||||
[NSColor colorWithCalibratedRed:239.0/255.0 green:68.0/255.0 blue:68.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:249.0/255.0 green:115.0/255.0 blue:22.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:250.0/255.0 green:204.0/255.0 blue:21.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:34.0/255.0 green:197.0/255.0 blue:94.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:59.0/255.0 green:130.0/255.0 blue:246.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:139.0/255.0 green:92.0/255.0 blue:246.0/255.0 alpha:1.0],
|
||||
[NSColor colorWithCalibratedRed:236.0/255.0 green:72.0/255.0 blue:153.0/255.0 alpha:1.0],
|
||||
[NSColor whiteColor],
|
||||
[NSColor colorWithCalibratedWhite:0.07 alpha:1.0]
|
||||
];
|
||||
for (NSUInteger i = 0; i < colors.count; i++) {
|
||||
NSButton *button = [NSButton buttonWithTitle:@"" target:self action:@selector(selectPaletteColor:)];
|
||||
[button setBordered:NO];
|
||||
[button setWantsLayer:YES];
|
||||
[[button layer] setCornerRadius:4];
|
||||
[[button layer] setBackgroundColor:[colors[i] CGColor]];
|
||||
[button setTag:(NSInteger)i];
|
||||
[button setFrame:NSMakeRect(8 + (i % 5) * 28, 38 - (i / 5) * 28, 22, 22)];
|
||||
[_paletteView addSubview:button];
|
||||
}
|
||||
objc_setAssociatedObject(_paletteView, "snapgoColors", colors, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
|
||||
}
|
||||
}
|
||||
|
||||
- (void)selectPaletteColor:(NSButton *)sender {
|
||||
NSArray *colors = objc_getAssociatedObject(_paletteView, "snapgoColors");
|
||||
if (sender.tag >= 0 && sender.tag < (NSInteger)colors.count) {
|
||||
_activeColor = colors[(NSUInteger)sender.tag];
|
||||
[_paletteView setHidden:YES];
|
||||
[self syncControls];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSString *)annotationsJSON {
|
||||
NSMutableArray *payload = [NSMutableArray array];
|
||||
for (NSDictionary *item in _annotations) {
|
||||
NSMutableArray *points = [NSMutableArray array];
|
||||
for (NSValue *value in item[@"points"]) {
|
||||
NSPoint p = [value pointValue];
|
||||
[points addObject:@{@"x": @(p.x), @"y": @(p.y)}];
|
||||
}
|
||||
[payload addObject:@{@"tool": item[@"tool"], @"color": item[@"color"], @"points": points}];
|
||||
}
|
||||
NSData *data = [NSJSONSerialization dataWithJSONObject:payload options:0 error:nil];
|
||||
if (data == nil) {
|
||||
return @"[]";
|
||||
}
|
||||
return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
|
||||
}
|
||||
|
||||
- (void)confirmSelection {
|
||||
@@ -233,7 +558,8 @@ static id nativeOverlayKeyMonitor = nil;
|
||||
nativeOverlayKeyMonitor = nil;
|
||||
}
|
||||
nativeOverlayWindow = nil;
|
||||
nativeOverlayConfirm((int)llround(r.origin.x), (int)llround(r.origin.y), (int)llround(r.size.width), (int)llround(r.size.height));
|
||||
NSString *json = [self annotationsJSON];
|
||||
nativeOverlayConfirm((int)llround(r.origin.x), (int)llround(r.origin.y), (int)llround(r.size.width), (int)llround(r.size.height), [json UTF8String]);
|
||||
}
|
||||
|
||||
- (void)cancelSelection {
|
||||
|
||||
Reference in New Issue
Block a user