cyberarm_engine 0.12.1 → 0.13.0

data/lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -1,103 +1,172 @@
-module CyberarmEngine
-  class Element
-    class EditLine < Button
-      def initialize(text, options = {}, block = nil)
-        super(text, options, block)
-
-        @type = default(:type)
-
-        @caret_width = default(:caret_width)
-        @caret_height= @text.height
-        @caret_color = default(:caret_color)
-        @caret_interval = default(:caret_interval)
-        @caret_last_interval = Gosu.milliseconds
-        @show_caret  = true
-
-        @text_input = Gosu::TextInput.new
-        @text_input.text = text
-
-        return self
-      end
-
-      def render
-        Gosu.clip_to(@text.x, @text.y, @style.width, @text.height) do
-          draw_text
-          Gosu.draw_rect(caret_position, @text.y, @caret_width, @caret_height, @caret_color, @z + 40) if @focus && @show_caret
-        end
-      end
-
-      def update
-        if @type == :password
-          @text.text = default(:password_character) * @text_input.text.length
-        else
-          @text.text = @text_input.text
-        end
-
-        if Gosu.milliseconds >= @caret_last_interval + @caret_interval
-          @caret_last_interval = Gosu.milliseconds
-
-          @show_caret = !@show_caret
-        end
-      end
-
-      def left_mouse_button(sender, x, y)
-        super
-        window.text_input = @text_input
-
-        @caret_last_interval = Gosu.milliseconds
-        @show_caret = true
-
-        return :handled
-      end
-
-      def enter(sender)
-        if @focus
-          @style.background_canvas.background = default(:active, :background)
-          @text.color = default(:active, :color)
-        else
-          @style.background_canvas.background = default(:hover, :background)
-          @text.color = default(:hover, :color)
-        end
-
-        return :handled
-      end
-
-      def leave(sender)
-        unless @focus
-          super
-        end
-
-        return :handled
-      end
-
-      def blur(sender)
-        @focus = false
-        @style.background_canvas.background = default(:background)
-        @text.color = default(:color)
-        window.text_input = nil
-
-        return :handled
-      end
-
-      # TODO: Fix caret rendering in wrong position unless caret_pos is at end of text
-      def caret_position
-        if @type == :password
-          @text.x + @text.textobject.text_width(default(:password_character) * @text_input.text[0..@text_input.caret_pos-1].length)
-        else
-          @text.x + @text.textobject.text_width(@text_input.text[0..@text_input.caret_pos-1])
-        end
-      end
-
-      def recalculate
-        super
-
-        @width = dimensional_size(@style.width, :width) || default(:width)
-        update_background
-      end
-
-      def value
-        @text_input.text
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class EditLine < Button
+      def initialize(text, options = {}, block = nil)
+        super(text, options, block)
+
+        @type = default(:type)
+
+        @caret_width = default(:caret_width)
+        @caret_height= @text.height
+        @caret_color = default(:caret_color)
+        @caret_interval = default(:caret_interval)
+        @caret_last_interval = Gosu.milliseconds
+        @show_caret  = true
+
+        @text_input = Gosu::TextInput.new
+        @text_input.text = text
+
+        @offset_x = 0
+
+        return self
+      end
+
+      def render
+        Gosu.clip_to(@text.x, @text.y, @style.width, @text.height) do
+          Gosu.translate(-@offset_x, 0) do
+            draw_selection
+            draw_caret if @focus && @show_caret
+            draw_text
+          end
+        end
+      end
+
+      def draw_caret
+        Gosu.draw_rect(caret_position, @text.y, @caret_width, @caret_height, @caret_color, @z)
+      end
+
+      def draw_selection
+        selection_width = caret_position - selection_start_position
+
+        Gosu.draw_rect(selection_start_position, @text.y, selection_width, @text.height, default(:selection_color), @z)
+      end
+
+      def update
+        if @type == :password
+          @text.text = default(:password_character) * @text_input.text.length
+        else
+          @text.text = @text_input.text
+        end
+
+        if Gosu.milliseconds >= @caret_last_interval + @caret_interval
+          @caret_last_interval = Gosu.milliseconds
+
+          @show_caret = !@show_caret
+        end
+
+        keep_caret_visible
+      end
+
+      def move_caret_to_mouse(mouse_x)
+        1.upto(@text.text.length) do |i|
+          if mouse_x < @text.x + @text.textobject.text_width(@text.text[0...i])
+            @text_input.caret_pos = @text_input.selection_start = i - 1;
+            return
+          end
+        end
+
+        @text_input.caret_pos = @text_input.selection_start = @text_input.text.length
+      end
+
+      def keep_caret_visible
+        caret_pos = (caret_position - @text.x) + @caret_width
+
+        @last_text ||= "/\\"
+        @last_pos ||= -1
+
+        puts "caret pos: #{caret_pos}, width: #{@width}, offset: #{@offset_x}" if (@last_text != @text.text) || (@last_pos != caret_pos)
+
+        @last_text = @text.text
+        @last_pos = caret_pos
+
+
+        if caret_pos.between?(@offset_x, @width + @offset_x)
+          # Do nothing
+
+        elsif caret_pos < @offset_x
+          if caret_pos > @width
+            @offset_x = caret_pos + @width
+          else
+            @offset_x = 0
+          end
+
+        elsif caret_pos > @width
+          @offset_x = caret_pos - @width
+          puts "triggered"
+
+        else
+          # Reset to Zero
+          @offset_x = 0
+        end
+      end
+
+      def left_mouse_button(sender, x, y)
+        super
+        window.text_input = @text_input
+
+        @caret_last_interval = Gosu.milliseconds
+        @show_caret = true
+
+        move_caret_to_mouse(x)
+
+        return :handled
+      end
+
+      def enter(sender)
+        if @focus
+          @style.background_canvas.background = default(:active, :background)
+          @text.color = default(:active, :color)
+        else
+          @style.background_canvas.background = default(:hover, :background)
+          @text.color = default(:hover, :color)
+        end
+
+        return :handled
+      end
+
+      def leave(sender)
+        unless @focus
+          super
+        end
+
+        return :handled
+      end
+
+      def blur(sender)
+        @focus = false
+        @style.background_canvas.background = default(:background)
+        @text.color = default(:color)
+        window.text_input = nil
+
+        return :handled
+      end
+
+      def caret_position
+        text_input_position_for(:caret_pos)
+      end
+
+      def selection_start_position
+        text_input_position_for(:selection_start)
+      end
+
+      def text_input_position_for(method)
+        if @type == :password
+          @text.x + @text.textobject.text_width(default(:password_character) * @text_input.text[0..@text_input.send(method)].length)
+        else
+          @text.x + @text.textobject.text_width(@text_input.text[0..@text_input.send(method)])
+        end
+      end
+
+      def recalculate
+        super
+
+        @width = dimensional_size(@style.width, :width) || default(:width)
+        update_background
+      end
+
+      def value
+        @text_input.text
+      end
+    end
+  end
 end

data/lib/cyberarm_engine/ui/elements/flow.rb

@@ -1,17 +1,17 @@
-module CyberarmEngine
-  class Element
-    class Flow < Container
-      include Common
-
-      def layout
-        @children.each do |child|
-          if fits_on_line?(child)
-            position_on_current_line(child)
-          else
-            position_on_next_line(child)
-          end
-        end
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class Flow < Container
+      include Common
+
+      def layout
+        @children.each do |child|
+          if fits_on_line?(child)
+            position_on_current_line(child)
+          else
+            position_on_next_line(child)
+          end
+        end
+      end
+    end
+  end
 end

data/lib/cyberarm_engine/ui/elements/image.rb

@@ -1,52 +1,52 @@
-module CyberarmEngine
-  class Element
-    class Image < Element
-      def initialize(path, options = {}, block = nil)
-        super(options, block)
-        @path = path
-
-        @image = Gosu::Image.new(path, retro: @options[:image_retro])
-        @scale_x, @scale_y = 1, 1
-      end
-
-      def render
-        @image.draw(
-          @style.border_thickness_left + @style.padding_left + @x,
-          @style.border_thickness_top + @style.padding_top + @y,
-          @z + 2,
-          @scale_x, @scale_y) # TODO: Add color support?
-      end
-
-      def clicked_left_mouse_button(sender, x, y)
-        @block.call(self) if @block
-
-        return :handled
-      end
-
-      def recalculate
-        _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
-
-        if _width && _height
-          @scale_x = _width.to_f / @image.width
-          @scale_y = _height.to_f / @image.height
-        elsif _width
-          @scale_x = _width.to_f / @image.width
-          @scale_y = @scale_x
-        elsif _height
-          @scale_y = _height.to_f / @image.height
-          @scale_x = @scale_y
-        else
-          @scale_x, @scale_y = 1, 1
-        end
-
-        @width = _width  ? _width  : @image.width.round * @scale_x
-        @height= _height ? _height : @image.height.round * @scale_y
-      end
-
-      def value
-        @path
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class Image < Element
+      def initialize(path, options = {}, block = nil)
+        super(options, block)
+        @path = path
+
+        @image = Gosu::Image.new(path, retro: @options[:image_retro])
+        @scale_x, @scale_y = 1, 1
+      end
+
+      def render
+        @image.draw(
+          @style.border_thickness_left + @style.padding_left + @x,
+          @style.border_thickness_top + @style.padding_top + @y,
+          @z + 2,
+          @scale_x, @scale_y) # TODO: Add color support?
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        @block.call(self) if @block
+
+        return :handled
+      end
+
+      def recalculate
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+
+        if _width && _height
+          @scale_x = _width.to_f / @image.width
+          @scale_y = _height.to_f / @image.height
+        elsif _width
+          @scale_x = _width.to_f / @image.width
+          @scale_y = @scale_x
+        elsif _height
+          @scale_y = _height.to_f / @image.height
+          @scale_x = @scale_y
+        else
+          @scale_x, @scale_y = 1, 1
+        end
+
+        @width = _width  ? _width  : @image.width.round * @scale_x
+        @height= _height ? _height : @image.height.round * @scale_y
+      end
+
+      def value
+        @path
+      end
+    end
+  end
 end

