minigl 2.3.8 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a080b868fab24c01aaa591dcb2c5b087cc2b1bd4a86b1a649691a5e53aaa27e4
-  data.tar.gz: 117867b84b262cbc6d30adb68e0756d9d3e62246ae9fb57cd03377cc564339ed
+  metadata.gz: ff7475dd66f98076ad86cc143943c75f186e6b696aba46083b71727ad69e95b0
+  data.tar.gz: 87bec4f94e32553a70ea4ca4318357bbadb71ffc6600859a8c63ec772e708137
 SHA512:
-  metadata.gz: 2c1ee1a615f081b4c6b36b547c7a187553cdf91aa5f7026c35b9d6e2087d9c9b461f2b60f37f56ce20739080be5277ee99f6b4f01bc50578c6887fc18c2cbbe8
-  data.tar.gz: c000b6516264435786de8bc90858d644cbb1938128d984fd4c75938593514b07585651a5b8363e65ebbda415c151b028c934284f65e1b14cae7b3435a5bb92b5
+  metadata.gz: '09094e3898b3a19939f39acf33ba4514db24bb1771b7795769a632e7f7230874058f921609d0760ea5958b42ca70e0a5b2224c974c5d3a80b4f1d2d1e59ad4cc'
+  data.tar.gz: ad1fc0475cee6c71ec019e5f8516b077da8ba4f37fbd95136137acb4716f83fe3fff42f68a5c458841c80732e8117776ac14c696c70b776d06c8b73860b379f5

data/README.md

