Added every and after timers to DSL

README.md

@@ -35,7 +35,7 @@ class Hello < CyberarmEngine::GuiState
     background Gosu::Color::GRAY
 
     stack do
-      banner "Hello World!"
+      label "Hello World!"
 
       button "close" do
         window.close

lib/cyberarm_engine.rb

@@ -9,6 +9,7 @@ require "json"
 
 require_relative "cyberarm_engine/version"
 require_relative "cyberarm_engine/stats"
+require_relative "cyberarm_engine/result"
 
 require_relative "cyberarm_engine/common"
 

lib/cyberarm_engine/game_state.rb

@@ -3,11 +3,12 @@ module CyberarmEngine
     include Common
 
     attr_accessor :options, :global_pause
-    attr_reader :game_objects
+    attr_reader :game_objects, :timers
 
     def initialize(options = {})
       @options = options
       @game_objects = []
+      @timers = []
       @global_pause = false
       window.text_input = nil unless options[:preserve_text_input]
 
@@ -28,6 +29,8 @@ module CyberarmEngine
 
     def update
       @game_objects.each(&:update)
+      @timers.each(&:update)
+      @timers.delete_if(&:dead?)
     end
 
     def needs_redraw?
@@ -120,5 +123,9 @@ module CyberarmEngine
     def add_game_object(object)
       @game_objects << object
     end
+
+    def add_timer(timer)
+      @timers << timer
+    end
   end
 end

lib/cyberarm_engine/result.rb

@@ -0,0 +1,20 @@
+module CyberarmEngine
+  # result pattern
+  class Result
+    attr_accessor :error, :data
+
+    def initialize(data: nil, error: nil)
+      @data = data
+      @error = error
+    end
+
+    def okay?
+      !@error
+    end
+
+    def error?
+      @error || @data.nil?
+    end
+  end
+end
+

lib/cyberarm_engine/timer.rb

@@ -19,5 +19,9 @@ module CyberarmEngine
         @block.call if @block
       end
     end
+
+    def dead?
+      @triggered && !@looping
+    end
   end
 end

lib/cyberarm_engine/ui/dsl.rb

@@ -1,5 +1,17 @@
 module CyberarmEngine
   module DSL
+    def every(milliseconds, &block)
+      element_parent.gui_state.add_timer(
+        CyberarmEngine::Timer.new(milliseconds, true, &block)
+      )
+    end
+
+    def after(milliseconds, &block)
+      element_parent.gui_state.add_timer(
+        CyberarmEngine::Timer.new(milliseconds, false, &block)
+      )
+    end
+
     def flow(options = {}, &block)
       container(CyberarmEngine::Element::Flow, options, &block)
     end

lib/cyberarm_engine/ui/elements/edit_box.rb

@@ -79,7 +79,19 @@ module CyberarmEngine
       end
 
       def caret_position_under_mouse(mouse_x, mouse_y)
-        active_line = row_at(mouse_y)
+        # get y scroll offset of element to get EditBox's selected row
+        y_scroll_offset = 0
+        e = parent
+        while (e)
+          if e.is_a?(Container)
+            y_scroll_offset += e.scroll_position.y
+
+            # root element has no parent so loop will terminate
+            e = e.parent
+          end
+        end
+
+        active_line = row_at(mouse_y - y_scroll_offset)
         right_offset = column_at(mouse_x, mouse_y)
 
         buffer = @text_input.text.lines[0..active_line].join if active_line != 0

lib/cyberarm_engine/ui/gui_state.rb

@@ -6,6 +6,7 @@ module CyberarmEngine
     def initialize(options = {})
       @options = options
       @game_objects = []
+      @timers = []
       @global_pause = false
 
       @down_keys = {}
@@ -271,10 +272,14 @@ module CyberarmEngine
     end
 
     def redirect_scroll_jump_to(edge)
+      return if window.text_input
+
       @mouse_over.publish(:"scroll_jump_to_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 
     def redirect_scroll_page(edge)
+      return if window.text_input
+
       @mouse_over.publish(:"scroll_page_#{edge}", window.mouse_x, window.mouse_y) if (@mouse_over && !@menu) || (@mouse_over && @mouse_over == @menu)
     end
 

lib/cyberarm_engine/version.rb

@@ -1,4 +1,4 @@
 module CyberarmEngine
   NAME    = "InDev".freeze
-  VERSION = "0.25.0".freeze
+  VERSION = "0.25.1".freeze
 end