tkwrapper 1.4.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c1971220f794d1e17288aac5b75221393727be934288a4993a621c35b3282d
-  data.tar.gz: f2a841f6f3a6a7ee040c85fe0f2081234780bf1ff0bf4aeb70de9cf4c2a75055
+  metadata.gz: 90b29c12036c765281e148238dd8b97afc06091749eeb5c8a8595ce8a3ddd589
+  data.tar.gz: 8c7b8f7f3b5c9b54a239d9d7d034b14d8cde4e700d848e98d2b77329da03aa8b
 SHA512:
-  metadata.gz: 22cf843324096411be2441088df910d723ecc353aa6b54dd64ba5703b2fcd47bec3c2424a38e910fefb187fdcf23ec60dd44640de3f0657a3cb2969e84da016c
-  data.tar.gz: acb296b0e78c570e7d80ba96d91c4ebf62ecfd1ce7c97fac088546d599e0468a23dafac325ee14ae9fa0d4d08a9c8c70e5972df849346a05d8e2ac3ee9fb1154
+  metadata.gz: 402470958a23a858dbe40ab101e31b61fd7ccbf6c240dbaa83a9c6e6727c94ca1a5e81e9d73ab571fc3c85b0ba275fece636793eacb487a98a60ed85bffc1661
+  data.tar.gz: 3f74e9a050ec620ea4d77bc0e518dff8fe4037e79c37d5ca111d85f33d52288dc663449ba760a963fa26fb5dd2bcafb6d6edd9ecc6b84ac0831f67e1456bdbf1

data/lib/tkwrapper.rb

@@ -2,7 +2,12 @@
 
 LIB_DIR = __dir__
 
-module TkWrapper end
+module TkWrapper
+  module Util
+    module Tk
+    end
+  end
+end
 
 require_relative 'widgets/widgets'
 

data/lib/util/array.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Util
+  def self.first_not_nil(array, default = nil)
+    index = indexes.find { |i| !array[i].nil? }
+    index.nil? ? default : array[index]
+  end
+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(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(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/util/tk/font.rb

@@ -48,4 +48,18 @@ class TkWrapper::Util::Tk::Font
   def update
     @tk_widget.font = TkFont.new(@config)
   end
+
+  def char_width
+    measure('0')
+  end
+
+  def linespace
+    metrics['linespace']
+  end
+
+  def metrics
+    @tk_widget.font.metrics.each_with_object({}) do |(key, value), metrics|
+      metrics[key] = value
+    end
+  end
 end

data/lib/widgets/auto_resize_entry.rb

@@ -5,14 +5,14 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   attr_accessor :min_width, :add_width
 
   def initialize(**args)
-    @min_width = args[:config][:min_width] || 0
-    @add_width = args[:config][:add_width] || 0
+    @min_width = args.dig(:config, :min_width) || 0
+    @add_width = args.dig(:config, :add_width) || 0
     super(**args)
   end
 
   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
@@ -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,98 @@
+# frozen_string_literal: true
+
+require_relative 'text'
+
+class TkWrapper::Widgets::AutoResizeText < TkWrapper::Widgets::Frame
+  attr_reader :text
+
+  def initialize(**args)
+    @min_number_chars = 8
+    @min_number_lines = 2
+
+    super(**args)
+
+    @longest_line_width = 0
+    @config.merge({ grid: :onecell }, overwrite: false)
+  end
+
+  def create_childs
+    @text = Text.new(config: {
+      grid:   { sticky: 'nsew' },
+      width:  @min_number_chars,
+      height: @min_number_lines
+    })
+  end
+
+  def build(parent, **args)
+    super(parent, **args)
+    @text.bind('<Modified>', &method(:autoresize))
+    TkGrid.propagate(tk_widget, 0)
+    resize(lines: @min_number_lines, chars: @min_number_chars)
+    #@text.resize(lines: @min_number_lines, chars: @min_number_chars)
+  end
+
+  # width of cursor + borders (textfield + frame) + padding (textfield + frame)
+  def additional_width_needed_for_textfield
+    @text.opts.insertwidth +
+      @text.accumulated_border_and_padding_width +
+      accumulated_border_and_padding_width
+  end
+
+  def additional_height_needed_for_textfield
+    # TODO: cursor height?
+    @text.accumulated_border_and_padding_height +
+      accumulated_border_and_padding_height
+  end
+
+  def width_needed_for_chars(num_chars)
+    text.font.char_width * num_chars + additional_width_needed_for_textfield
+  end
+
+  def height_needed_for_lines(num_lines)
+    @text.height_of_lines(num_lines) + additional_height_needed_for_textfield
+  end
+
+  def resize_width
+    opts.width = width_needed_for_textfield
+    @parent.tk_widget.update
+  end
+
+  def resize(height: nil, width: nil, lines: nil, chars: nil)
+    width  = width_needed_for_chars(chars)  if chars
+    height = height_needed_for_lines(lines) if lines
+
+    opts.width  = width  if width
+    opts.height = height if height
+  end
+
+  def width_needed_for_textfield
+    @text.longest_line_width + additional_width_needed_for_textfield
+  end
+
+  def height_needed_for_textfield
+    @text.height_of_lines + additional_height_needed_for_textfield
+  end
+
+  def max_width
+    [@cell.bbox[2], 0].max
+  end
+
+  def min_width
+    [max_width, width_needed_for_chars(@min_number_chars)].min
+  end
+
+  def min_height
+    height_needed_for_lines(@min_number_lines)
+  end
+
+  def autoresize
+    return unless @text.tk_widget.modified?
+
+    width  = [[min_width,  width_needed_for_textfield].max, max_width].min
+    height = [min_height, height_needed_for_textfield].max
+
+    resize(height: height, width: width)
+
+    @text.tk_widget.modified(false)
+  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

@@ -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)
@@ -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)

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)
@@ -42,6 +47,10 @@ class TkWrapper::Widgets::Base::Manager
     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/padding.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+class TkWrapper::Widgets::Base::Padding
+  def initialize(widget)
+    @widget = widget
+  end
+
+  def set(left: nil, top: nil, right: nil, bottom: nil)
+    values = get
+    @widget.tk_widget.padding = [
+      left   || values.left,
+      top    || values.top,
+      right  || values.right,
+      bottom || values.bottom
+    ]
+  end
+
+  def get
+    (left, top, right, bottom) = @widget.tk_widget.padding.split
+
+    {
+      left:   left   || 0,
+      top:    top    || left || 0,
+      right:  right  || left || 0,
+      bottom: bottom || top  || left || 0
+    }
+  end
+
+  def left
+    get[:left]
+  end
+
+  def top
+    get[:top]
+  end
+
+  def right
+    get[:right]
+  end
+
+  def bottom
+    get[:bottom]
+  end
+
+  def left=(left)
+    set(left: left)
+  end
+
+  def top=(top)
+    set(top: top)
+  end
+
+  def right=(right)
+    set(right: right)
+  end
+
+  def bottom=(bottom)
+    set(bottom: bottom)
+  end
+end

data/lib/widgets/base/tk_options.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative 'padding'
+
+class TkWrapper::Widgets::Base::TkOptions
+  attr_reader :padding
+
+  def self.default_to_zero(*properties)
+    properties.each do |property|
+      define_method(property) do
+        value = @widget.tk_widget[property]
+        value.is_a?(Numeric) ? value : 0
+      end
+    end
+  end
+
+  default_to_zero :padx, :insertwidth, :borderwidth,
+                  :spacing1, :spacing2, :spacing3
+
+  def initialize(widget)
+    @widget = widget
+    @padding = TkWrapper::Widgets::Base::Padding.new(@widget)
+  end
+
+  def padding=(hash)
+    @padding.set(**hash)
+  end
+
+  def method_missing(key, value = nil)
+    if key[-1] == '='
+      @widget.tk_widget[key[0..-2].to_sym] = value
+    else
+      @widget.tk_widget[key]
+    end
+  end
+
+  def respond_to_missing?(*)
+    # no known way to check if tk_widget[key] exists
+    false
+  end
+end

data/lib/widgets/base/widget.rb

@@ -1,28 +1,49 @@
 require "#{LIB_DIR}/util/tk/cell"
 require "#{LIB_DIR}/util/tk/finder"
-require "#{LIB_DIR}/tk_extensions"
 
 require_relative 'base'
+require_relative 'window_info'
+require_relative 'tk_options'
 
 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
+  attr_reader :parent, :ids, :cell, :childs, :manager, :winfo, :opts, :font
 
   def tk_class() end
 
-  def initialize(config: {}, childs: [], manager: nil, ids: [])
-    @cell = TkWrapper::Util::Tk::Cell.new(self)
-    @finder = TkWrapper::Util::Tk::Finder.new(widgets: self)
+  def initialize(parent: nil, config: {}, childs: [], manager: nil, ids: [], id: [])
+    initialize_utilities
     @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 initialize_utilities