@@ -37,10 +37,10 @@ After installing the Gosu dependencies, you can just `gem install minigl`.
   * The [wiki](https://github.com/victords/minigl/wiki) is a work in progress with tutorials and examples.
   * Test package and examples aren't complete!
 
-## Version 2.3.8
+## Version 2.3.9
 
-  * Exposed `Effect`'s `lifetime`, `elapsed_time` and `time_left` properties.
-  * Added the `char_spacing` parameter to the `ImageFont` class and exposed some existing properties.
+  * Fixed click detection for very short clicks.
+  * Allow combining `center` and `margin` for `Button` text.
 
 ## Contributing
 

data/lib/minigl/forms.rb

@@ -317,12 +317,12 @@ module MiniGL
       super x, y, font, text, text_color, disabled_text_color
       @over_text_color = over_text_color
       @down_text_color = down_text_color
-      if center_x; @text_x = x + @w / 2 if @w
-      else; @text_x = x + margin_x * @scale_x; end
-      if center_y; @text_y = y + @h / 2 if @h
-      else; @text_y = y + margin_y * @scale_y; end
       @center_x = center_x
       @center_y = center_y
+      @margin_x = margin_x
+      @margin_y = margin_y
+      set_position(x, y)
+
       @action = action
       @params = params
 
@@ -393,10 +393,10 @@ module MiniGL
     # [x] The new x-coordinate for the button.
     # [y] The new y-coordinate for the button.
     def set_position(x, y)
-      if @center_x; @text_x = x + @w / 2
-      else; @text_x += x - @x; end
-      if @center_y; @text_y = y + @h / 2
-      else; @text_y += y - @y; end
+      @text_x = @center_x ? x + @w / 2 : x
+      @text_y = @center_y ? y + @h / 2 : y
+      @text_x += @margin_x
+      @text_y += @margin_y
       @x = x; @y = y
     end
 
@@ -445,7 +445,7 @@ module MiniGL
     private
 
     def perform_action
-      @action.call @params if @action
+      @action.call(@params) if @action
     end
   end
 
@@ -514,8 +514,6 @@ module MiniGL
         else; height * @scale_y; end
       _, x, y = FormUtils.check_anchor(anchor, @anchor_offset_x, @anchor_offset_y, @w, @h)
       set_position(x, y)
-      @text_x = x + @w / 2 if center_x
-      @text_y = y + @h / 2 if center_y
       @checked = checked
     end
 

data/lib/minigl/global.rb

@@ -245,6 +245,16 @@ module MiniGL
     def toggle_fullscreen
       self.fullscreen = !fullscreen?
     end
+
+    def button_down(id)
+      super
+      Mouse.register_button_down(id)
+    end
+
+    def button_up(id)
+      super
+      Mouse.register_button_up(id)
+    end
   end
 
   # Exposes methods for controlling keyboard and gamepad events.
@@ -387,6 +397,7 @@ module MiniGL
       def initialize
         @down = {}
         @prev_down = {}
+        @next_down = {}
         @dbl_click = {}
         @dbl_click_timer = {}
       end
@@ -394,7 +405,8 @@ module MiniGL
       # Updates the mouse position and the state of all buttons.
       def update
         @prev_down = @down.clone
-        @down.clear
+        @down = @next_down.clone
+        @next_down.delete_if { |_, v| v.zero? }
         @dbl_click.clear
 
         if @click
@@ -403,19 +415,19 @@ module MiniGL
         end
 
         @dbl_click_timer.each do |k, v|
-          if v < G.double_click_delay; @dbl_click_timer[k] += 1
-          else; @dbl_click_timer.delete k; end
+          if v < G.double_click_delay
+            @dbl_click_timer[k] += 1
+          else
+            @dbl_click_timer.delete(k)
+          end
         end
 
-        k1 = [Gosu::MsLeft, Gosu::MsMiddle, Gosu::MsRight]
-        k2 = [:left, :middle, :right]
-        (0..2).each do |i|
-          if G.window.button_down? k1[i]
-            @down[k2[i]] = true
-            @dbl_click[k2[i]] = true if @dbl_click_timer[k2[i]]
-            @dbl_click_timer.delete k2[i]
-          elsif @prev_down[k2[i]]
-            @dbl_click_timer[k2[i]] = 0
+        %i[left middle right].each do |key|
+          if @down[key]
+            @dbl_click[key] = true if @dbl_click_timer[key]
+            @dbl_click_timer.delete(key)
+          elsif @prev_down[key]
+            @dbl_click_timer[key] = 0
           end
         end
 
@@ -486,6 +498,31 @@ module MiniGL
 
         @click = { z_index: z_index, action: action }
       end
+
+      # :nodoc:
+      def register_button_down(id)
+        key = key_from_id(id)
+        @next_down[key] = 1 if key
+      end
+
+      # :nodoc:
+      def register_button_up(id)
+        key = key_from_id(id)
+        @next_down[key] = 0 if key && @next_down[key]
+      end
+
+      private
+
+      def key_from_id(id)
+        case id
+        when Gosu::MS_LEFT
+          :left
+        when Gosu::MS_RIGHT
+          :right
+        when Gosu::MS_MIDDLE
+          :middle
+        end
+      end
     end
   end
 

data/test/game.rb

@@ -19,7 +19,7 @@ class MyGame < GameWindow
     @font2 = Res.font :font1, 50
     @writer1 = TextHelper.new @font1, 5
     @writer2 = TextHelper.new @font2, 5
-    @btn = Button.new(10, 560, @font1, 'Test', :btn, 0x008000, 0x808080, 0xffffff, 0xff9980, true, true, 0, 4, 0, 0, 'friends', nil, 2, 2) { |x| puts "hello #{x}" }
+    @btn = Button.new(10, 560, @font1, 'Test', :btn, 0x008000, 0x808080, 0xffffff, 0xff9980, true, false, -10, 4, 0, 0, 'friends', nil, 2, 2) { |x| puts "hello #{x}" }
     @btn.enabled = false
     @chk =
       ToggleButton.new(x: 0, y: 30, font: @font1, text: 'Click me', img: :check, center_x: false, margin_x: 36, params: 'friends', anchor: :south) { |c, x|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minigl
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.9
 platform: ruby
 authors:
 - Victor David Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu