motion-popup 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956fa4f7b20fe96de2493b8e49229b05c25e171c
-  data.tar.gz: 8df7870f25b784728a4794c8d60a6db51f742cb6
+  metadata.gz: 349ce4caca5297442f1cc5ac456014bed902d675
+  data.tar.gz: c84ee1a83b3a418bba6c418f62f5f10db592191a
 SHA512:
-  metadata.gz: 61cc869b3b688cb2c3f7e6ea51dd27aa86c51e9331dae9ca713313639308eed8ed1fc214db582b8cbde1e195757ef20f3faaa72329e100f67aecaed5e400a534
-  data.tar.gz: 1919d1f5bb96c7324fc7ee81312e91ac0fa370f2e115aba0faffaaf7adc436b5867132137c868ea3345344eaa02356dfa953f9fb92bc2e6cf3760470829d0f15
+  metadata.gz: 97d15f49142a7c34851d5d03948cfbc3db544078097e0d9d7a2550e35ac775bae0a0fec6ad9796b64153e5af6e58b4efb352cb4175c6256edb465b54ea02b657
+  data.tar.gz: 69bb1a03c380fc4c9fdde64f7bc1e00ed854fda9dbbe8ea6c26b4e3f9da3f5fc5ea7e25ff586108f154709942aa17ec639b6a5a0582fe90ce4d53ed99bd1947f

data/README.md

@@ -1,6 +1,6 @@
 # motion-popup
 
-Customisable fancy popup window for your Mac OS X status bar apps
+Customisable fancy popup windows for your Mac OS X apps
 
 ## Requirements
 
@@ -60,6 +60,20 @@ For example, you can set the window as the delegate for your status menu item, a
 
 This handles updating the windows position to sit under the menu item, with the arrow pointer directly in the middle. The window itself handles hiding itself when it loses focus, and ensuring the toggle then allows it to be reshown when the menu is clicked again.
 
+For a free floating window, you can specify a frame - for example, for a centered popup window, you can call:
+
+```ruby
+@window.toggleWithFrame(CGRectMake(0, 0, 0, 0))
+@window.center
+```
+
+You can also turn off the arrow on the window when you create it, if it's not needed:
+
+```ruby
+@window = Motion::Popup::Panel.alloc.initPopup(POPUP_WIDTH, POPUP_HEIGHT)
+@window.arrow = false
+```
+
 ## Contributors
 
 * Elliott Draper

data/lib/motion/popup/background.rb

@@ -13,12 +13,18 @@ class Motion::Popup::Background < NSView
   end
 
   def drawRect(rect)
-    return unless @arrow_x
     content_rect = NSInsetRect(self.bounds, self.line_thickness, self.line_thickness)
     path = NSBezierPath.bezierPath
 
-    path.moveToPoint(NSMakePoint(@arrow_x, NSMaxY(content_rect)))
-    path.lineToPoint(NSMakePoint(@arrow_x + self.arrow_width / 2, NSMaxY(content_rect) - self.arrow_height))
+    top_left_corner = NSMakePoint(NSMinX(content_rect), NSMaxY(content_rect) - self.arrow_height)
+
+    path.moveToPoint(NSMakePoint(top_left_corner.x + self.corner_radius, top_left_corner.y))
+
+    if @arrow_x
+        path.lineToPoint(NSMakePoint(@arrow_x - self.arrow_width / 2, NSMaxY(content_rect) - self.arrow_height))
+        path.lineToPoint(NSMakePoint(@arrow_x, NSMaxY(content_rect)))
+        path.lineToPoint(NSMakePoint(@arrow_x + self.arrow_width / 2, NSMaxY(content_rect) - self.arrow_height))
+    end
     path.lineToPoint(NSMakePoint(NSMaxX(content_rect) - self.corner_radius, NSMaxY(content_rect) - self.arrow_height))
 
     top_right_corner = NSMakePoint(NSMaxX(content_rect), NSMaxY(content_rect) - self.arrow_height)
@@ -35,10 +41,10 @@ class Motion::Popup::Background < NSView
 
     path.lineToPoint(NSMakePoint(NSMinX(content_rect), NSMaxY(content_rect) - self.arrow_height - self.corner_radius))
 
-    top_left_corner = NSMakePoint(NSMinX(content_rect), NSMaxY(content_rect) - self.arrow_height)
+    
     path.curveToPoint(NSMakePoint(NSMinX(content_rect) + self.corner_radius, NSMaxY(content_rect) - self.arrow_height), controlPoint1: top_left_corner, controlPoint2: top_left_corner)
 
-    path.lineToPoint(NSMakePoint(@arrow_x - self.arrow_width / 2, NSMaxY(content_rect) - self.arrow_height))
+    
     path.closePath
 
     NSColor.whiteColor.setFill

data/lib/motion/popup/panel.rb

@@ -1,5 +1,5 @@
 class Motion::Popup::Panel < NSPanel
-  attr_accessor :background
+  attr_accessor :background, :arrow
 
   def initPopup(width, height)
     self.initWithContentRect([[0, 0], [width, height]],
@@ -14,19 +14,25 @@ class Motion::Popup::Panel < NSPanel
     self.background = Motion::Popup::Background.alloc.initWithFrame(self.frame)
     self.setContentView(self.background)
 
+    self.arrow = true
+
     self
   end
 
   def toggle
+    self.toggleWithFrame(NSApp.currentEvent.window.frame)
+  end
+
+  def toggleWithFrame(frame)
     if self.isVisible
       self.orderOut(false)
     else
-      event_frame = NSApp.currentEvent.window.frame
+      event_frame = frame
       window_frame = self.frame
       window_top_left_position = CGPointMake(event_frame.origin.x + (event_frame.size.width / 2) - (window_frame.size.width / 2), event_frame.origin.y)
       self.setFrameTopLeftPoint(window_top_left_position)
 
-      self.background.setArrowX(window_frame.size.width / 2)
+      self.background.setArrowX(window_frame.size.width / 2) if self.arrow
 
       NSApp.activateIgnoringOtherApps(true)
       self.makeKeyAndOrderFront(self)

data/lib/motion/popup/version.rb

@@ -1,5 +1,5 @@
 module Motion
   module Popup
-    VERSION = 1.0
+    VERSION = 1.1
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-popup
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Elliott Draper