+    @cell   = TkWrapper::Util::Tk::Cell.new(self)
+    @winfo  = TkWrapper::Widgets::Base::WindowInfo.new(self)
+    @opts   = TkWrapper::Widgets::Base::TkOptions.new(self)
+    @finder = TkWrapper::Util::Tk::Finder.new(widgets: 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)
@@ -30,7 +51,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
@@ -41,22 +62,6 @@ class TkWrapper::Widgets::Base::Widget
     (@tk_widget = create_tk_widget(parent)) || parent&.tk_widget
   end
 
-  def build(parent, configure: true, manager: nil)
-    @parent = parent
-    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
-    self.configure if configure
-    @manager&.execute_modifications(self)
-    @childs.each { |child| child.build(self, manager: @manager) }
-  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?
@@ -68,6 +73,43 @@ class TkWrapper::Widgets::Base::Widget
 
   def push(child)
     @childs.push(child)
-    child.build(self)
+    child.build(self, manager: @manager)
+  end
+
+  protected
+
+  def build_childs
+    @childs.each { |child| child.build(self, manager: @manager) }
+  end
+
+  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), 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
 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,17 @@
+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
+
+  def respond_to_missing?(name, *)
+    @widget.tk_widget.respond_to?("winfo_#{name}") || super
+  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,17 @@
 # frozen_string_literal: true
 
+require 'tkextlib/tile'
+
 class TkWrapper::Widgets::Frame < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::Frame
+    Tk::Tile::Frame
+  end
+
+  def accumulated_border_and_padding_width
+    opts.padding.left + opts.padding.right + 2 * opts.borderwidth
+  end
+
+  def accumulated_border_and_padding_height
+    opts.padding.top + opts.padding.bottom + 2 * opts.borderwidth
   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/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,66 @@
 # frozen_string_literal: true
 
+require 'tk'
+
 class TkWrapper::Widgets::Text < TkWrapper::Widgets::Base::Widget
   def tk_class
-    TkWidgets::TkText
+    TkText
+  end
+
+  def pos(key)
+    match = tk_widget.index(key).match(/(.*)\.(.*)/)
+    [match[1].to_i, match[2].to_i]
+  end
+
+  def count_lines
+    pos('end')[0] - 1
+  end
+
+  def current_line_nr
+    pos('insert')[0]
+  end
+
+  def value=(value)
+    tk_widget.delete('1.0', 'end')
+    tk_widget.insert('1.0', value)
+  end
+
+  def lines(start_pos = '1.0', end_pos = 'end')
+    start_pos = start_pos.is_a?(String) ? start_pos : "#{start_pos}.0"
+    end_pos   = end_pos.is_a?(String)   ? end_pos   : "#{end_pos}.0"
+    tk_widget.get(start_pos, end_pos).split("\n")
+  end
+
+  def longest_line_width
+    lines.map { |line| @font.measure(line) }.max || 0
+  end
+
+  # includes spacing1 and spacing2 (add. space above and below line)
+  # does not include spacing3 (additional space between lines)
+  def line_height_including_padding
+    # linespace: max height of characters of the font
+    # spacing1: additional space above line
+    # spacing3: additional space below line
+    @font.linespace + opts.spacing1 + opts.spacing3
+  end
+
+  def height_of_lines(num_lines = lines.size)
+    h = num_lines * line_height_including_padding
+
+    # spacing 3: additional space between lines
+    h + [num_lines - 1, 0].max * opts.spacing3
+  end
+
+  def resize(lines: nil, chars: nil)
+    tk_widget['height'] = lines if lines
+    tk_widget['width']  = chars if chars
+  end
+
+  def accumulated_border_and_padding_width
+    2 * (opts.padx + opts.borderwidth)
+  end
+
+  def accumulated_border_and_padding_height
+    2 * (opts.pady + opts.borderwidth)
   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,23 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
-dependencies: []
+date: 2021-12-26 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/array.rb
 - lib/util/hash_recursive.rb
 - lib/util/tk/cell.rb
 - lib/util/tk/finder.rb
@@ -25,6 +39,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
@@ -32,12 +47,18 @@ files:
 - lib/widgets/base/match.rb
 - lib/widgets/base/matcher.rb
 - lib/widgets/base/matches.rb
+- lib/widgets/base/padding.rb
+- lib/widgets/base/tk_options.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