shoes-core 4.0.0.pre12 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661b33d7f533fcfeca029b50a73d2825fd861b9cb3dd22b802407c2c9530982a
-  data.tar.gz: 1910df83d014768abe2dbd8fbc4475b857ca9c84c96e85506aa8db8572ce891d
+  metadata.gz: f7191316edb6e714b9463aca4217a1b01a95a4b2474a08991abe151cb2491dbd
+  data.tar.gz: 2fca9ebbb2065bd06fa6fe70ecc328fbccb55b95d260613c8c53e693afe62792
 SHA512:
-  metadata.gz: 6955fbb19afbb56560f631f52c139ae43420da5c16cfd4f2cc85bb42114af6fbec7db5f49697fb9ce977f8a64b1b7d6425a4406f7580ed8fd0de0fb13cd56527
-  data.tar.gz: 1d9df772049d179b46c3a70a92c5309a09495812607cdbdc9b4366040d778652dabca4c807e9ff2e2eaf2f8def21f0f335541ee6072f44dfef1ff48e7d0183ab
+  metadata.gz: 21af8b401b6533980537bd97539c601bcfe2ae5f74d3a865b483b25d116c3ca0cd4f0f1aa3af71681c811ef065b22b7da94aef2115518c5f81b3162ceede7836
+  data.tar.gz: 5684057007b1a95a6cfb1550bd2fa26139924246f9fb26b0612ba4f9736f706a5a50ccd0c122929520da6a7992b54cc7feef4afda223688d0648d66f19da2900

data/bin/shoes-picker

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 lib_directory = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH << lib_directory
 

data/lib/shoes.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: true
+
 require 'shoes/core'

data/lib/shoes/animation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Animation
     include Common::Inspect

data/lib/shoes/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   ICON = File.join(DIR, 'static/shoes-icon.png').freeze
 
@@ -83,11 +84,11 @@ class Shoes
       @__app__.current_slot.parent
     end
 
-    delegated_to_internal_app = %w(
+    delegated_to_internal_app = %w[
       width height owner started? location left top absolute_left
       absolute_top click release clear fullscreen fullscreen=
       contents wait_until_closed focus open? gui
-    )
+    ]
 
     def_delegators :@__app__, *delegated_to_internal_app
 
@@ -101,7 +102,7 @@ class Shoes
     end
 
     def method_missing(name, *args, &blk)
-      if @__additional_context__
+      if defined?(@__additional_context__) && @__additional_context__
         @__additional_context__.public_send(name, *args, &blk)
       else
         super

data/lib/shoes/arc.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
+
 class Shoes
   class Arc < Common::ArtElement
+    # angle is the gradient angle used across all art elements
+    # angle1/2 are the angles of the arc itself!
     style_with :angle1, :angle2, :art_styles, :center, :common_styles, :dimensions, :radius, :wedge
     STYLES = { wedge: false, fill: Shoes::COLORS[:black] }.freeze
 

data/lib/shoes/arrow.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 class Shoes
   class Arrow < Common::ArtElement
-    style_with :angle, :art_styles, :curve, :common_styles, :dimensions
-    STYLES = { angle: 0, fill: Shoes::COLORS[:black] }.freeze
+    style_with :art_styles, :curve, :common_styles, :dimensions
+    STYLES = { fill: Shoes::COLORS[:black] }.freeze
 
     def create_dimensions(left, top, width)
       left   ||= @style[:left] || 0
@@ -16,5 +17,36 @@ class Shoes
       super
       gui.update_position
     end
+
+    # Our locations are nonstandard, so let redrawing and gradient know
+    def redraw_left
+      return 0 unless element_left
+      element_left - width * 0.5 - style[:strokewidth].to_i
+    end
+
+    def redraw_top
+      return 0 unless element_top
+      element_top - width * 0.4 - style[:strokewidth].to_i
+    end
+
+    def redraw_width
+      width + style[:strokewidth].to_i * 2
+    end
+
+    def redraw_height
+      width + style[:strokewidth].to_i * 2
+    end
+
+    def gradient_left
+      redraw_left
+    end
+
+    def gradient_top
+      redraw_top
+    end
+
+    def gradient_height
+      redraw_height
+    end
   end
 end

data/lib/shoes/background.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Background < Common::BackgroundElement
     include Common::Fill

data/lib/shoes/border.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Border < Common::BackgroundElement
     include Common::Stroke

data/lib/shoes/builtin_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The methods defined in this module/file are also available outside of the
 # Shoes.app block. So they are monkey patched onto the main object.
 # However they can also be used from the normal Shoes.app block.
@@ -18,7 +19,7 @@ class Shoes
       Shoes::Dialog.new.confirm(message)
     end
 
-    %w(info debug warn error).each do |log_level|
+    %w[info debug warn error].each do |log_level|
       define_method(log_level) do |message = ''|
         Shoes.logger.public_send(log_level, message)
       end

data/lib/shoes/button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Button < Common::UIElement
     include Common::Clickable

data/lib/shoes/check_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class CheckButton < Common::UIElement
     include Common::Clickable

data/lib/shoes/color.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Color
     include Common::Inspect
@@ -18,12 +19,12 @@ class Shoes
       when 3, 4
         red, green, blue, alpha = *args
       else
-        message = <<EOS
-Wrong number of arguments (#{args.length} for 1, 3, or 4).
-Must be one of:
-  - #{self.class}.new(hex_string)
-  - #{self.class}.new(red, green, blue)
-  - #{self.class}.new(red, green, blue, alpha)
+        message = <<~EOS
+          Wrong number of arguments (#{args.length} for 1, 3, or 4).
+          Must be one of:
+            - #{self.class}.new(hex_string)
+            - #{self.class}.new(red, green, blue)
+            - #{self.class}.new(red, green, blue, alpha)
 EOS
         raise ArgumentError, message
       end

data/lib/shoes/color/dsl.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   # Create all of the built-in Shoes colors
   COLORS = {}

data/lib/shoes/color/dsl_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Color
     module DSLHelpers

data/lib/shoes/color/hex_converter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   class Color
     class HexConverter

data/lib/shoes/common/art_element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     class ArtElement < UIElement
@@ -13,6 +14,10 @@ class Shoes
         # We need to include it at inheritance time to get that behavior.
         child.include Common::Hover
       end
+
+      def painted?
+        true
+      end
     end
   end
 end

data/lib/shoes/common/attachable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Attachable

data/lib/shoes/common/background_element.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     class BackgroundElement < Common::UIElement
@@ -6,6 +7,10 @@ class Shoes
         @dimensions = ParentDimensions.new @parent, @style
       end
 
+      def painted?
+        true
+      end
+
       # We derive everything from our parent, so we skip slot positioning.
       def needs_positioning?
         false

data/lib/shoes/common/changeable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     # Changeable elements are elements that receive `change' events.

data/lib/shoes/common/clickable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Clickable

data/lib/shoes/common/fill.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Fill

data/lib/shoes/common/focus.rb

@@ -1,10 +1,19 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Focus
       def focus
         @gui.focus
       end
+
+      def focused?
+        @gui.focused?
+      end
+
+      alias focussed? focused?
+      alias focussed focused?
+      alias focused focused?
     end
   end
 end

data/lib/shoes/common/hover.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Hover
@@ -25,32 +26,32 @@ class Shoes
       end
 
       def hovered?
-        @hovered
+        @hovered ||= false
       end
 
       def hover_class
-        return @hover_class if @hover_class
+        return @hover_class if defined?(@hover_class)
 
         name = self.class.name.split("::").last
         @hover_class = Shoes.const_get("#{name}Hover")
       end
 
       def mouse_hovered
-        return if @hovered
+        return if hovered?
 
         @hovered = true
 
         apply_style_from_hover_class
-        eval_hover_block(@hover_blk)
+        eval_hover_block(@hover_blk ||= nil)
       end
 
       def mouse_left
-        return unless @hovered
+        return unless hovered?
 
         @hovered = false
 
         apply_style_from_pre_hover
-        eval_hover_block(@leave_blk)
+        eval_hover_block(@leave_blk ||= nil)
       end
 
       def add_mouse_hover_control
@@ -74,7 +75,7 @@ class Shoes
       end
 
       def apply_style_from_pre_hover
-        style(@pre_hover_style) if @pre_hover_style
+        style(@pre_hover_style) if defined?(@pre_hover_style) && @pre_hover_style
         @pre_hover_style = nil
       end
     end

data/lib/shoes/common/image_handling.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module ImageHandling

data/lib/shoes/common/inspect.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Inspect

data/lib/shoes/common/link_finder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module LinkFinder

data/lib/shoes/common/positioning.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Positioning

data/lib/shoes/common/registration.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Registration

data/lib/shoes/common/remove.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Remove
       def remove
         parent&.remove_child self
         gui&.remove if gui&.respond_to?(:remove)
-
-        @app&.remove_mouse_hover_control(self)
+        @app&.remove_mouse_hover_control(self) if defined?(@app)
       end
     end
   end

data/lib/shoes/common/rotate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Rotate

data/lib/shoes/common/safely_evaluate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module SafelyEvaluate

data/lib/shoes/common/state.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module State

data/lib/shoes/common/stroke.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     module Stroke

data/lib/shoes/common/style.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The general Style module handles the many optional styles that may be passed
 # to shoes elements upon creates as well as the fact that they can later on be
 # altered through the #style method.
@@ -15,7 +16,8 @@ class Shoes
       }
 
       STYLE_GROUPS = {
-        art_styles:           [:cap, :click, :fill, :rotate, :stroke, :strokewidth, :transform, :translate],
+        art_styles:           [:angle, :cap, :click, :fill, :rotate, :stroke,
+                               :strokewidth, :transform, :translate],
         common_styles:        [:displace_left, :displace_top, :hidden],
         dimensions:           [:bottom, :height, :left, :margin,
                                :margin_bottom, :margin_left, :margin_right,

data/lib/shoes/common/style_normalizer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Common
     class StyleNormalizer