tkwrapper 1.3.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 957efe49807e9800759aa22439bc99f5ea4ef0ec620bc7ea0b7d549474839a7a
-  data.tar.gz: f654e23817c14ce6e59d67e7893f55c33c9168686faf66cbf0a96f955f4e7c6e
+  metadata.gz: a67fc8eac231f5b0b875cdd2fba4f107a3b596206766a4e57793e4f3d1b71992
+  data.tar.gz: 9bd2376b17ebf7e866f7858f98d2e9698575dec8a3fa2794c84c7b625048b33c
 SHA512:
-  metadata.gz: 4891b05ca78bff3d2119b6b4d8ba0be178836d1cdd7475e07ddc3be19100d766e0ca0d9878d4afc9be330ffbf3ea008914d4f4432b0e3eff2df8cc02534b74f4
-  data.tar.gz: 3ece495be24159cefde0ca65899c3022b181a3bb0d92e40727a9cbc2ca4494d376504a58313190a94fbf4dc8751949873753ec1c2313d9db4cc28fb29174a466
+  metadata.gz: b467177153264f4a1cf973e4ae321d57c94f421e14eddfac98db6766ed06ca133f7af73931ef3f2ca3b23800363dacc533c666fb883f2bcb01c19a5432250b75
+  data.tar.gz: 00f36bd8f579688715d25b580a028e577f3820a83749b39bfd353c90ed32a3e0509ebcc5ca0306a3cf48576dd3d52d136e093ad26d87a33212cb84cb9a09b456

data/lib/tkwrapper.rb

@@ -2,10 +2,16 @@
 
 LIB_DIR = __dir__
 
-module TkWrapper end
+module TkWrapper
+  module Util
+    module Tk
+    end
+  end
+end
 
 require_relative 'widgets/widgets'
 
 module TkWrapper
+  Manager = TkWrapper::Widgets::Base::Manager
   Widget = TkWrapper::Widgets::Base::Widget
 end

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/util/tk/cell.rb

@@ -17,6 +17,7 @@ class TkWrapper::Util::Tk::Cell
     start_row = grid_info['row']
     end_row = start_row + grid_info['rowspan'] - 1
 
+    container.tk_widget.update
     TkGrid.bbox(container.tk_widget, start_col, start_row, end_col, end_row)
   end
 

data/lib/util/tk/finder.rb

@@ -2,48 +2,65 @@
 
 require "#{LIB_DIR}/widgets/base/manager"
 require "#{LIB_DIR}/widgets/base/matcher"
-require_relative 'tk'
+require "#{LIB_DIR}/widgets/base/matches"
 
 class TkWrapper::Util::Tk::Finder
+  Match   = TkWrapper::Widgets::Base::Match
   Matcher = TkWrapper::Widgets::Base::Matcher
+  Matches = TkWrapper::Widgets::Base::Matches
 
-  def initialize(widgets: nil)
+  def initialize(widgets: nil, lookup: nil)
+    @lookup = lookup
     @widgets = widgets
   end
 
-  def each_widget_match(widgets, matchers, &block)
-    widgets.each do |widget|
-      widget.ids.each do |id|
-        matchers.each do |matcher|
-          (match = matcher.match(id, widget)) && block.call(match)
-        end
-      end
+  def iter(comparators, widgets = @widgets, lookup = @lookup)
+    comparators = [comparators] unless comparators.is_a?(Array)
+    Enumerator.new do |y|
+      comparators = each_widget_lookup_match(lookup, comparators) { |m| y << m }
+      each_widget_comparator_match(widgets, comparators) { |m| y << m }
     end
   end
 
-  def find_widget(comparators, widgets = @widgets)
-    matchers = create_value_matchers(comparators)
-
-    each_widget_match(widgets, matchers) do |match|
-      return match.widget if match
-    end
+  def find(comparators, widgets = @widgets, lookup = @lookup)
+    iter(comparators, widgets, lookup, &:itself).first
   end
 
-  def find_all_widgets(comparators, widgets = @widgets)
-    matchers = create_value_matchers(comparators)
-    matches = TkWrapper::Widgets::Base::Matches.new
-
-    each_widget_match(widgets, matchers) do |match|
-      matches.push(match)
-    end
-
-    matches
+  def find_all(comparators, widgets = @widgets, lookup = @lookup)
+    it = iter(comparators, widgets, lookup, &:itself)
+    it.each_with_object(Matches.new) { |match, matches| matches.push(match) }
   end
 
   private
 
   def create_value_matchers(comparators)
-    comparators = [comparators] unless comparators.is_a?(Array)
     comparators.map { |comparator| Matcher.new(comparator: comparator) }
   end
