minigl 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee71302e4c1c310af7e3c6357b99d7678c26c7a2
-  data.tar.gz: 828af95552ce471ca273253326553c483421ea23
+  metadata.gz: 7d947f9f6b2942d8c013e40a3bcb133c05e568b5
+  data.tar.gz: 73a2e40462939be5c50da793498365fee9b6317a
 SHA512:
-  metadata.gz: 679b54d84b1c9df920e8fa425532554c1ee4d9abc651c38bf222e74dcb9469548aad710656be78e5d7807bfad6d576cb60fba73c03887f426ffaf6ba6d8c310b
-  data.tar.gz: d36f9fee78e3fcd54a47d422f5bfa82fee2479e6ec47f7d2ffe560703ba09e063645017f0c490a2f4363472d70f59f3029dc5a6e79f935e3957c8e50c1095702
+  metadata.gz: efbef16eee12d57c33ce6083ac0ec633658c46a9f0a32a1ecde2ec76f386f924d69f0a412fd70087d627bb05f692b3c44da3cc1a597a9ed45fd93e9089b01dd6
+  data.tar.gz: 9c794f33476e267e804fac724c396da080918b8fb7fb6ea0fc047fabda804afa3ff4509a5937676acee0c6a540b1193b072f33dfd1081989ab5d0ea59ea3ad98

data/README.md

@@ -19,5 +19,10 @@ Please note:
 provided by the gem is difficult to test automatically, but you can check out
 this [working game example](https://github.com/victords/aventura-do-saber).
   * The [documentation](https://github.com/victords/minigl/wiki) is under
-construction. 
+construction.
 
+**Version 1.2.2**
+
+  * Adjust in `Res.font` to distinguish fonts loaded with different sizes.
+  * Adjust in `TextField` to draw cursor image in the correct position and
+z-index.

data/lib/minigl/forms.rb

@@ -343,8 +343,17 @@ module AGL
 		
 		def draw
 			@img.draw @x, @y, 0
+			@font.draw @text, @text_x, @text_y, 0, 1, 1, 0xff000000
+			
+			if @anchor1 and @anchor2
+				Game.window.draw_quad @nodes[@anchor1], @text_y, 0x80000000,
+				                      @nodes[@anchor2] + 1, @text_y, 0x80000000,
+				                      @nodes[@anchor2] + 1, @text_y + @font.height, 0x80000000,
+				                      @nodes[@anchor1], @text_y + @font.height, 0x80000000, 0
+			end
+			
 			if @cursor_visible
-				if @cursor_img; @cursor_img.draw @text_x, @text_y, 0
+				if @cursor_img; @cursor_img.draw @nodes[@cur_node] - @cursor_img.width / 2, @text_y, 0
 				else
 					Game.window.draw_quad @nodes[@cur_node], @text_y, 0xff000000,
 					                      @nodes[@cur_node] + 1, @text_y, 0xff000000,
@@ -352,14 +361,6 @@ module AGL
 					                      @nodes[@cur_node], @text_y + @font.height, 0xff000000, 0
 				end
 			end
-			@font.draw @text, @text_x, @text_y, 0, 1, 1, 0xff000000
-			
-			if @anchor1 and @anchor2
-				Game.window.draw_quad @nodes[@anchor1], @text_y, 0x80000000,
-				                   @nodes[@anchor2] + 1, @text_y, 0x80000000,
-				                   @nodes[@anchor2] + 1, @text_y + @font.height, 0x80000000,
-				                   @nodes[@anchor1], @text_y + @font.height, 0x80000000, 0
-			end
 		end
 	end
 end

data/lib/minigl/global.rb

@@ -222,10 +222,11 @@ module AGL
 		
 		def self.font id, size, global = true, ext = ".ttf"
 			if global; a = @@global_fonts; else; a = @@fonts; end
-			return a[id] if a[id]
+			id_size = "#{id}_#{size}"
+			return a[id_size] if a[id_size]
 			s = "data/font/" + id.to_s.split('_').join('/') + ext
 			font = Gosu::Font.new Game.window, s, size
-			a[id] = font
+			a[id_size] = font
 		end
 		
 #		def self.text id

metadata

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