tkwrapper 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ebb6c8831b18ae3b55f4d98896cc5cf824d628fd4bc245b6fc1ed9fd8c5ef0
-  data.tar.gz: b90ca62d87faa02e1a07f5f1145e175d55dfcfeacd71782c709a484038701dfc
+  metadata.gz: a67fc8eac231f5b0b875cdd2fba4f107a3b596206766a4e57793e4f3d1b71992
+  data.tar.gz: 9bd2376b17ebf7e866f7858f98d2e9698575dec8a3fa2794c84c7b625048b33c
 SHA512:
-  metadata.gz: b4d1820254e60b3d9ce4be52a8875b0acbda213dac7aa200352d794ff1146611e84ac1f9bb16589f6fa6d61ba3b65468c940cf27d965ead1e3913fbc5b1cce7e
-  data.tar.gz: fd00a3c5ae1c29aa66762f554a43223a5ce32ef538c340a8549ba56fb12853743f80ae90862aac30f99383be61497fe1744bbb85e7ca7ef1e83d32785e4f5133
+  metadata.gz: b467177153264f4a1cf973e4ae321d57c94f421e14eddfac98db6766ed06ca133f7af73931ef3f2ca3b23800363dacc533c666fb883f2bcb01c19a5432250b75
+  data.tar.gz: 00f36bd8f579688715d25b580a028e577f3820a83749b39bfd353c90ed32a3e0509ebcc5ca0306a3cf48576dd3d52d136e093ad26d87a33212cb84cb9a09b456

data/lib/util/hash_recursive.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Util
-  def self.merge_recursive!(*hashes)
+  def self.merge_recursive!(*hashes, overwrite: true)
     hashes[0].merge!(*hashes[1..]) do |_key, old, new|
       if old.is_a?(Hash) && new.is_a?(Hash)
         merge_recursive!(old, new)
       else
-        new
+        overwrite ? new : old
       end
     end
   end

data/lib/widgets/auto_resize_entry.rb

@@ -12,7 +12,7 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
 
   def build(parent, **args)
     super(parent, **args)
-    parent.tk_widget.bind('Configure') { resize }
+    parent.bind('Configure') { resize }
     tk_widget.textvariable = TkVariable.new unless tk_widget.textvariable
     tk_widget.textvariable.trace('write') { resize }
     resize

data/lib/widgets/auto_resize_text.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'text'
+
+class TkWrapper::Widgets::AutoResizeText < TkWrapper::Widgets::Text
+  def build(parent, **args)
+    super(parent, **args)
+    bind('<Modified>', ->(ev) { resize(ev) })
+    bind('<Modified>', -> { puts 'hihi' })
+  end
+
+  def resize(event)
+    return unless tk_widget.modified?
+
+    puts event
+    puts 'yes!'
+    tk_widget.modified(false)
+    #max_width = [@cell.bbox[2], 0].max
+    #puts @font.metrics
+    #new_width = [[@min_width, text_width + @add_width].max, max_width].min
+    #tk_widget.width = 0
+    #tk_widget.grid(ipadx: new_width / 2.0)
+    #@parent.tk_widget.update
+  end
+end

data/lib/widgets/base/configuration.rb

@@ -28,14 +28,14 @@ class TkWrapper::Widgets::Base::Configuration
     @config = parse_and_clone(config)
   end
 
-  def merge(*configurations)
+  def merge(*configurations, overwrite: true)
     configurations = configurations.map do |configuration|
       configuration = configuration.config if configuration.is_a?(self.class)
 
       parse_and_clone(configuration)
     end
 
-    Util.merge_recursive!(@config, *configurations)
+    Util.merge_recursive!(@config, *configurations, overwrite: overwrite)
   end
 
   def [](key)

data/lib/widgets/base/matcher.rb

@@ -39,7 +39,7 @@ class TkWrapper::Widgets::Base::Matcher
     when String, Symbol then match_string(value, comparator, widget)
     when Regexp         then match_regex(value, comparator, widget)
     when Class          then match_class(value, comparator, widget)
-    when nil            then Match(value, { widget: widget })
+    when nil            then Match.new(value, widget: widget)
     else                     false
     end
   end

data/lib/widgets/base/matches.rb

@@ -25,10 +25,10 @@ class TkWrapper::Widgets::Base::Matches
   end
 
   def [](key)
-    case @matches[key].size
-    when 0 then nil
-    when 1 then @matches[key][0]
-    else        @matches[key]
+    case @matches[key]&.size
+    when 0, nil then nil
+    when 1      then @matches[key][0]
+    else             @matches[key]
     end
   end
 