+
+  def each_widget_lookup_match(lookup, comparators, &block)
+    return comparators unless lookup
+
+    comparators.filter do |comparator|
+      next true unless [String, Symbol].include?(comparator.class)
+
+      (lookup[comparator] || []).each do |widget|
+        block.call(Match.new(comparator, widget: widget))
+      end
+
+      false
+    end
+  end
+
+  def each_widget_comparator_match(widgets, comparators, &block)
+    matchers = create_value_matchers(comparators)
+
+    widgets.each do |widget|
+      ids = widget.ids.empty? ? [nil] : widget.ids
+      ids.each do |id|
+        matchers.each do |matcher|
+          (match = matcher.match(id, widget)) && block.call(match)
+        end
+      end
+    end
+  end
 end

data/lib/widgets/auto_resize_entry.rb

@@ -4,15 +4,15 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   # auto resizes on user input, only works if in the grid geometry manager of tk
   attr_accessor :min_width, :add_width
 
-  def initialize(config: {}, childs: [], id: nil)
-    @min_width = config[:min_width] || 0
-    @add_width = config[:add_width] || 0
-    super(config: config, childs: childs, id: id)
+  def initialize(**args)
+    @min_width = args.dig(:config, :min_width) || 0
+    @add_width = args.dig(:config, :add_width) || 0
+    super(**args)
   end
 
-  def build(parent, configure: true)
-    super(parent, configure: configure)
-    parent.tk_widget.bind('Configure') { resize }
+  def build(parent, **args)
+    super(parent, **args)
+    parent.bind('Configure') { resize }
     tk_widget.textvariable = TkVariable.new unless tk_widget.textvariable
     tk_widget.textvariable.trace('write') { resize }
     resize
@@ -27,7 +27,7 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   end
 
   def resize
-    max_width = @cell.bbox[2]
+    max_width = [@cell.bbox[2], 0].max
     text_width = @font.measure(value)
     new_width = [[@min_width, text_width + @add_width].max, max_width].min
     tk_widget.width = 0

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/comparator_item_store.rb

@@ -10,8 +10,12 @@ class TkWrapper::Widgets::Base::ComparatorItemStore
     @comparator_map = {} # for lookup using comparisons by Matcher class
   end
 
+  def map_key?(key)
+    [String, Symbol].include?(key)
+  end
+
   def push(key, *items)
-    if [String, Symbol].include?(key)
+    if map_key?(key)
       (@key_map[key] ||= []).concat(items)
     else
       (@comparator_map[key] ||= []).concat(items)
@@ -25,6 +29,11 @@ class TkWrapper::Widgets::Base::ComparatorItemStore
     end
   end
 
+  def [](key)
+    items = map_key?(key) ? @key_map[key] : @comparator_map[key]
+    items&.length == 1 ? items.first : items
+  end
+
   private
 
   def items_from_key_map(id)

data/lib/widgets/base/configuration.rb

@@ -21,21 +21,21 @@ class TkWrapper::Widgets::Base::Configuration
   }.freeze
 
   NON_TK_OPTIONS = %i[
-    id tk_class tearoff weights menu min_width add_width
+    tk_class tearoff weights menu min_width add_width
   ].freeze
 
   def initialize(config)
     @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)
@@ -77,17 +77,23 @@ class TkWrapper::Widgets::Base::Configuration
     @config[:grid].reject { |option, _| NON_TK_OPTIONS.include?(option) }
   end
 
+  def configure_grid(tk_widget)
+    grid = grid(only_tk_options: true)
+    return if grid.empty?
+
+    tk_widget.grid(grid)
+  end
+
   def configure_tk_widget(tk_widget)
     @config.each do |option, value|
       next if NON_TK_OPTIONS.include?(option)
 
-      if option == :grid
-        grid = grid(only_tk_options: true)
-        next if grid.empty?
-        next tk_widget.grid(grid) if option == :grid
+      case option
+      when :grid  then configure_grid(tk_widget)
+      when :pack  then tk_widget.pack(value)
+      when :place then tk_widget.place(value)
+      else             tk_widget[option] = value
       end
-
-      tk_widget[option] = value
     end
 
     configure_weights(tk_widget)
@@ -112,6 +118,8 @@ class TkWrapper::Widgets::Base::Configuration
   end
 
   def merge_global_configurations(manager, widget)
+    return unless manager
+
     merge(*manager.configurations(widget))
   end
 end

data/lib/widgets/base/manager.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 require_relative 'comparator_item_store'
+require_relative 'widget_store'
 
 class TkWrapper::Widgets::Base::Manager
   ComparatorItemStore = TkWrapper::Widgets::Base::ComparatorItemStore
