tkwrapper 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abffb1cc7ae4efaf8b26ebdd49acca56837989829713473f21971f8a5f5a9063
-  data.tar.gz: 1e659e3049a41d4aff307f700ac27cc86d014ec844134aa65bc7bd20c2f692db
+  metadata.gz: 25ebb6c8831b18ae3b55f4d98896cc5cf824d628fd4bc245b6fc1ed9fd8c5ef0
+  data.tar.gz: b90ca62d87faa02e1a07f5f1145e175d55dfcfeacd71782c709a484038701dfc
 SHA512:
-  metadata.gz: efbad85fe488198ff115feac31872163da0da8b796ef0a21babf33d21976e14da0f809a93a502cbfc0f9225e4446e30c1b567680af2b3c7e7eae862cf0b5f64b
-  data.tar.gz: 7d0addd32901d46c6d0175219ee83dd4478f699bc05ec7804f0a76dac02b1950a11f7a22dafa494996961bc8f25582c1f6be4f36c3cf19c9b3a3e5050cb0df9f
+  metadata.gz: b4d1820254e60b3d9ce4be52a8875b0acbda213dac7aa200352d794ff1146611e84ac1f9bb16589f6fa6d61ba3b65468c940cf27d965ead1e3913fbc5b1cce7e
+  data.tar.gz: fd00a3c5ae1c29aa66762f554a43223a5ce32ef538c340a8549ba56fb12853743f80ae90862aac30f99383be61497fe1744bbb85e7ca7ef1e83d32785e4f5133

data/lib/tk_extensions.rb

@@ -26,12 +26,13 @@ module TkExtensions
     # 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
+      '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)

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

@@ -15,6 +15,7 @@ class TkWrapper::Util::Tk::Finder
   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 }
@@ -33,7 +34,6 @@ class TkWrapper::Util::Tk::Finder
   private
 
   def create_value_matchers(comparators)
-    comparators = [comparators] unless comparators.is_a?(Array)
     comparators.map { |comparator| Matcher.new(comparator: comparator) }
   end
 
@@ -55,7 +55,8 @@ class TkWrapper::Util::Tk::Finder
     matchers = create_value_matchers(comparators)
 
     widgets.each do |widget|
-      widget.ids.each do |id|
+      ids = widget.ids.empty? ? [nil] : widget.ids
+      ids.each do |id|
         matchers.each do |matcher|
           (match = matcher.match(id, widget)) && block.call(match)
         end

data/lib/widgets/base/configuration.rb

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

@@ -47,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/widget.rb

@@ -3,6 +3,7 @@ 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
@@ -12,12 +13,13 @@ class TkWrapper::Widgets::Base::Widget
   def_delegators :@finder, :find, :find_all
 
   attr_accessor :config
-  attr_reader :parent, :ids, :cell, :childs, :manager
+  attr_reader :parent, :ids, :cell, :childs, :manager, :winfo
 
   def tk_class() end
 
   def initialize(config: {}, childs: [], manager: nil, ids: [])
     @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]
@@ -30,7 +32,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,6 +43,10 @@ class TkWrapper::Widgets::Base::Widget
     (@tk_widget = create_tk_widget(parent)) || parent&.tk_widget
   end
 
+  def build_childs
+    @childs.each { |child| child.build(self, manager: @manager) }
+  end
+
   def build(parent, configure: true, manager: nil)
     @parent = parent
     tk_widget # creates the widget if possible and not yet created
@@ -50,7 +56,7 @@ class TkWrapper::Widgets::Base::Widget
     self.configure if configure
     @manager&.execute_modifications(self)
     @manager&.widgets&.push(self)
-    @childs.each { |child| child.build(self, manager: @manager) }
+    build_childs
   end
 
   def configure
@@ -69,6 +75,6 @@ class TkWrapper::Widgets::Base::Widget
 
   def push(child)
     @childs.push(child)
-    child.build(self)
+    child.build(self, manager: @manager)
   end
 end

data/lib/widgets/base/widget_store.rb

@@ -17,6 +17,7 @@ class TkWrapper::Widgets::Base::WidgetStore
     widget.ids.each do |id|
       (@lookup[id] ||= []).push(widget)
     end
+    (@lookup[nil] ||= []).push(widget) if widget.ids.empty?
   end
 
   def each(&block)
@@ -26,7 +27,7 @@ class TkWrapper::Widgets::Base::WidgetStore
   end
 
   def [](key)
-    @lookup[key].size == 1 ? @lookup[key].first : @lookup[key]
+    @lookup[key]&.size == 1 ? @lookup[key].first : @lookup[key]
   end
 
   private

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,7 @@
+# frozen_string_literal: true
+
+class TkWrapper::Widgets::Button < TkWrapper::Widgets::Base::Widget
+  def tk_class
+    TkWidgets::Button
+  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/widgets.rb

@@ -12,3 +12,5 @@ require_relative 'text'
 require_relative 'entry'
 require_relative 'auto_resize_entry'
 require_relative 'grid'
+require_relative 'mount_point'
+require_relative 'button'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-19 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tk
@@ -48,11 +48,14 @@ files:
 - 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