luit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1436b86b008835a0cb13443052dc1148939e9ef
-  data.tar.gz: 17774adee9b3587043bedbae952879e0d4c6fc8d
+  metadata.gz: a098ee7bfa46b0e484c5da472f6a37f1e741b282
+  data.tar.gz: 92535e1563b72d5fb8e5ec3a34559ea71997249f
 SHA512:
-  metadata.gz: 62e16374f0d197cb0fc4c2bc2ef1e89b5a76de8aa08c18d66ddd462fe07344f4966c45c58c20ef751cbde0063c902ee3c95f1d2a09f50c0505b63617c7f7e190
-  data.tar.gz: 4817aa7910d0dc38d575bd29a9dbcbb157a987f3664f1dbc2f1948396a1c0355b3703acea0786c673daf522edd28308f1c8cbdafd75499cbeb08689eff3686b1
+  metadata.gz: 9be6cee94a24e2c5b0b17577f16e638f153a6d57997b6cb0177eed1990dc0522df013072e4cc2c50db881ca5c89a903a879c36beff8c5d9f9e528c46dfb61d52
+  data.tar.gz: cf0e40d2fe57639716e73b108e8a817dd7fddb91ecda21b61972c5be9ea891bdf00f60c5218675724dc53ac732ac638d23765eaa8b781cb81ec193f9b675dc13

data/lib/luit.rb

@@ -29,7 +29,7 @@ module LUIT
 	def self.mY
 		@window.mouse_y
 	end
-	
+
 	#Raspberry pi touchscreen hack
 	def self.updateTouch()
 		if @touchDown
@@ -62,7 +62,7 @@ module LUIT
 		def draw_rel(x = 0, y = 0)
 			draw(x - (@w/2), y - (@h/2))
 		end
-		
+
 		def updateHover(x, y)
 			@hover = LUIT.mX.between?(x, x + @w) && LUIT.mY.between?(y, y + @h)
 		end
@@ -109,7 +109,7 @@ module LUIT
 	end
 
 	class TextArea < LUITElement
-		attr_reader :text
+		attr_reader :field
 		def initialize(holder, id, x, y, maxChar, h)
 			h = [10, h].max
 			@font = Gosu::Font.new(h)
@@ -139,7 +139,7 @@ module LUIT
 		def draw(x = 0, y = 0)
 			x = x + @x
 			y = y + @y
-			Gosu::draw_rect(x, y, @w, @h, @typing ? 0xff_ffffff : LUIT.uiColor, LUIT.z)
+			Gosu::draw_rect(x, y, @w, @h, @typing ? 0xffffffff : LUIT.uiColor, LUIT.z)
 			@font.draw(@field.text, x + 10, y + 10, LUIT.z + 1, 1, 1, 0xff000000)
 		end
 
@@ -165,28 +165,29 @@ module LUIT
 	end
 
 	class ScannerInput
-		attr_reader :scanning
-		def initialize(holder, id, window)
+		attr_reader :scnning
+		def initialize(holder, id)
 			@field = Gosu::TextInput.new
-			@window = window
+			@window = LUIT.window
 			@holder = holder
 			@id = id
 		end
 
 		def update
-			if Gosu::button_down?(Gosu::KbReturn) && @scanning
+			if Gosu::button_down?(Gosu::KbReturn) && @scaning
 				@holder.onScan(@field.text)
 				@field.text = ""
+				stop
 			end
 		end
 
 		def stop
-			@scanning = false
+			@scaning = false
 			@window.text_input = nil if @window.text_input == @field
 		end
 
 		def scan
-			@scanning = true
+			@scaning = true
 			@window.text_input = @field
 		end
 	end
@@ -244,7 +245,7 @@ module LUIT
 			Gosu::draw_rect(@x + x, @y + y + 10, @w, 10, @buttonColor, LUIT.z)
 			Gosu::draw_rect(@x + x + @value, @y + y, 10, @h, @buttonColor, LUIT.z + 1)
 		end
-		
+
 		def updateHover(x, y)
 			@hover = LUIT.mX.between?(x - 10, x + @w + 20) && LUIT.mY.between?(y - 10, y + @h + 20)
 		end
@@ -278,11 +279,11 @@ module LUIT
 			Gosu::draw_rect(@x + x + 10, @y + y, 10, @h, @buttonColor, LUIT.z)
 			Gosu::draw_rect(@x + x, @y + y  + @value, @w, 10, @buttonColor, LUIT.z + 1)
 		end
-		
+
 		def updateHover(x, y)
 			@hover = LUIT.mX.between?(x - 10, x + @w + 20) && LUIT.mY.between?(y - 10, y + @h + 20)
 		end
-		
+
 		def update(x = 0, y = 0)
 			x += @x
 			y += @y
@@ -423,9 +424,9 @@ if __FILE__ == $0
 	class Test < Gosu::Window
 		def initialize
 			super(1000, 1000, false)
-			
+
 			LUIT.config(window: self)
-			
+
 			@LUITElements = []
 			@LUITElements << LUIT::Button.new(self, 1, 0, 0, "Test")
 			@LUITElements << LUIT::Button.new(self, 2, 111, 111, "Big button", 200, 70)
@@ -443,6 +444,7 @@ if __FILE__ == $0
 				@list << LUIT::Button.new(self, 1, 0, 0, "Test", 0, 50)
 			end
 			@font = Gosu::Font.new(30)
+			@scanner = LUIT::ScannerInput.new(self, "dik")
 		end
 
 		def draw
@@ -452,14 +454,22 @@ if __FILE__ == $0
 
 		def update
 			@LUITElements.each {|e| e.update}
+			@scanner.update
 		end
 
 		def button_down(id)
-			if id == Gosu::KbSpace
+			case id
+			when Gosu::KbSpace
 				@list << LUIT::Button.new(self, 1, 0, 0, "Test", 0, 50)
+			when Gosu::KbX
+				@scanner.scan
 			end
 		end
 
+		def onScan(text)
+			puts text
+		end
+
 		def onClick(id)
 			puts id
 			if id == "text"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Leddy231