+  WidgetStore = TkWrapper::Widgets::Base::WidgetStore
+
+  attr_reader :widgets
 
   def initialize
     @configurations = ComparatorItemStore.new
     @modifications = ComparatorItemStore.new
+    @widgets = WidgetStore.new
   end
 
   def add_configurations(matcher = nil, configuration = nil, **configurations)
@@ -37,4 +42,15 @@ class TkWrapper::Widgets::Base::Manager
       end
     end
   end
+
+  def configure(widget)
+    widget.config.merge(*configurations(widget))
+  end
+
+  def tk_widget(id)
+    @widgets[id].tk_widget
+  end
+
+  alias modify add_modification
+  alias config add_configurations
 end

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,14 @@ 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
+
+  def first
+    @matches.first&.[](1)
+  end
 end

data/lib/widgets/base/widget.rb

@@ -1,67 +1,43 @@
-# frozen_string_literal: true
-
-require 'tk'
-
-require "#{LIB_DIR}/tk_extensions"
-require "#{LIB_DIR}/util/tk/font"
 require "#{LIB_DIR}/util/tk/cell"
 require "#{LIB_DIR}/util/tk/finder"
 
 require_relative 'base'
+require_relative 'window_info'
 
 class TkWrapper::Widgets::Base::Widget
   extend Forwardable
-  include TkExtensions
   include Enumerable
 
-  def_delegator :@finder, :find_widget, :find
-  def_delegator :@finder, :find_all_widgets, :find_all
+  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
+  attr_reader :parent, :ids, :cell, :childs, :manager, :winfo
 
   def tk_class() end
 
-  def self.manager
-    @manager ||= TkWrapper::Widgets::Base::Manager.new
-  end
-
-  def self.config(matcher = nil, configuration = nil, **configurations)
-    manager.add_configurations(matcher, configuration, **configurations)
-  end
-
-  def self.modify(matcher, &callback)
-    manager.add_modification(matcher, &callback)
-  end
-
-  def manager
-    TkWrapper::Widgets::Base::Widget.manager
-  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 initialize(config: {}, childs: [], id: nil)
+  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]
-    @ids = []
-    add_ids(id)
-    add_ids(config[:id])
+    @manager = manager
+    @ids = init_id(id) + init_id(ids)
+    @parent = parent
+    modify_configuration(@config)
+    @childs = normalize_childs(childs)
+    parent&.push(self)
   end
 
-  def add_ids(ids)
-    return unless ids
+  def init_id(id)
+    id.is_a?(Array) ? id : [id]
+  end
 
-    ids = [ids] unless ids.is_a?(Array)
-    @ids.concat(ids)
+  def normalize_childs(childs)
+    childs = create_childs || childs
+    childs.is_a?(Array) ? childs : [childs]
   end
 
   def create_tk_widget(parent)
@@ -69,7 +45,7 @@ class TkWrapper::Widgets::Base::Widget
 
     return unless tk_class
 
-    parent&.tk_widget ? tk_class.new(parent.tk_widget) : tk_class.new
+    tk_class.new(parent&.tk_widget)
   end
 
   # if parent is provided and self has no tk_class, the tk_widget of the
@@ -80,41 +56,54 @@ class TkWrapper::Widgets::Base::Widget
     (@tk_widget = create_tk_widget(parent)) || parent&.tk_widget
   end
 
-  def build(parent, configure: true)
-    @parent = parent
-    tk_widget # creates the widget if possible and not yet created
-    @font = TkWrapper::Util::Tk::Font.new(tk_widget)
-    self.configure if configure
-    manager.execute_modifications(self)
-    @childs.each { |child| child.build(self) }
+  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)
+    child.build(self, manager: @manager)
   end
 
-  def configure
-    @config.merge_global_configurations(manager, self)
-    @config.configure_tk_widget(tk_widget)
-    @config.configure_tearoff
+  protected
+
+  def build_childs
+    @childs.each { |child| child.build(self, manager: @manager) }
   end
 
-  def modify(matchers, &callback)
-    items = find_all(matchers)
+  def modify_configuration(config) end
 
-    callback.call(items)
-  end
+  def create_childs() end
 
-  def modify_each(matchers, &callback)
-    items = find_all(matchers)
+  def before_build(**args) end
 
-    return unless items
+  def after_build() end
 
-    with_match = items[0].is_a?(Array)
+  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), overwrite: false) if @manager
+    self.configure if configure
+    @manager&.execute_modifications(self)
+    @manager&.widgets&.push(self)
+    build_childs
+  end
 
-    items.each do |item|
-      with_match ? callback.call(item[0], item[1]) : callback.call(item)
-    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
 end

