macOS Cocoa improvements.

hiro/cocoa/widget/label.cpp

@@ -1,22 +1,123 @@
 #if defined(Hiro_Label)
 
-//todo:
-//* Label::onButtonPress()
-//* Label::onButtonRelease()
-
-@implementation CocoaLabel : NSTextView
+@implementation CocoaLabel : NSView
 
 -(id) initWith:(hiro::mLabel&)labelReference {
   if(self = [super initWithFrame:NSMakeRect(0, 0, 0, 0)]) {
     label = &labelReference;
-
-    [self setDrawsBackground:NO];
-    [self setEditable:NO];
-    [self setRichText:NO];
   }
   return self;
 }
 
+-(void) resetCursorRects {
+  if(auto mouseCursor = NSMakeCursor(label->mouseCursor())) {
+    [self addCursorRect:self.bounds cursor:mouseCursor];
+  }
+}
+
+-(void) drawRect:(NSRect)dirtyRect {
+  auto geometry = label->geometry();
+  NSRect rect = {{geometry.x(), geometry.y()}, {geometry.width(), geometry.height()}};
+
+  if(auto backgroundColor = label->backgroundColor()) {
+    NSColor* color = NSMakeColor(backgroundColor);
+    [color setFill];
+    NSRectFill(rect);
+  }
+
+  NSFont* font = hiro::pFont::create(label->font(true));
+  NSColor* color = [NSColor textColor];
+  if(auto foregroundColor = label->foregroundColor()) {
+    color = NSMakeColor(foregroundColor);
+  }
+  NSMutableParagraphStyle* paragraphStyle = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] autorelease];
+  paragraphStyle.alignment = NSTextAlignmentLeft;
+  paragraphStyle.lineBreakMode = NSLineBreakByClipping;
+  NSDictionary* attributes = @{
+    NSFontAttributeName:font,
+    NSForegroundColorAttributeName:color,
+    NSParagraphStyleAttributeName:paragraphStyle
+  };
+
+  auto size = hiro::pFont::size(label->font(true), label->text());
+  auto alignment = label->alignment();
+  if(!alignment) alignment = {0.0, 0.5};
+
+  rect.origin.x = max(0, (geometry.width() - size.width()) * alignment.horizontal());
+  rect.origin.y = max(0, (geometry.height() - size.height()) * alignment.vertical());
+  rect.size.width = min(geometry.width(), size.width());
+  rect.size.height = min(geometry.height(), size.height());
+
+  NSString* string = [NSString stringWithUTF8String:label->text()];
+  [string drawInRect:rect withAttributes:attributes];
+}
+
+-(void) mouseButton:(NSEvent*)event down:(BOOL)isDown {
+  if(isDown) {
+    switch([event buttonNumber]) {
+    case 0: return label->doMousePress(hiro::Mouse::Button::Left);
+    case 1: return label->doMousePress(hiro::Mouse::Button::Right);
+    case 2: return label->doMousePress(hiro::Mouse::Button::Middle);
+    }
+  } else {
+    switch([event buttonNumber]) {
+    case 0: return label->doMouseRelease(hiro::Mouse::Button::Left);
+    case 1: return label->doMouseRelease(hiro::Mouse::Button::Right);
+    case 2: return label->doMouseRelease(hiro::Mouse::Button::Middle);
+    }
+  }
+}
+
+-(void) mouseEntered:(NSEvent*)event {
+  label->doMouseEnter();
+}
+
+-(void) mouseExited:(NSEvent*)event {
+  label->doMouseLeave();
+}
+
+-(void) mouseMove:(NSEvent*)event {
+  if([event window] == nil) return;
+  NSPoint location = [self convertPoint:[event locationInWindow] fromView:nil];
+  label->doMouseMove({(int)location.x, (int)([self frame].size.height - 1 - location.y)});
+}
+
+-(void) mouseDown:(NSEvent*)event {
+  [self mouseButton:event down:YES];
+}
+
+-(void) mouseUp:(NSEvent*)event {
+  [self mouseButton:event down:NO];
+}
+
+-(void) mouseDragged:(NSEvent*)event {
+  [self mouseMove:event];
+}
+
+-(void) rightMouseDown:(NSEvent*)event {
+  [self mouseButton:event down:YES];
+}
+
+-(void) rightMouseUp:(NSEvent*)event {
+  [self mouseButton:event down:NO];
+}
+
+-(void) rightMouseDragged:(NSEvent*)event {
+  [self mouseMove:event];
+}
+
+-(void) otherMouseDown:(NSEvent*)event {
+  [self mouseButton:event down:YES];
+}
+
+-(void) otherMouseUp:(NSEvent*)event {
+  [self mouseButton:event down:NO];
+}
+
+-(void) otherMouseDragged:(NSEvent*)event {
+  [self mouseMove:event];
+}
+
 @end
 
 namespace hiro {
@@ -27,6 +128,8 @@ auto pLabel::construct() -> void {
     pWidget::construct();
 
     setAlignment(state().alignment);
+    setBackgroundColor(state().backgroundColor());
+    setForegroundColor(state().foregroundColor());
     setText(state().text);
   }
 }
@@ -44,43 +147,25 @@ auto pLabel::minimumSize() const -> Size {
 
 auto pLabel::setAlignment(Alignment alignment) -> void {
   @autoreleasepool {
-    NSMutableParagraphStyle* paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-    paragraphStyle.alignment = NSTextAlignmentCenter;
-    if(alignment.horizontal() < 0.333) paragraphStyle.alignment = NSTextAlignmentLeft;
-    if(alignment.horizontal() > 0.666) paragraphStyle.alignment = NSTextAlignmentRight;
-    [cocoaView setDefaultParagraphStyle:paragraphStyle];
+    [cocoaView setNeedsDisplay:YES];
   }
 }
 
 auto pLabel::setBackgroundColor(Color color) -> void {
-  //todo
+  @autoreleasepool {
+    [cocoaView setNeedsDisplay:YES];
+  }
 }
 
 auto pLabel::setForegroundColor(Color color) -> void {
-  //todo
-}
-
-auto pLabel::setGeometry(Geometry geometry) -> void {
-  //NSTextView does not support vertical text centering:
-  //simulate this by adjusting the geometry placement (reduce height, move view down)
-  uint height = pFont::size(self().font(true), state().text).height();
-  auto offset = geometry;
-
-  if(geometry.height() > height) {
-    uint diff = geometry.height() - height;
-    offset.setY(offset.y() + (diff >> 1));
-    offset.setHeight(offset.height() - (diff >> 1));
+  @autoreleasepool {
+    [cocoaView setNeedsDisplay:YES];
   }
-
-  pWidget::setGeometry({
-    offset.x() - 6, offset.y(),
-    offset.width() + 12, offset.height()
-  });
 }
 
 auto pLabel::setText(const string& text) -> void {
   @autoreleasepool {
-    [cocoaView setString:[NSString stringWithUTF8String:text]];
+    [cocoaView setNeedsDisplay:YES];
   }
 }