data/lib/cyberarm_engine/ui/elements/label.rb

@@ -1,50 +1,50 @@
-module CyberarmEngine
-  class Element
-    class Label < Element
-      def initialize(text, options = {}, block = nil)
-        super(options, block)
-
-        @text = Text.new(text, font: @options[:font], z: @z, color: @options[:color], size: @options[:text_size], shadow: @options[:text_shadow])
-      end
-
-      def render
-        @text.draw
-      end
-
-      def clicked_left_mouse_button(sender, x, y)
-        @block.call(self) if @block
-
-        return :handled
-      end
-
-      def recalculate
-        @width, @height = 0, 0
-
-        _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
-
-        @width = _width  ? _width  : @text.width.round
-        @height= _height ? _height : @text.height.round
-
-        @text.x = @style.border_thickness_left + @style.padding_left + @x
-        @text.y = @style.border_thickness_top + @style.padding_top  + @y
-        @text.z = @z + 3
-
-        update_background
-      end
-
-      def value
-        @text.text
-      end
-
-      def value=(value)
-        @text.text = value
-
-        old_width, old_height = width, height
-        recalculate
-
-        root.gui_state.request_recalculate if old_width != width || old_height != height
-      end
-    end
-  end
+module CyberarmEngine
+  class Element
+    class Label < Element
+      def initialize(text, options = {}, block = nil)
+        super(options, block)
+
+        @text = Text.new(text, font: @options[:font], z: @z, color: @options[:color], size: @options[:text_size], shadow: @options[:text_shadow])
+      end
+
+      def render
+        @text.draw
+      end
+
+      def clicked_left_mouse_button(sender, x, y)
+        @block.call(self) if @block
+
+        return :handled
+      end
+
+      def recalculate
+        @width, @height = 0, 0
+
+        _width = dimensional_size(@style.width, :width)
+        _height= dimensional_size(@style.height,:height)
+
+        @width = _width  ? _width  : @text.width.round
+        @height= _height ? _height : @text.height.round
+
+        @text.x = @style.border_thickness_left + @style.padding_left + @x
+        @text.y = @style.border_thickness_top + @style.padding_top  + @y
+        @text.z = @z + 3
+
+        update_background
+      end
+
+      def value
+        @text.text
+      end
+
+      def value=(value)
+        @text.text = value
+
+        old_width, old_height = width, height
+        recalculate
+
+        root.gui_state.request_recalculate if old_width != width || old_height != height
+      end
+    end
+  end
 end