data/lib/widgets/base/widget_store.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "#{LIB_DIR}/util/tk/finder"
+require_relative 'comparator_item_store'
+
+class TkWrapper::Widgets::Base::WidgetStore
+  extend Forwardable
+
+  def_delegators :@finder, :find, :find_all, :iter
+
+  def initialize
+    @lookup = {}
+    @finder = TkWrapper::Util::Tk::Finder.new(widgets: self, lookup: @lookup)
+  end
+
+  def push(widget)
+    widget.ids.each do |id|
+      (@lookup[id] ||= []).push(widget)
+    end
+    (@lookup[nil] ||= []).push(widget) if widget.ids.empty?
+  end
+
+  def each(&block)
+    @lookup.each_value do |widgets|
+      widgets.each { |widget| block.call(widget) }
+    end
+  end
+
+  def [](key)
+    @lookup[key]&.size == 1 ? @lookup[key].first : @lookup[key]
+  end
+
+  private
+
+  def map_key?(key)
+    [String, Symbol].include?(key)
+  end
+end

data/lib/widgets/base/window_info.rb

@@ -0,0 +1,13 @@
+class TkWrapper::Widgets::Base::WindowInfo
+  def initialize(widget)
+    @widget = widget
+  end
+
+  def method_missing(name, *args)
+    if @widget.tk_widget.respond_to?("winfo_#{name}")
+      @widget.tk_widget.send("winfo_#{name}", *args)
+    else
+      super
+    end
+  end
+end

data/lib/widgets/button.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'tkextlib/tile'
+
+class TkWrapper::Widgets::Button < TkWrapper::Widgets::Base::Widget
+  def tk_class
+    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(config: {}, childs: [], id: nil)
-    super(config: config, childs: childs, id: id)
+  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,29 +1,34 @@
 # frozen_string_literal: true
 
+require 'tk'
+
 class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::TkMenu
+    TkMenu
   end
 
-  def build(parent)
-    super(parent)
+  def build(parent, **args)
+    super(parent, **args)
     parent.tk_widget['menu'] = tk_widget
   end
 
   class Cascade < TkWrapper::Widgets::Base::Widget
     def tk_class
-      TkWidgets::TkMenu
+      TkMenu
     end
 
-    def build(parent)
-      super(parent, configure: false)
+    def build(parent, **args)
+      args[:configure] = false
+      super(parent, **args)
       @config[:menu] = tk_widget
       parent.tk_widget.add :cascade, **@config.config
     end
   end
 
   class Command < TkWrapper::Widgets::Base::Widget
-    def build(parent)
+    def build(parent, **args)
+      args[:configure] = false
+      super(parent, **args)
       parent.tk_widget.add :command, **@config.config
     end
   end

data/lib/widgets/mount_point.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class TkWrapper::Widgets::MountPoint < TkWrapper::Widgets::Base::Widget
+  def initialize(**args)
+    super(**args)
+  end
+
+  def build_childs(skip: true)
+    super() unless skip
+  end
+
+  def mount=(childs)
+    mount(childs)
+  end
+
+  def mount(childs = nil)
+    if childs
+      @childs = childs.is_a?(Array) ? childs : [childs]
+    end
+    @childs.each do |child|
+      child.config.merge(@config)
+    end
+    build_childs(skip: false)
+  end
+end

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,9 @@ 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'
+require_relative 'mount_point'
+require_relative 'button'

metadata

@@ -1,22 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
-dependencies: []
+date: 2021-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description:
 email: reception@e.mail.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/tk_extensions.rb
 - lib/tkwrapper.rb
 - lib/util/hash_recursive.rb
 - lib/util/tk/cell.rb
@@ -25,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
@@ -33,11 +47,15 @@ files:
 - lib/widgets/base/matcher.rb
 - lib/widgets/base/matches.rb
 - lib/widgets/base/widget.rb
+- lib/widgets/base/widget_store.rb
+- lib/widgets/base/window_info.rb
+- lib/widgets/button.rb
 - lib/widgets/entry.rb
 - lib/widgets/frame.rb
 - lib/widgets/grid.rb
 - lib/widgets/label.rb
 - lib/widgets/menu.rb
+- lib/widgets/mount_point.rb
 - lib/widgets/root.rb
 - lib/widgets/text.rb
 - lib/widgets/widgets.rb

data/lib/tk_extensions.rb

@@ -1,49 +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::TkRoot
-      'TkText',          # becomes TkExtensions::TkText
-      'TkMenu',          # becomes TkExtensions::TkMenu
-      'Tk::Tile::Entry', # becomes TkExtensions::Entry
-      'Tk::Tile::Frame', # becomes TkExtensions::Frame
-      'Tk::Tile::Label'  # becomes TkExtensions::Label
-    ]
-    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