minigl 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33a7e31b76d2c0a419ac03bc766d6007650129df
-  data.tar.gz: 2fb3a8a9df9915b64e241b09363d3191494d2297
+  metadata.gz: 01d773ef32ca54ed13e397c386708830e7731e8e
+  data.tar.gz: 810ff8899be10ec787147090c539ac0d7608f603
 SHA512:
-  metadata.gz: 676c67bd7a8475cd4f46dab03cad823d40b20b7b1e504b3b443d074d441f72473af077cf37dffb2c4830a17c2d86289ad5fa9c6d948d32fc80977cb1cbbb988f
-  data.tar.gz: a680e44471368044703cd69557329ffc70340a9281c796d992c54a959ce4214b1c05e84f2ec74dfe126cddf9b2fdc3045b1a344d878e7e79d660ca265b836124
+  metadata.gz: 25128512170f5275e48a8baec43555ab0307f246703cde5eeb55a5d2d4a52ffa9dbc055d5bb7933786eac9c7f00e289c03d8acb982d1aed514482127ebe8f952
+  data.tar.gz: 7e0a5f25b732eaba12c1156e471ea7e1cff6a68774e09be3f3d6e29fbb43903f67420b7aabab0f08640467e34ef24a7a1226d7d05a8f26f17f0c9eaf701db7d1

data/README.md

@@ -21,8 +21,9 @@ this [working game example](https://github.com/victords/aventura-do-saber).
   * The [documentation](https://github.com/victords/minigl/wiki) is under
 construction.
 
-**Version 1.2.4**
+**Version 1.2.5**
 
-  * Moved color options from `draw` to `initialize` in `Button` and `TextField`.
-  * Added focus control to `TextField`.
-  * Marked some methods of various classes as private.
+  * Added support for "invisible" buttons (for associating actions with clicks
+in screen areas).
+  * Exposed `Button`'s `click` method and `TextField`'s `focus` and `unfocus`
+methods.

data/lib/minigl/forms.rb

@@ -2,15 +2,20 @@ require_relative 'global'
 
 module AGL
 	class Button
-		def initialize x, y, font, text, img, text_color = 0, center = true, margin_x = 0, margin_y = 0, &action
+		def initialize x, y, font, text, img, text_color = 0, center = true, margin_x = 0, margin_y = 0, width = nil, height = nil, &action
 			@x = x
 			@y = y
 			@font = font
 			@text = text
-			@img = Res.imgs img, 1, 3, true
-			@text_color = text_color
-			@w = @img[0].width
-			@h = @img[0].height
+			@img =
+				if img; Res.imgs img, 1, 3, true
+				else; nil; end
+			@w =
+				if img; @img[0].width
+				else; width; end
+			@h =
+				if img; @img[0].height
+				else; height; end
 			if center
 				@text_x = x + @w / 2
 				@text_y = y + @h / 2
@@ -18,6 +23,7 @@ module AGL
 				@text_x = x + margin_x
 				@text_y = y + margin_y
 			end
+			@text_color = text_color
 			@center = center
 			@action = Proc.new &action
 		
@@ -50,7 +56,7 @@ module AGL
 				elsif mouse_rel
 					@img_index = 0
 					@state = :up
-					@action.call
+					click
 				end
 			elsif @state == :down_out
 				if mouse_over
@@ -63,14 +69,20 @@ module AGL
 			end
 		end
 		
+		def click
+			@action.call
+		end
+		
 		def draw alpha = 0xff
 			color = (alpha << 24) | 0xffffff
 			text_color = (alpha << 24) | @text_color
-			@img[@img_index].draw @x, @y, 0, 1, 1, color
-			if @center
-				@font.draw_rel @text, @text_x, @text_y, 0, 0.5, 0.5, 1, 1, text_color
-			else
-				@font.draw @text, @text_x, @text_y, 0, 1, 1, text_color
+			@img[@img_index].draw @x, @y, 0, 1, 1, color if @img
+			if @text
+				if @center
+					@font.draw_rel @text, @text_x, @text_y, 0, 0.5, 0.5, 1, 1, text_color
+				else
+					@font.draw @text, @text_x, @text_y, 0, 1, 1, text_color
+				end
 			end
 		end
 	end
@@ -144,17 +156,21 @@ module AGL
 			@active = true
 		end
 		
+		def unfocus
+			@anchor1 = @anchor2 = nil
+			@cursor_visible = false
+			@cursor_timer = 0
+			@active = false
+		end
+		
 		def update
 			################################ Mouse ################################
 			if Mouse.over? @x, @y, @w, @h
 				if not @active and Mouse.button_pressed? :left
-					@active = true
+					focus
 				end
 			elsif Mouse.button_pressed? :left
-				@anchor1 = @anchor2 = nil
-				@cursor_visible = false
-				@cursor_timer = 0
-				@active = false
+				unfocus
 			end
 			
 			return unless @active

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu