cocoawebview 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4b622957ef120a8f192d4362095f5c62c39c1fa62ba71b9ea571964af717cc
-  data.tar.gz: dcd795b8b5b28aec8226a5c13e9f9e85ff102725b9b402fb65b36c78f1bfa4e8
+  metadata.gz: a6429fedf1d1f28dd4375f23a4874920db7df15a3ad1b8385ae97332315f9031
+  data.tar.gz: 2697a99cd838afd93bf2af09c9a5d32e94ca596685149d53cab3735249b4d8f4
 SHA512:
-  metadata.gz: e2d8582c85a8075eaa63c0031d2b4b6a9432803b67c3be13eeb8e67cdf97307dc068425a9130eb55ce9ea92b69119b94895e7ecb262d8c57dc6f238b13382080
-  data.tar.gz: 9275b8d8b832e87c8e03d43f2a034b0393f9de64f820368fca77d23501d019b7ab29e1a5c946e3281799aa6a2175ee3e702b96b45215dc1a0e15fd10471eaf0a
+  metadata.gz: 4cdd3cd1510626f4ae76f0ed65005e3d934d6ce6dfb35a490ec3e2293be6fe2b740427f7add14642c6566769d8d688e6f64f866ca1dbdb7442d6e025739e1bd2
+  data.tar.gz: 7ca9097dbfecace2f6bdbfb42674d2d8ec8ae52751dc2a1e4b79ec04415ffc7d1deb71c3e0e220c22399751c241789a8c063a428a34f3299460540be716707b4

data/ext/cocoawebview/cocoawebview.m

@@ -11,7 +11,7 @@ VALUE nsapp_initialize(VALUE self);
 VALUE nsapp_run(VALUE self);
 VALUE nsapp_exit(VALUE self);
 
-VALUE webview_initialize(VALUE self, VALUE debug, VALUE style);
+VALUE webview_initialize(VALUE self, VALUE debug, VALUE style, VALUE move_title_buttons);
 VALUE webview_show(VALUE self);
 VALUE webview_hide(VALUE self);
 VALUE webview_eval(VALUE self, VALUE code);
@@ -45,16 +45,18 @@ VALUE webview_set_topmost(VALUE self, VALUE topmost);
     WKWebView *webView;
     VALUE rb_cocoawebview;
     BOOL showDevTool;
+    BOOL shouldMoveTitleButtons;
 }
+- (void)setShouldMoveTitleButtons:(BOOL)flag;
 - (void)setDevTool:(BOOL)flag;
-- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style;
+- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style moveTitleButtons:(BOOL)moveTitleButtons;
 - (void)eval:(NSString*)code;
 - (void)setCocoaWebview:(VALUE)view;
 - (void)dragging;
 @end
 
 @implementation CocoaWebview
-- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style{
+- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style moveTitleButtons:(BOOL)moveTitleButtons{
     self = [super initWithContentRect:frame
                             styleMask:style
                               backing:NSBackingStoreBuffered
@@ -66,10 +68,42 @@ VALUE webview_set_topmost(VALUE self, VALUE topmost);
         [self setTitlebarAppearsTransparent: YES];
         [self setTitleVisibility:NSWindowTitleHidden];
         [self addWebViewToWindow:self];
+        [self setShouldMoveTitleButtons:moveTitleButtons];
+        if (moveTitleButtons) {
+            [self moveWindowButtonsForWindow:self];
+        }
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(windowDidResize:)
+                                                     name:NSWindowDidResizeNotification
+                                                   object:self];
     }
     return self;
 }
 
