tkwrapper 1.6.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67fc8eac231f5b0b875cdd2fba4f107a3b596206766a4e57793e4f3d1b71992
-  data.tar.gz: 9bd2376b17ebf7e866f7858f98d2e9698575dec8a3fa2794c84c7b625048b33c
+  metadata.gz: 90b29c12036c765281e148238dd8b97afc06091749eeb5c8a8595ce8a3ddd589
+  data.tar.gz: 8c7b8f7f3b5c9b54a239d9d7d034b14d8cde4e700d848e98d2b77329da03aa8b
 SHA512:
-  metadata.gz: b467177153264f4a1cf973e4ae321d57c94f421e14eddfac98db6766ed06ca133f7af73931ef3f2ca3b23800363dacc533c666fb883f2bcb01c19a5432250b75
-  data.tar.gz: 00f36bd8f579688715d25b580a028e577f3820a83749b39bfd353c90ed32a3e0509ebcc5ca0306a3cf48576dd3d52d136e093ad26d87a33212cb84cb9a09b456
+  metadata.gz: 402470958a23a858dbe40ab101e31b61fd7ccbf6c240dbaa83a9c6e6727c94ca1a5e81e9d73ab571fc3c85b0ba275fece636793eacb487a98a60ed85bffc1661
+  data.tar.gz: 3f74e9a050ec620ea4d77bc0e518dff8fe4037e79c37d5ca111d85f33d52288dc663449ba760a963fa26fb5dd2bcafb6d6edd9ecc6b84ac0831f67e1456bdbf1

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

@@ -2,24 +2,97 @@
 
 require_relative 'text'
 
-class TkWrapper::Widgets::AutoResizeText < TkWrapper::Widgets::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)
-    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
+    @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/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

@@ -3,6 +3,7 @@ require "#{LIB_DIR}/util/tk/finder"
 
 require_relative 'base'
 require_relative 'window_info'
+require_relative 'tk_options'
 
 class TkWrapper::Widgets::Base::Widget
   extend Forwardable
@@ -14,14 +15,12 @@ class TkWrapper::Widgets::Base::Widget
   def_delegator :@manager, :widgets, :managed
 
   attr_accessor :config
-  attr_reader :parent, :ids, :cell, :childs, :manager, :winfo
+  attr_reader :parent, :ids, :cell, :childs, :manager, :winfo, :opts, :font
 
   def tk_class() end
 
   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)
+    initialize_utilities
     @config = TkWrapper::Widgets::Base::Configuration.new(config)
     @manager = manager
     @ids = init_id(id) + init_id(ids)
@@ -31,6 +30,13 @@ class TkWrapper::Widgets::Base::Widget
     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

data/lib/widgets/base/window_info.rb

@@ -10,4 +10,8 @@ class TkWrapper::Widgets::Base::WindowInfo
       super
     end
   end
+
+  def respond_to_missing?(name, *)
+    @widget.tk_widget.respond_to?("winfo_#{name}") || super
+  end
 end

data/lib/widgets/frame.rb

@@ -6,4 +6,12 @@ class TkWrapper::Widgets::Frame < TkWrapper::Widgets::Base::Widget
   def tk_class
     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/text.rb

@@ -6,4 +6,61 @@ class TkWrapper::Widgets::Text < TkWrapper::Widgets::Base::Widget
   def tk_class
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.1
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tk
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/tkwrapper.rb
+- lib/util/array.rb
 - lib/util/hash_recursive.rb
 - lib/util/tk/cell.rb
 - lib/util/tk/finder.rb
@@ -46,6 +47,8 @@ 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