data/lib/widgets/base/widget.rb

@@ -1,30 +1,43 @@
 require "#{LIB_DIR}/util/tk/cell"
 require "#{LIB_DIR}/util/tk/finder"
-require "#{LIB_DIR}/tk_extensions"
 
 require_relative 'base'
 require_relative 'window_info'
 
 class TkWrapper::Widgets::Base::Widget
   extend Forwardable
-  include TkExtensions
   include Enumerable
 
   def_delegators :@finder, :find, :find_all
+  def_delegators :tk_widget, :update
+  def_delegator :tk_widget, :bind_append, :bind
+  def_delegator :@manager, :widgets, :managed
 
   attr_accessor :config
   attr_reader :parent, :ids, :cell, :childs, :manager, :winfo
 
   def tk_class() end
 
-  def initialize(config: {}, childs: [], manager: nil, ids: [])
+  def initialize(parent: nil, config: {}, childs: [], manager: nil, ids: [], id: [])
     @cell = TkWrapper::Util::Tk::Cell.new(self)
     @winfo = TkWrapper::Widgets::Base::WindowInfo.new(self)
     @finder = TkWrapper::Util::Tk::Finder.new(widgets: self)
     @config = TkWrapper::Widgets::Base::Configuration.new(config)
-    @childs = childs.is_a?(Array) ? childs : [childs]
     @manager = manager
-    @ids = ids.is_a?(Array) ? ids : [ids]
+    @ids = init_id(id) + init_id(ids)
+    @parent = parent
+    modify_configuration(@config)
+    @childs = normalize_childs(childs)
+    parent&.push(self)
+  end
+
+  def init_id(id)
+    id.is_a?(Array) ? id : [id]
+  end
+
+  def normalize_childs(childs)
+    childs = create_childs || childs
+    childs.is_a?(Array) ? childs : [childs]
   end
 
   def create_tk_widget(parent)
@@ -43,38 +56,54 @@ class TkWrapper::Widgets::Base::Widget
     (@tk_widget = create_tk_widget(parent)) || parent&.tk_widget
   end
 
+  def each(&block)
+    nodes_to_walk = [self]
+    until nodes_to_walk.empty?
+      node = nodes_to_walk.pop
+      block.call(node)
+      nodes_to_walk = node.childs + nodes_to_walk
+    end
+  end
+
+  def push(child)
+    @childs.push(child)
+    child.build(self, manager: @manager)
+  end
+
+  protected
+
   def build_childs
     @childs.each { |child| child.build(self, manager: @manager) }
   end
 
-  def build(parent, configure: true, manager: nil)
-    @parent = parent
+  def modify_configuration(config) end
+
+  def create_childs() end
+
+  def before_build(**args) end
+
+  def after_build() end
+
+  def inner_build(configure: true, manager: nil)
     tk_widget # creates the widget if possible and not yet created
     @font = TkWrapper::Util::Tk::Font.new(tk_widget)
     @manager ||= manager
-    @config.merge(*@manager.configurations(self)) if @manager
+    @config.merge(*@manager.configurations(self), overwrite: false) if @manager
     self.configure if configure
     @manager&.execute_modifications(self)
     @manager&.widgets&.push(self)
     build_childs
   end
 
+  def build(parent, configure: true, manager: nil)
+    @parent = parent
+    before_build(configure: configure, manager: manager)
+    inner_build(configure: configure, manager: manager)
+    after_build
+  end
+
   def configure
     @config.configure_tk_widget(tk_widget)
     @config.configure_tearoff
   end
-
-  def each(&block)
-    nodes_to_walk = [self]
-    until nodes_to_walk.empty?
-      node = nodes_to_walk.pop
-      block.call(node)
-      nodes_to_walk = node.childs + nodes_to_walk
-    end
-  end
-
-  def push(child)
-    @childs.push(child)
-    child.build(self, manager: @manager)
-  end
 end

data/lib/widgets/button.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 class TkWrapper::Widgets::Button < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::Button
+    Tk::Tile::Button
   end
 end

data/lib/widgets/entry.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 class TkWrapper::Widgets::Entry < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::Entry
+    Tk::Tile::Entry
   end
 end

data/lib/widgets/frame.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 class TkWrapper::Widgets::Frame < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::Frame
+    Tk::Tile::Frame
   end
 end

data/lib/widgets/grid.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 # classification of TkGrid
 class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
   attr_reader :parent, :matrix
@@ -7,14 +9,16 @@ class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
   Widget = TkWrapper::Widgets::Base::Widget
 
   def tk_class
-    TkWidgets::Frame
+    Tk::Tile::Frame
   end
 
   def initialize(**arguments)
+    parent = arguments.delete(:parent)
     super(**arguments)
     @childs.map! { |row| row.is_a?(Array) ? row : [row] }
     configure_cells_for_grid
     @childs.flatten! && @childs.select! { |cell| cell.is_a?(Widget) }
+    parent&.push(self)
   end
 
   def configure_cells_for_grid

data/lib/widgets/label.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 class TkWrapper::Widgets::Label < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::Label
+    Tk::Tile::Label
   end
 end

data/lib/widgets/menu.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'tk'
+
 class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::TkMenu
+    TkMenu
   end
 
   def build(parent, **args)
@@ -12,7 +14,7 @@ class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
 
   class Cascade < TkWrapper::Widgets::Base::Widget
     def tk_class
-      TkWidgets::TkMenu
+      TkMenu
     end
 
     def build(parent, **args)

data/lib/widgets/root.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'tk'
+
 class TkWrapper::Widgets::Root < TkWrapper::Widgets::Base::Widget
   def initialize(**arguments)
     super(**arguments)
@@ -7,6 +9,6 @@ class TkWrapper::Widgets::Root < TkWrapper::Widgets::Base::Widget
   end
 
   def tk_class
-    TkWidgets::TkRoot
+    TkRoot
   end
 end

data/lib/widgets/text.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require 'tk'
+
 class TkWrapper::Widgets::Text < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::TkText
+    TkText
   end
 end

data/lib/widgets/widgets.rb

@@ -9,6 +9,7 @@ require_relative 'frame'
 require_relative 'label'
 require_relative 'menu'
 require_relative 'text'
+require_relative 'auto_resize_text'
 require_relative 'entry'
 require_relative 'auto_resize_entry'
 require_relative 'grid'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tk
@@ -30,7 +30,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tk_extensions.rb
 - lib/tkwrapper.rb
 - lib/util/hash_recursive.rb
 - lib/util/tk/cell.rb
@@ -39,6 +38,7 @@ files:
 - lib/util/tk/tk.rb
 - lib/util/virtual_methods.rb
 - lib/widgets/auto_resize_entry.rb
+- lib/widgets/auto_resize_text.rb
 - lib/widgets/base/base.rb
 - lib/widgets/base/comparator_item_store.rb
 - lib/widgets/base/configuration.rb

data/lib/tk_extensions.rb

@@ -1,50 +0,0 @@
-require 'tk'
-require 'tkextlib/tile'
-
-module TkExtensions
-  # allow a Tk widget to have multiple bindings for the same event
-  module MultiBind
-    def bind(event, &callback)
-      @bindings ||= {}
-
-      unless @bindings[event]
-        @bindings[event] = []
-        super(event) { execute_all_bindings(event) }
-      end
-
-      @bindings[event].push(callback)
-    end
-
-    def execute_all_bindings(event)
-      @bindings[event].each(&:call)
-    end
-  end
-
-  module TkWidgets
-    # from several Tk widgets create subclasses, which include MultiBind
-    # the reason why we loop over strings and not the classes themselve is, that
-    # the class names may be aliases (e.g. Tk::Tile::Entry is an alias for
-    # Tk::Tile::TEntry)
-    tk_class_names = [
-      'TkRoot',           # becomes TkExtensions::TkWidgets::TkRoot
-      'TkText',           # becomes TkExtensions::TkWidgets::TkText
-      'TkMenu',           # becomes TkExtensions::TkWidgets::TkMenu
-      'Tk::Tile::Entry',  # becomes TkExtensions::TkWidgets::Entry
-      'Tk::Tile::Frame',  # becomes TkExtensions::TkWidgets::Frame
-      'Tk::Tile::Label',  # becomes TkExtensions::TkWidgets::Label
-      'Tk::Tile::Button'  # becomes TkExtensions::TkWidgets::Button
-    ]
-    tk_class_names.each do |tk_class_name|
-      # extract last part of the name (e.g. Tk::Tile::Entry => Entry)
-      new_child_class_name = tk_class_name.match(/([^:]*)$/)[1]
-      # get the class from the class constant name
-      tk_class = const_get(tk_class_name)
-      # create a new child class of tk_class and have it include MultiBind, which
-      # overwrites the bind method of that class to allow for multiple bindings
-      new_child_class = Class.new(tk_class) { include(MultiBind) }
-      # make the new class known to the TkExtensions namespace to allow to use it
-      # by e.g. TkExtensions::Entry
-      const_set(new_child_class_name, new_child_class)
-    end
-  end
-end