+- (void)setShouldMoveTitleButtons:(BOOL)flag {
+    shouldMoveTitleButtons = flag;
+}
+
+- (void)windowDidResize:(NSNotification *)notification {
+    if (shouldMoveTitleButtons) {
+        [self moveWindowButtonsForWindow:self];
+    }
+}
+
+- (void)moveWindowButtonsForWindow:(NSWindow *)window {
+    //Close Button
+    NSButton *closeButton = [window standardWindowButton:NSWindowCloseButton];
+    [closeButton setFrameOrigin:NSMakePoint(closeButton.frame.origin.x + 10, closeButton.frame.origin.y - 10)];
+
+    //Minimize Button
+    NSButton *minimizeButton = [window standardWindowButton:NSWindowMiniaturizeButton];
+    [minimizeButton setFrameOrigin:NSMakePoint(minimizeButton.frame.origin.x + 10, minimizeButton.frame.origin.y - 10)];
+
+    //Zoom Button
+    NSButton *zoomButton = [window standardWindowButton:NSWindowZoomButton];
+    [zoomButton setFrameOrigin:NSMakePoint(zoomButton.frame.origin.x + 10, zoomButton.frame.origin.y - 10)];
+}
+
 - (void)close {
     [self orderOut:nil]; // Hide instead of destroy
 }
@@ -177,7 +211,7 @@ Init_cocoawebview(void)
 
   /* CocoaWebview */
   rb_mCocoaWebviewClass = rb_define_class_under(rb_mCocoawebview, "CocoaWebview", rb_cObject);
-  rb_define_method(rb_mCocoaWebviewClass, "initialize", webview_initialize, 2);
+  rb_define_method(rb_mCocoaWebviewClass, "initialize", webview_initialize, 3);
   rb_define_method(rb_mCocoaWebviewClass, "show", webview_show, 0);
   rb_define_method(rb_mCocoaWebviewClass, "hide", webview_hide, 0);
   rb_define_method(rb_mCocoaWebviewClass, "eval", webview_eval, 1);
@@ -210,7 +244,7 @@ VALUE nsapp_exit(VALUE self) {
     [[NSApplication sharedApplication] terminate:nil];
 }
 
-VALUE webview_initialize(VALUE self, VALUE debug, VALUE style) {
+VALUE webview_initialize(VALUE self, VALUE debug, VALUE style, VALUE move_title_buttons) {
   rb_iv_set(self, "@var", rb_hash_new());
   rb_iv_set(self, "@bindings", rb_hash_new());
   BOOL flag = NO;
@@ -220,8 +254,14 @@ VALUE webview_initialize(VALUE self, VALUE debug, VALUE style) {
     flag = NO;
   }
 
+  BOOL c_move_title_buttons = NO;
+  if (move_title_buttons == Qtrue) {
+    c_move_title_buttons = YES;
+  } else {
+    c_move_title_buttons = NO;
+  }
   int c_style = NUM2INT(style);
-  CocoaWebview *webview = [[CocoaWebview alloc] initWithFrame:NSMakeRect(100, 100, 400, 500) debug:flag style:c_style];
+  CocoaWebview *webview = [[CocoaWebview alloc] initWithFrame:NSMakeRect(100, 100, 400, 500) debug:flag style:c_style moveTitleButtons:c_move_title_buttons];
 
   [webview setReleasedWhenClosed:NO];
   [webview setCocoaWebview:self];
@@ -238,6 +278,7 @@ VALUE webview_show(VALUE self) {
     VALUE wrapper = rb_ivar_get(self, rb_intern("@webview"));
     CocoaWebview *webview;
     TypedData_Get_Struct(wrapper, CocoaWebview, &cocoawebview_obj_type, webview);
+    [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
     [webview makeKeyAndOrderFront:nil];
 }
 

data/lib/cocoawebview/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cocoawebview
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/cocoawebview.rb

@@ -24,7 +24,7 @@ module CocoaWebview
   class CocoaWebview
     attr_accessor :callback
 
-    def self.create(debug: false, min: true, resize: true, close: true, &block)
+    def self.create(debug: false, min: true, resize: true, close: true, move_title_buttons: false, &block)
       style = NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView
 
       style = style | NSWindowStyleMaskMiniaturizable if min
@@ -33,7 +33,7 @@ module CocoaWebview
 
       style &= ~NSWindowStyleMaskFullScreen
 
-      webview = new(debug, style)
+      webview = new(debug, style, move_title_buttons)
       webview.callback = block
       webview
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoawebview
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Tommy Jeff