cocoawebview 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67dea26836b578972cb64aa402855e157adc34db292a5efa20492a3d30a9a758
-  data.tar.gz: 983bd44da2e1a7dcd3f18b3792677c613cfe710ef95331d2efbfc05df73a2aca
+  metadata.gz: b434fa5361c35d5a60d14a7c817e353896e2748b7a5663f0220b6ca7481f01f1
+  data.tar.gz: 87ff99830e7533c2579f8525e042e9c0e19212b03babaeff3942a452cd022499
 SHA512:
-  metadata.gz: ab51c9514cdf7186675f94bc7e152e58d149033f1bf1243eb82bea31ad88afa84058d66788ae72b761987b338c442f2fad953c999dc501069875bb4afd0f98fb
-  data.tar.gz: 7b0f01438d1d13487a5e23a0356c699d7f32d0e315aaa76232cd6b843ea12d9e550316044018eec9f69e2af2114292f34cb63c71e3c0fdf2e99b5c1bc9cc4d4e
+  metadata.gz: b4a99f3ffebd8b527c0155f569dac8fdd4634241b042a69d74815fda262816267f85a8708df444e30a18ea49bc14206b44dfe98a24d31e9ded533d7f847df088
+  data.tar.gz: acc2363c86cf15816129176aaa863d89b6b810f1967a0aba5f3b2851168b432ed4649849cecd4dbfa06d9abc435c6c1d057778dfd33b66996c36fa018ea89cf7

data/ext/cocoawebview/cocoawebview.m

@@ -10,7 +10,7 @@ NSApplication *application = nil;
 VALUE nsapp_initialize(VALUE self);
 VALUE nsapp_run(VALUE self);
 
-VALUE webview_initialize(VALUE self, VALUE debug);
+VALUE webview_initialize(VALUE self, VALUE debug, VALUE style);
 VALUE webview_show(VALUE self);
 VALUE webview_hide(VALUE self);
 VALUE webview_eval(VALUE self, VALUE code);
@@ -19,6 +19,7 @@ VALUE webview_get_size(VALUE self);
 VALUE webview_set_pos(VALUE self, VALUE x, VALUE y);
 VALUE webview_get_pos(VALUE self);
 VALUE webview_dragging(VALUE self);
+VALUE webview_set_title(VALUE self, VALUE title);
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     VALUE app;
@@ -42,17 +43,14 @@ VALUE webview_dragging(VALUE self);
     BOOL showDevTool;
 }
 - (void)setDevTool:(BOOL)flag;
-- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag;
+- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style;
 - (void)eval:(NSString*)code;
 - (void)setCocoaWebview:(VALUE)view;
 - (void)dragging;
 @end
 
 @implementation CocoaWebview
-- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag {
-    int style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
-                 NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskFullSizeContentView;
-    style &= ~NSWindowStyleMaskFullScreen;
+- (id)initWithFrame:(NSRect)frame debug:(BOOL)flag style:(int)style{
     self = [super initWithContentRect:frame
                             styleMask:style
                               backing:NSBackingStoreBuffered
@@ -62,6 +60,7 @@ VALUE webview_dragging(VALUE self);
         [self setTitle:@"My Custom Window"];
         [self setDevTool:flag];
         [self setTitlebarAppearsTransparent: YES];
+        [self setTitleVisibility:NSWindowTitleHidden];
         [self addWebViewToWindow:self];
     }
     return self;
@@ -173,7 +172,7 @@ Init_cocoawebview(void)
 
   /* CocoaWebview */
   rb_mCocoaWebviewClass = rb_define_class_under(rb_mCocoawebview, "CocoaWebview", rb_cObject);
-  rb_define_method(rb_mCocoaWebviewClass, "initialize", webview_initialize, 1);
+  rb_define_method(rb_mCocoaWebviewClass, "initialize", webview_initialize, 2);
   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);
@@ -182,6 +181,7 @@ Init_cocoawebview(void)
   rb_define_method(rb_mCocoaWebviewClass, "set_pos", webview_set_pos, 2);
   rb_define_method(rb_mCocoaWebviewClass, "get_pos", webview_get_pos, 0);
   rb_define_method(rb_mCocoaWebviewClass, "dragging", webview_dragging, 0);
+  rb_define_method(rb_mCocoaWebviewClass, "set_title", webview_set_title, 1);
 }
 
 VALUE nsapp_initialize(VALUE self) {
@@ -197,7 +197,7 @@ VALUE nsapp_run(VALUE self) {
     [application run];
 }
 
-VALUE webview_initialize(VALUE self, VALUE debug) {
+VALUE webview_initialize(VALUE self, VALUE debug, VALUE style) {
   rb_iv_set(self, "@var", rb_hash_new());
   rb_iv_set(self, "@bindings", rb_hash_new());
   BOOL flag = NO;
@@ -206,7 +206,12 @@ VALUE webview_initialize(VALUE self, VALUE debug) {
   } else {
     flag = NO;
   }
-  CocoaWebview *webview = [[CocoaWebview alloc] initWithFrame:NSMakeRect(100, 100, 400, 500) debug:flag];
+
+  //int c_style = NUM2INT(style);
+  int c_style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable |
+                 NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskFullSizeContentView;
+  style &= ~NSWindowStyleMaskFullScreen;
+  CocoaWebview *webview = [[CocoaWebview alloc] initWithFrame:NSMakeRect(100, 100, 400, 500) debug:flag style:c_style];
 
   [webview setReleasedWhenClosed:NO];
   [webview setCocoaWebview:self];
@@ -311,3 +316,13 @@ VALUE webview_dragging(VALUE self) {
 
     [webview dragging];
 }
+
+VALUE webview_set_title(VALUE self, VALUE title) {
+    VALUE wrapper = rb_ivar_get(self, rb_intern("@webview"));
+    CocoaWebview *webview;
+    TypedData_Get_Struct(wrapper, CocoaWebview, &cocoawebview_obj_type, webview);
+
+    const char *c_title = StringValueCStr(title);
+    NSString *title_str = [[NSString alloc] initWithCString:c_title encoding:NSUTF8StringEncoding];
+    [webview setTitle:title_str];
+}

data/lib/cocoawebview/version.rb

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

data/lib/cocoawebview.rb

@@ -5,6 +5,13 @@ require_relative "cocoawebview/version"
 require_relative "cocoawebview/cocoawebview"
 
 module CocoaWebview
+  NSWindowStyleMaskResizable = 8
+  NSWindowStyleMaskMiniaturizable = 4
+  NSWindowStyleMaskTitled = 1
+  NSWindowStyleMaskClosable = 2
+  NSWindowStyleMaskFullSizeContentView = (1 << 15)
+  NSWindowStyleMaskFullScreen = (1 << 14)
+
   class Error < StandardError; end
   # Your code goes here...
 
@@ -15,6 +22,22 @@ module CocoaWebview
   end
 
   class CocoaWebview
+    attr_accessor :callback
+
+    def self.create(debug: false, min: true, max: true, close: true, &block)
+      style = NSWindowStyleMaskTitled | NSWindowStyleMaskFullSizeContentView
+
+      style = style | NSWindowStyleMaskMiniaturizable if min
+      style = style | NSWindowStyleMaskResizable if max
+      style = style | NSWindowStyleMaskClosable if close
+
+      style &= ~NSWindowStyleMaskFullScreen
+
+      webview = new(debug, style)
+      webview.callback = block
+      webview
+    end
+
     def get_webview
       @webview
     end

metadata

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