glimmer-dsl-tk 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f9643bc9497d251b1b17d52734874c954ce8ff085aee06f5a59bb98a79a1af
-  data.tar.gz: 2a1a77e76cfbd54fa463bc8c1ea3cb2e3e175b2996471bb3e80caf588f77f1dc
+  metadata.gz: 33884eabc43f9c6b019d12a45f75e19212e2969d447f743e29e9db5cf81c615b
+  data.tar.gz: 0f0e3558279a70b03aaaf3e7733125eee5bfb5cce320ea34a6bc838803227755
 SHA512:
-  metadata.gz: 5af953ed2716d179f70b6b844bde3fa67d808406f5796c0cedb06625e04a05945eba0ff00e8f1783603d6f5509b1abb2d31c6e10033bf0caf46e345172abff01
-  data.tar.gz: 6f2316a161c55c14acca0da4e6704908617bdec23058245d74352a3eb118bf26bb3671bfa78065aefd5ca23a985a9acbae547fdea7c571dc0ab103f462527d4d
+  metadata.gz: f9dac142530aa07249e92dc4cc314a028f7652582562031b415eaab33ac5c0a1207ef2d4f7bbe330bf62715d78f71727a3ef9f26eb761e52efdcc03778a39ac7
+  data.tar.gz: 117a6cd4b7fd8472c87b8e4817097d3b6f1c0ff1f765c8fa851b239fff453bbcc2bc7dc69a800d1c9fbee6669b87f821f2d2fa8cef4a407b59c1607c582a0aaf

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.0.33
+
+- Support `text` widget `InsertMarkMoved` listener event to track insert mark movement (or alises `InsertMarkMove`, `insert_mark_move`, `insert_mark_moved`, all case-insensitive)
+- Support `entry` widget `changed` and `modified` listener event aliases for `change` event
+- Autodiscover format options when moving cursor in `text` widget (auto-derive from applied tags and widget font) and show in top Hello, Text! toolbar comboboxes and buttons
+- Fix issue with encountering error 'NoMethodError: undefined method "size" for' when launching Hello, Text!, performing Select-All (CMD+A or CONTROL+A) and then attempting to Bold all the text.
+- Fix issue in Hello, Text! whereby bolding a small region of text affects the font of the following region of text till the end of the document
+- Fix issue in Hello, Text! where if all text is copied and then pasted multiple times, the `text` widget loses its keyboard/mouse listeners and CMD+F does not work anymore to bring Find dialog
+
 ## 0.0.32
 
 - Hello, Text! Find Dialog toolbar button

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.32
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for Tk 0.0.33
 ## MRI Ruby Desktop Development GUI Library
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-tk.svg)](http://badge.fury.io/rb/glimmer-dsl-tk)
 [![Ruby](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml/badge.svg)](https://github.com/AndyObtiva/glimmer-dsl-tk/actions/workflows/ruby.yml)
@@ -158,7 +158,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.32'
+gem 'glimmer-dsl-tk', '~> 0.0.33'
 ```
 
 And, then run:
@@ -273,7 +273,7 @@ keyword(args) | attributes | event bindings & callbacks
 `choose_directory(options = nil)` | None | None
 `choose_font(options = nil) {|font| ... }` | None | None
 `combobox` | `state`, `text` | `'ComboboxSelected'`
-`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'`, `validatecommand {}`, `invalidcommand {}`
+`entry` | `width`, `text`, `validate`, `show` (`'none', 'focus', 'focusin', 'focusout', 'key', or 'all'`) | `'validate'`, `'invalid'`, `'change'` (alias: `'changed'`), `validatecommand {}`, `invalidcommand {}`
 `get_multiple_open_file(options = nil)` | None | None
 `get_open_file(options = nil)` | None | None
 `get_save_file(options = nil)` | None | None
@@ -286,7 +286,7 @@ keyword(args) | attributes | event bindings & callbacks
 `radiobutton` | `text`, `variable` (Boolean), `image` (optional keyword args: `subsample`, `zoom`, `from`, `to`, `shrink`, `compositingrule`), `compound` (`'center', 'top', 'bottom', 'left', 'right'`), `value` (default: `text`) | `command {}`
 `root` | `title`, `iconphoto`, `background`, `alpha`, `fullscreen?`, `topmost?`, `transparent?`, `stackorder`, `winfo_screendepth`, `winfo_screenvisual`, `winfo_screenwidth`, `winfo_screenheight`, `winfo_pixels('li')`, `winfo_screen`, `wm_maxsize`, `state` (`'normal', 'iconic', 'withdrawn', 'icon', 'zoomed'`) | `'DELETE_WINDOW'`, `'OPEN_WINDOW'`
 `separator` | `orient` (`'horizontal' (default) or 'vertical'`) | None
-`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`
+`text` | `value`, [many more attributes](https://tcl.tk/man/tcl8.6/TkCmd/text.htm#M116) | `'modified'`, `'selection'`, `'insert_mark_moved'` (alias: `'insert_mark_move', 'InsertMarkMove', 'InsertMarkMoved'`)
 
 Options for `get_open_file` and `get_multiple_open_file` include:
 - `filetypes`: `Hash` of `'Group Name' => '.ext'` entries (e.g. `filetypes: {'PNG Images' => '.png'}`

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/lib/glimmer/tk/entry_proxy.rb

@@ -40,7 +40,7 @@ module Glimmer
       
       def handle_listener(listener_name, &listener)
         case listener_name.to_s.downcase
-        when 'change'
+        when 'change', 'changed', 'modified'
           tk.textvariable.trace('write') {
             listener.call(@tk.textvariable)
           }

data/lib/glimmer/tk/text_proxy.rb

@@ -27,33 +27,63 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TextProxy < WidgetProxy
+      ALL_TAG = '__all__'
+      FORMAT_DEFAULT_MAP = {
+        'justify' => 'left',
+      }
+    
       def handle_listener(listener_name, &listener)
         case listener_name.to_s.downcase
         when '<<modified>>', '<modified>', 'modified'
           modified_listener = Proc.new do |*args|
             listener.call(*args)
+            apply_all_tag
+            @insert_mark_moved_proc.call
             @tk.modified = false
           end
-          bind('<Modified>', modified_listener)
+          @tk.bind('<Modified>', modified_listener)
         when '<<selection>>', '<selection>', 'selection'
-          bind('<Selection>', listener)
+          @tk.bind('<Selection>', listener)
         when 'destroy'
           super
+        when 'insertmarkmove', 'insertmarkmoved', 'insert_mark_move', 'insert_mark_moved'
+          if @insert_mark_moved_proc.nil?
+            handle_listener('KeyPress') do |event|
+              @insert_mark_moved_proc.call
+            end
+            handle_listener('KeyRelease') do |event|
+              @insert_mark_moved_proc.call
+            end
+            handle_listener('ButtonPress') do |event|
+              @insert_mark_moved_proc.call
+            end
+            handle_listener('ButtonRelease') do |event|
+              @insert_mark_moved_proc.call
+            end
+          end
+          @insert_mark = @tk.index('insert')
+          @insert_mark_moved_proc = Proc.new do
+            new_insert_mark = @tk.index('insert')
+            if new_insert_mark != @insert_mark
+              @insert_mark = new_insert_mark
+              listener.call(new_insert_mark)
+            end
+          end
         else
-          @tk.tag_add('__all__', '1.0', 'end') unless @tk.tag_names.include?('__all__')
+          apply_all_tag
           # TODO make listener pass an event that has a modifiers attribute for easy representation of :shift, :meta, :control, etc... while a letter button is pressed
           begin
-            @tk.tag_bind('__all__', listener_name, &listener)
+            @tk.tag_bind(ALL_TAG, listener_name, &listener)
           rescue => e
             Glimmer::Config.logger.debug {"Unable to bind to #{listener_name} .. attempting to surround with <>"}
             Glimmer::Config.logger.debug {e.full_message}
             listener_name = "<#{listener_name}" if !listener_name.start_with?('<')
             listener_name = "#{listener_name}>" if !listener_name.end_with?('>')
-            @tk.tag_bind('__all__', listener_name, &listener)
+            @tk.tag_bind(ALL_TAG, listener_name, &listener)
           end
         end
       end
-    
+      
       def add_selection_format(option, value)
         process_selection_ranges { |range_start, range_end| add_format(range_start, range_end, option, value) }
       end
@@ -91,7 +121,7 @@ module Glimmer
       end
       
       def applied_format_tags(region_start, region_end, option, value)
-        tag_names = @tk.tag_names - ['sel']
+        tag_names = @tk.tag_names - ['sel', ALL_TAG]
         
         tag_names.select do |tag_name|
           @tk.tag_ranges(tag_name).any? do |range|
@@ -102,6 +132,23 @@ module Glimmer
         end
       end
             
+      def applied_format_value(text_index = nil, option)
+        text_index ||= @tk.index('insert')
+        region_start = text_index
+        region_end = text_index
+        tag_names = @tk.tag_names - ['sel', ALL_TAG]
+        
+        values = tag_names.map do |tag_name|
+          @tk.tag_ranges(tag_name).map do |range|
+            if text_index_less_than_or_equal_to_other_text_index?(range.first, region_start) && text_index_greater_than_or_equal_to_other_text_index?(range.last, region_end)
+              @tk.tag_cget(tag_name, option)
+            end
+          end
+        end.flatten.reject {|value| value.to_s.empty?}
+        
+        values.last || (@tk.send(option) rescue FORMAT_DEFAULT_MAP[option])
+      end
+            
       def add_format(region_start, region_end, option, value)
         @@tag_number = 0 unless defined?(@@tag_number)
         tag = "tag#{@@tag_number += 1}"
@@ -155,15 +202,14 @@ module Glimmer
       def applied_font_format_tags_and_regions(region_start, region_end)
         lines = value.split("\n")
         tags_and_regions = []
-        all_tag_names = @tk.tag_names - ['sel']
+        all_tag_names = @tk.tag_names - ['sel', ALL_TAG]
         (region_start.to_i..region_end.to_i).each do |line_number|
           start_character_index = 0
           start_character_index = region_start.to_s.split('.').last.to_i if line_number == region_start.to_i
-          end_character_index = lines[line_number - 1].size
+          end_character_index = lines[line_number - 1].to_s.size
           end_character_index = region_end.to_s.split('.').last.to_i if line_number == region_end.to_i
           (start_character_index...end_character_index).each do |character_index|
             text_index = "#{line_number}.#{character_index}"
-            # TODO reimplement the following using @tk.tag_names without arg since passing an arg seems broken and returns inaccurate results
             region_tag = all_tag_names.reverse.find do |tag|
               @tk.tag_cget(tag, 'font') && @tk.tag_ranges(tag).any? do |range_start, range_end|
                 text_index_less_than_or_equal_to_other_text_index?(range_start, text_index) && text_index_greater_than_or_equal_to_other_text_index?(range_end, text_index)
@@ -179,6 +225,27 @@ module Glimmer
         end
         tags_and_regions
       end
+      
+      def applied_font_format_value(text_index = nil, font_option)
+        text_index ||= @tk.index('insert')
+        region_start = text_index
+        region_end = @tk.index("#{text_index} + 1 chars")
+        tag_names = applied_font_format_tags_and_regions(region_start, region_end).map(&:first)
+        
+        values = tag_names.map do |tag_name|
+          @tk.tag_ranges(tag_name).map do |range|
+            if text_index_less_than_or_equal_to_other_text_index?(range.first, region_start) && text_index_greater_than_or_equal_to_other_text_index?(range.last, region_end)
+              @tk.tag_cget(tag_name, 'font')
+            end
+          end
+        end.flatten.reject {|value| value.to_s.empty?}
+        
+        font = values.last
+        
+        value = font && font.send(font_option)
+        
+        value || Hash[@tk.font.actual][font_option]
+      end
 
       def add_font_format(region_start, region_end, font_option, value)
         applied_font_format_tags_and_regions(region_start, region_end).each do |tag, tag_region_start, tag_region_end|
@@ -348,11 +415,16 @@ module Glimmer
         self.wrap = 'none'
         self.padx = 5
         self.pady = 5
+        on('Modified') { apply_all_tag }
       end
       
       def clone_font(font)
         ::TkFont.new(Hash[font.actual])
       end
+      
+      def apply_all_tag
+        @tk.tag_add(ALL_TAG, '1.0', 'end')
+      end
     end
   end
 end

data/samples/hello/hello_text.rb

@@ -143,7 +143,7 @@ class HelloText
           orient 'vertical'
         }
         
-        button {
+        @bold_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'B'
           style font: {weight: 'bold'}
@@ -153,7 +153,7 @@ class HelloText
           end
         }
         
-        button {
+        @italic_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'I'
           style font: {slant: 'italic'}
@@ -163,7 +163,7 @@ class HelloText
           end
         }
         
-        button {
+        @underline_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           text 'U'
           style font: {underline: true}
@@ -210,7 +210,7 @@ class HelloText
           orient 'vertical'
         }
         
-        button {
+        @justify_left_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           image File.expand_path("images/align-left.png", __dir__), subsample: 32
           
@@ -219,7 +219,7 @@ class HelloText
           end
         }
         
-        button {
+        @justify_center_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           image File.expand_path("images/align-center.png", __dir__), subsample: 32
           
@@ -228,7 +228,7 @@ class HelloText
           end
         }
         
-        button {
+        @justify_right_button = button {
           grid row: 1, column: column_index += 1, column_weight: 0
           image File.expand_path("images/align-right.png", __dir__), subsample: 32
           
@@ -293,6 +293,19 @@ class HelloText
         on('KeyPress') do |event|
           show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
         end
+        
+        on('InsertMarkMoved') do
+          self.font_family = @text.applied_font_format_value('family')
+          self.font_size = @text.applied_font_format_value('size')
+          @bold_button.default = @text.applied_font_format_value('weight') == 'bold' ? 'active' : 'normal'
+          @italic_button.default = @text.applied_font_format_value('slant') == 'italic' ? 'active' : 'normal'
+          @underline_button.default = @text.applied_font_format_value('underline') == true ? 'active' : 'normal'
+          self.background = @text.applied_format_value('background')
+          self.foreground = @text.applied_format_value('foreground')
+          @justify_left_button.default = @text.applied_format_value('justify') == 'left' ? 'active' : 'normal'
+          @justify_center_button.default = @text.applied_format_value('justify') == 'center' ? 'active' : 'normal'
+          @justify_right_button.default = @text.applied_format_value('justify') == 'right' ? 'active' : 'normal'
+        end
       }
     }
     @root.open
@@ -318,7 +331,7 @@ class HelloText
             end
           end
         ]
-        
+                
         on('KeyPress') do |event|
           if event.keysym == 'Return'
             find

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-29 00:00:00.000000000 Z
+date: 2021-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer