glimmer-dsl-tk 0.0.39 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c011bf31bc0b5d5691abc8930f93b7fe33c77b8cb77f1f0bf439cd3344d9d7
-  data.tar.gz: 65af004b131e750be35b4bab6b11316c012e49dbbcc3509171c40abcdc4b809f
+  metadata.gz: 94a9453b27626850d61fc8b19ebf662f5f842a39548eb52cc280a2f123bb5a9b
+  data.tar.gz: '08586efe1d641f14ed9d93975efea3de3697c51fe37e3496ad257cc5498fd2d6'
 SHA512:
-  metadata.gz: b53ed25b7f36d71a8db9dfde148589b95efd88b5ba881b9da1ce011024f13eb90d6b7b4c536fe0302774fe5bf71645e457eb694adceba7f94238d7cc24e3a26c
-  data.tar.gz: 11b7ada873371764ec7e255e2ab070863eaad8deec1f54da0246fa7e5e7ed3af3b53ef1fb11954a2d572502353b9b1ed43e6cf557d43cf9517f6fb0047da60b0
+  metadata.gz: 00c61781ce122ec8053c81cdd4aaf90707a6f2c984a6be794d47d41760fd98ad5e0ffb90816ae510d4243ac776a8c4cf1dd0f797b7e08d9736695f03985d283a
+  data.tar.gz: 959e8368cb542d0d01d501ce5bd4ee3c9a3e83cb8822eeaca1aadcdf2a781515d3e453df2d93d4802bfee77ae4ac2a7e626988115cd458ba7088ff54c14a594f

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.0.40
+
+- Hello, Scrollbar!
+- Default to 'alt' Tk theme on Linux
+- Added Windows/Linux accelerators to Hello, Menu Bar!
+- Fix issue with extra junk character added to beginning of Hello, Checkbutton! by mistake
+- Fix issue with Hello, Menu Bar! help menu item crashing in Linux (it is restricted to Mac only)
+- Fix issue with Hello, Text! focus losing selection in Linux upon setting background/foreground/font/font-size
+
 ## 0.0.39
 
 - Add Language and Language Name menus to Hello, Menu Bar! sample

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.39
+# [<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.40
 ## 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)
@@ -121,6 +121,7 @@ Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
     - [Hello, Drag and Drop!](#hello-drag-and-drop)
     - [Hello, Built-in Dialog!](#hello-built-in-dialog)
     - [Hello, Separator!](#hello-separator)
+    - [Hello, Scrollbar!](#hello-scrollbar)
     - [Hello, Menu Bar!](#hello-menu-bar)
   - [Applications](#applications)
     - [Glimmer Tk Calculator](#glimmer-tk-calculator)
@@ -156,6 +157,14 @@ For example, on Windows, you can follow the [instructions over here](https://tkd
 - Setup environment variables TCL_LIBRARY=C:\ActiveTcl\lib\tcl8.6 & TK_LIBRARY=C:\ActiveTcl\lib\tk8.6
 - Run: `gem install tk -v0.4.0`
 
+For example, on Linux, you can:
+- Download the ActiveTcl Linux package from [ActiveState.com](https://activestate.com)
+- Extract the tar gz file using command `tar zxvf ActiveTcl-version-number.tar.gz`
+- Run included install shell script `./ActiveTcl-version-number/install.sh`
+- Install [RVM](https://rvm.io/) by running `\curl -sSL https://get.rvm.io | bash -s stable` (and run `curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -` if needed for mentioned security reasons)
+- Run: `rvm install 3.0.2 --enable-shared --enable-pthread --with-tk --with-tcl`
+- Run: `gem install tk -v0.4.0`
+
 Afterwards, if you open `irb`, you should be able to run `require 'tk'` successfully.
 
 ## Setup
@@ -171,7 +180,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.39'
+gem 'glimmer-dsl-tk', '~> 0.0.40'
 ```
 
 And, then run:
@@ -300,6 +309,9 @@ keyword(args) | attributes | event bindings & callbacks
 `notebook` | None | None
 `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`, `escapable`, `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'`
+`scrollbar` | `orient` | `command`
+`x_scrollbar` | `orient` (`'horizontal'`) | `command`
+`y_scrollbar` | `orient` (`'vertical'`) | `command`
 `separator` | `orient` (`'horizontal' (default) or 'vertical'`) | None
 `toplevel` | `title`, `iconphoto`, `background`, `alpha`, `escapable`, `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'`
 `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'`)
@@ -422,8 +434,44 @@ Other useful built-in API methods:
 - `text_edit_undo`
 - `text_edit_redo`
 
+If you would like to add scrollbars, you can set the `xscrollbar` and `yscrollbar` attributes.
+
+Example of adding a vertical `scrollbar`:
+
+```ruby
+    textarea_yscrollbar = y_scrollbar {
+      grid row:0, column:1
+    }
+
+    textarea = text {
+      grid row:0, column:0, column_weight: 0
+      wrap "word"
+      yscrollbar textarea_yscrollbar
+    }
+```
+
+Example of adding both a horizontal `scrollbar` and a vertical `scrollbar` (must disable `wrap "word"` for horizontal scrolling to work):
+
+```ruby
+    textarea_xscrollbar = x_scrollbar {
+      grid row:1, column:0, column_span: 2, row_weight: 0
+    }
+
+    textarea_yscrollbar = y_scrollbar {
+      grid row:0, column:1
+    }
+
+    textarea = text {
+      grid row:0, column:0, column_weight: 0
+      xscrollbar textarea_xscrollbar
+      yscrollbar textarea_yscrollbar
+    }
+```
+
 Check out the [Hello, Text!](#hello-text) sample for a good demonstration of the `text` widget features.
 
+Check out the [Hello, Scrollbar!](#hello-scrollbar) sample for a `text` demo with scrolling.
+
 #### Drag and Drop API
 
 Drag and drop works by simply designating a widget as a drag source with attribute `drag_source true`
@@ -2937,6 +2985,77 @@ Glimmer app:
 
 ![glimmer dsl tk screenshot sample hello separator](images/glimmer-dsl-tk-screenshot-sample-hello-separator.png)
 
+### Hello, Scrollbar!
+
+Glimmer code (from [samples/hello/hello_scrollbar.rb](samples/hello/hello_scrollbar.rb)):
+
+```ruby
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+root {
+  title 'Hello, Scrollbar!'
+  width 400
+  height 500
+  
+  notebook {
+    grid sticky: 'nsew', row_weight: 1, column_weight: 1
+    
+    frame(text: 'Scrollable List') {
+      @list = list {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        items 40.times.map {|n| "Item #{n + 1} of a very long list" }
+      }
+      
+      @scrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @list.yscrollbar @scrollbar
+    }
+    
+    frame(text: 'Scrollable Text') {
+      @text = text {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        value ("This is a random sample of text that will repeat over and over and over"*2 + "\n")*40
+      }
+      
+      @yscrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @text.yscrollbar @yscrollbar
+       
+      @xscrollbar = scrollbar {
+        grid row: 1, column: 0, column_span: 2, row_weight: 0
+        orient 'horizontal'
+      }
+      @text.xscrollbar @xscrollbar
+    }
+  }
+  
+}.open
+```
+
+Run with [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r glimmer-dsl-tk -e "require 'samples/hello/hello_scrollbar'"
+```
+
+Alternatively, run from cloned project without [glimmer-dsl-tk](https://rubygems.org/gems/glimmer-dsl-tk) gem installed:
+
+```
+ruby -r ./lib/glimmer-dsl-tk.rb samples/hello/hello_scrollbar.rb
+```
+
+Glimmer app:
+
+![glimmer dsl tk screenshot sample hello scrollbar](images/glimmer-dsl-tk-screenshot-sample-hello-scrollbar-list.png)
+
+![glimmer dsl tk screenshot sample hello scrollbar](images/glimmer-dsl-tk-screenshot-sample-hello-scrollbar-text.png)
+
 ### Hello, Menu Bar!
 
 Glimmer code (from [samples/hello/hello_menu_bar.rb](samples/hello/hello_menu_bar.rb)):
@@ -2961,6 +3080,38 @@ root { |r|
   }
   
   menu {
+    # Mac-specific application menu (right next to the Apple menu)
+    if OS.mac?
+      menu(:application) {
+        menu_item(:about, label: 'About My Application') {
+          accelerator 'Command+A'
+          
+          on('command') do
+            message_box(parent: r, title: 'About', message: 'About my application.')
+          end
+        }
+        
+        menu_item(:preferences) {
+          on('command') do
+            message_box(parent: r, title: 'Preferences', message: 'Preferences of my application.')
+          end
+        }
+        
+        # If not defined, application simply quits upon selecting Quit menu item
+        menu_item(:quit) {
+          on('command') do
+            message_box(parent: r, title: 'Quit', message: 'Quitting my application...')
+            exit(0)
+          end
+        }
+      }
+    end
+    
+    # Windows-specific system menu (to the top-left of the window frame)
+    if OS.windows?
+      menu(label: 'System')
+    end
+    
     menu(label: 'File', underline: 0) {
       menu_item(label: 'New', underline: 0) {
         accelerator 'Command+N'
@@ -2969,6 +3120,7 @@ root { |r|
           message_box(parent: r, title: 'New', message: 'New file created.')
         end
       }
+      
       menu_item(label: 'Open...', underline: 0) {
         accelerator 'Command+O'
 
@@ -2976,36 +3128,44 @@ root { |r|
           message_box(parent: r, title: 'Open', message: 'Opening File...')
         end
       }
+      
       menu(label: 'Open Recent', underline: 5) {
         menu_item(label: 'File 1') {
           on('command') do
             message_box(parent: r, title: 'File 1', message: 'File 1 Contents')
           end
         }
+        
         menu_item(label: 'File 2') {
           on('command') do
             message_box(parent: r, title: 'File 2', message: 'File 2 Contents')
           end
         }
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Exit', underline: 1) {
         on('command') do
           exit(0)
         end
       }
     }
+    
     menu(label: 'Edit', underline: 0) {
       menu_item(label: 'Cut', underline: 2) {
         accelerator 'Command+X'
       }
+      
       menu_item(label: 'Copy', underline: 0) {
         accelerator 'Command+C'
       }
+      
       menu_item(label: 'Paste', underline: 0) {
         accelerator 'Command+V'
       }
     }
+    
     menu(label: 'Options', underline: 0) {
       menu_item(:checkbutton, label: 'Enabled', underline: 0) {
         on('command') do
@@ -3013,6 +3173,7 @@ root { |r|
           @select_multiple_menu.children.each { |menu_item| menu_item.state = menu_item.state == 'disabled' ? 'normal' : 'disabled' }
         end
       }
+      
       @select_one_menu = menu(label: 'Select One', underline: 0) {
         menu_item(:radiobutton, label: 'Option 1') {
           state 'disabled'
@@ -3024,6 +3185,7 @@ root { |r|
           state 'disabled'
         }
       }
+      
       @select_multiple_menu = menu(label: 'Select Multiple', underline: 0) {
         menu_item(:checkbutton, label: 'Option 4') {
           state 'disabled'
@@ -3036,6 +3198,26 @@ root { |r|
         }
       }
     }
+    
+    menu(label: 'Language', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+        }
+      end
+    }
+    
+    menu(label: 'Language Country', underline: 3) {
+      ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
+        menu_item(:radiobutton, label: image_name.capitalize) {
+          selection image_name == 'usa'
+          image File.expand_path("images/#{image_name}.png", __dir__)
+          compound 'left'
+        }
+      end
+    }
+    
     menu(label: 'Format', underline: 0) {
       menu(label: 'Background Color', underline: 0) {
         COLORS.each { |color_style|
@@ -3046,6 +3228,7 @@ root { |r|
           }
         }
       }
+      
       menu(label: 'Foreground Color', underline: 11) {
         COLORS.each { |color_style|
           menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {
@@ -3056,6 +3239,7 @@ root { |r|
         }
       }
     }
+    
     menu(label: 'View', underline: 0) {
       menu_item(:radiobutton, label: 'Small', underline: 0) {
         accelerator 'Command+S'
@@ -3064,6 +3248,7 @@ root { |r|
           @label.font = {size: 25}
         end
       }
+      
       menu_item(:radiobutton, label: 'Medium', underline: 0) {
         accelerator 'Command+M'
         selection true
@@ -3072,6 +3257,7 @@ root { |r|
           @label.font = {size: 50}
         end
       }
+      
       menu_item(:radiobutton, label: 'Large', underline: 0) {
         accelerator 'Command+L'
         
@@ -3080,7 +3266,16 @@ root { |r|
         end
       }
     }
+    
+    menu(label: 'Window', underline: 0)
+    
     menu(label: 'Help', underline: 0) {
+      menu_item(:help) {
+        on('command') do
+          message_box(parent: r, title: 'Help', message: 'Help for my application.')
+        end
+      }
+      
       menu_item(label: 'Manual', underline: 0) {
         accelerator 'Command+Shift+M'
 
@@ -3088,6 +3283,7 @@ root { |r|
           message_box(parent: r, title: 'Manual', message: 'Manual Contents')
         end
       }
+      
       menu_item(label: 'Tutorial', underline: 0) {
         accelerator 'Command+Shift+T'
 
@@ -3095,7 +3291,9 @@ root { |r|
           message_box(parent: r, title: 'Tutorial', message: 'Tutorial Contents')
         end
       }
+      
       menu_item(:separator)
+      
       menu_item(label: 'Report an Issue...', underline: 0) {
         on('command') do
           message_box(parent: r, title: 'Report an Issue', message: 'Reporting an issue...')
@@ -3158,7 +3356,7 @@ https://github.com/ancorgs/y3network-ruby-ui
 
 ### CryptoPunks GUI
 
-This is a Graphical User Interface for the famous [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
+This is a Graphical User Interface for the [cryptopunks Ruby gem](https://github.com/cryptopunksnotdead/cryptopunks/tree/master/cryptopunks).
 
 https://github.com/cryptopunksnotdead/cryptopunks-gui
 

data/VERSION

@@ -1 +1 @@
-0.0.39
+0.0.40

data/lib/glimmer/tk/list_proxy.rb

@@ -20,11 +20,14 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/scrollable'
 
 module Glimmer
   module Tk
     # Custom list widget implementation
     class ListProxy < WidgetProxy
+      include Scrollable
+      
       def initialize(underscored_widget_name, parent_proxy, args)
         super('treeview', parent_proxy, args)
         @tk.show = 'tree'

data/lib/glimmer/tk/menu_item_proxy.rb

@@ -164,11 +164,11 @@ module Glimmer
       # configures menu item attribute through parent menu
       def configure_menu_item_attribute(attribute_value_hash)
         if preferences? && attribute_value_hash[:command]
-          ::Tk.ip_eval("proc ::tk::mac::ShowPreferences {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+          ::Tk.ip_eval("proc ::tk::mac::ShowPreferences {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}") if OS.mac?
         elsif help? && attribute_value_hash[:command]
-          ::Tk.ip_eval("proc ::tk::mac::ShowHelp {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+          ::Tk.ip_eval("proc ::tk::mac::ShowHelp {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}") if OS.mac?
         elsif quit? && attribute_value_hash[:command]
-          ::Tk.ip_eval("proc ::tk::mac::Quit {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}")
+          ::Tk.ip_eval("proc ::tk::mac::Quit {} {#{::Tk.install_cmd(attribute_value_hash[:command])}}") if OS.mac?
         else
           @parent_proxy.tk.entryconfigure label, attribute_value_hash
         end

data/lib/glimmer/tk/scrollable.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/tk/widget_proxy'
+
+module Glimmer
+  module Tk
+    # Represents widgets that can scroll vertically and horizontally
+    module Scrollable
+      def xscrollcommand_block=(proc)
+        tk.xscrollcommand(proc)
+      end
+      
+      def yscrollcommand_block=(proc)
+        tk.yscrollcommand(proc)
+      end
+      
+      def handle_listener(listener_name, &listener)
+        case listener_name.to_s.downcase
+        when 'xscrollcommand'
+          xscrollcommand(listener)
+        when 'yscrollcommand'
+          yscrollcommand(listener)
+        else
+          super
+        end
+      end
+    end
+  end
+end
+      

data/lib/glimmer/tk/scrollbar_proxy.rb

@@ -0,0 +1,31 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/commandable'
+
+module Glimmer
+  module Tk
+    class ScrollbarProxy < WidgetProxy
+      include Commandable
+    end
+  end
+end

data/lib/glimmer/tk/text_proxy.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/tk/widget_proxy'
+require 'glimmer/tk/scrollable'
 
 module Glimmer
   module Tk
@@ -27,6 +28,8 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class TextProxy < WidgetProxy
+      include Scrollable
+      
       ALL_TAG = '__all__'
       FORMAT_DEFAULT_MAP = {
         'justify' => 'left',

data/lib/glimmer/tk/widget_proxy.rb

@@ -46,10 +46,13 @@ module Glimmer
         # This supports widgets in and out of basic Tk
         def tk_widget_class_for(underscored_widget_name)
           tk_widget_class_basename = underscored_widget_name.camelcase(:upper)
+          # TODO consider exposing this via Glimmer::Config
           potential_tk_widget_class_names = [
             "::Tk::Tile::#{tk_widget_class_basename}",
-            "::Tk::#{tk_widget_class_basename}",
+            "::Tk::BWidget::#{tk_widget_class_basename}",
+            "::Tk::Iwidgets::#{tk_widget_class_basename}",
             "::Tk#{tk_widget_class_basename}",
+            "::Tk::#{tk_widget_class_basename}",
             "::Glimmer::Tk::#{tk_widget_class_basename}Proxy",
           ]
           tk_widget_class = nil
@@ -79,7 +82,7 @@ module Glimmer
         @block = block
         build_widget
         # a common widget initializer
-        @parent_proxy.post_initialize_child(self)
+        @parent_proxy&.post_initialize_child(self)
         initialize_defaults
         post_add_content if @block.nil?
       end
@@ -247,9 +250,12 @@ module Glimmer
         end
       end
       
+      def index_in_parent
+        @parent_proxy&.children&.index(self)
+      end
+        
       def grid(options = {})
         options = options.stringify_keys
-        index_in_parent = @parent_proxy&.children&.index(self)
         options['rowspan'] = options.delete('row_span') if options.keys.include?('row_span')
         options['columnspan'] = options.delete('column_span') if options.keys.include?('column_span')
         options['rowweight'] = options.delete('row_weight') if options.keys.include?('row_weight')
@@ -268,7 +274,7 @@ module Glimmer
           TkGrid.columnconfigure(@parent_proxy.tk, index_in_parent, 'weight'=> options.delete('columnweight')) if options.keys.include?('columnweight')
           TkGrid.columnconfigure(@parent_proxy.tk, index_in_parent, 'minsize'=> options.delete('columnminsize')) if options.keys.include?('columnminsize')
         end
-        @tk.grid(options)
+        griddable_tk&.grid(options)
       end
       
       def font=(value)
@@ -506,6 +512,11 @@ module Glimmer
       
       private
       
+      # The Tk element to apply grid to (is different from @tk in composite widgets like notebook or scrolledframe)
+      def griddable_tk
+        @tk
+      end
+      
       def build_widget
         tk_widget_class = self.class.tk_widget_class_for(@keyword)
         @tk = tk_widget_class.new(@parent_proxy.tk, *args)

data/lib/glimmer-dsl-tk.rb

@@ -27,6 +27,8 @@ require 'glimmer'
 require 'puts_debuggerer' if ENV['pd'].to_s.downcase == 'true'
 # require 'super_module'
 require 'tk'
+require 'tkextlib/bwidget'
+require 'tkextlib/iwidgets'
 require 'os'
 require 'facets/hash/symbolize_keys'
 require 'facets/string/underscore'
@@ -46,6 +48,8 @@ Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
   result ||= method == 'load_iseq'
 end
 
+Tk::Tile::Style.theme_use 'alt' if OS.linux?
+
 ::TkOption.add '*tearOff', 0
 
 class ::Tk::TkSysMenu_Window < Tk::Menu

data/samples/hello/hello_checkbutton.rb

@@ -1,4 +1,4 @@
-`# Copyright (c) 2020-2021 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/samples/hello/hello_menu_bar.rb

@@ -38,6 +38,7 @@ root { |r|
   }
   
   menu {
+    # Mac-specific application menu (right next to the Apple menu)
     if OS.mac?
       menu(:application) {
         menu_item(:about, label: 'About My Application') {
@@ -64,13 +65,14 @@ root { |r|
       }
     end
     
+    # Windows-specific system menu (to the top-left of the window frame)
     if OS.windows?
       menu(label: 'System')
     end
     
     menu(label: 'File', underline: 0) {
       menu_item(label: 'New', underline: 0) {
-        accelerator 'Command+N'
+        accelerator OS.mac? ? 'Command+N' : 'Control+N'
 
         on('command') do
           message_box(parent: r, title: 'New', message: 'New file created.')
@@ -78,7 +80,7 @@ root { |r|
       }
       
       menu_item(label: 'Open...', underline: 0) {
-        accelerator 'Command+O'
+        accelerator OS.mac? ? 'Command+O' : 'Control+O'
 
         on('command') do
           message_box(parent: r, title: 'Open', message: 'Opening File...')
@@ -110,15 +112,15 @@ root { |r|
     
     menu(label: 'Edit', underline: 0) {
       menu_item(label: 'Cut', underline: 2) {
-        accelerator 'Command+X'
+        accelerator OS.mac? ? 'Command+X' : 'Control+X'
       }
       
       menu_item(label: 'Copy', underline: 0) {
-        accelerator 'Command+C'
+        accelerator OS.mac? ? 'Command+C' : 'Control+C'
       }
       
       menu_item(label: 'Paste', underline: 0) {
-        accelerator 'Command+V'
+        accelerator OS.mac? ? 'Command+V' : 'Control+V'
       }
     }
     
@@ -130,7 +132,7 @@ root { |r|
         end
       }
       
-      @select_one_menu = menu(label: 'Select One', underline: 0) {
+      @select_one_menu = menu(label: 'Select One', underline: 7) {
         menu_item(:radiobutton, label: 'Option 1') {
           state 'disabled'
         }
@@ -142,7 +144,7 @@ root { |r|
         }
       }
       
-      @select_multiple_menu = menu(label: 'Select Multiple', underline: 0) {
+      @select_multiple_menu = menu(label: 'Select Multiple', underline: 7) {
         menu_item(:checkbutton, label: 'Option 4') {
           state 'disabled'
         }
@@ -164,7 +166,7 @@ root { |r|
       end
     }
     
-    menu(label: 'Language Name', underline: 3) {
+    menu(label: 'Country', underline: 3) {
       ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
         menu_item(:radiobutton, label: image_name.capitalize) {
           selection image_name == 'usa'
@@ -198,7 +200,7 @@ root { |r|
     
     menu(label: 'View', underline: 0) {
       menu_item(:radiobutton, label: 'Small', underline: 0) {
-        accelerator 'Command+S'
+        accelerator OS.mac? ? 'Command+S' : 'Control+S'
         
         on('command') do
           @label.font = {size: 25}
@@ -206,7 +208,7 @@ root { |r|
       }
       
       menu_item(:radiobutton, label: 'Medium', underline: 0) {
-        accelerator 'Command+M'
+        accelerator OS.mac? ? 'Command+M' : 'Control+M'
         selection true
 
         on('command') do
@@ -215,7 +217,7 @@ root { |r|
       }
       
       menu_item(:radiobutton, label: 'Large', underline: 0) {
-        accelerator 'Command+L'
+        accelerator OS.mac? ? 'Command+L' : 'Control+L'
         
         on('command') do
           @label.font = {size: 75}
@@ -223,17 +225,20 @@ root { |r|
       }
     }
     
-    menu(label: 'Window', underline: 0)
+    # Mac-specific window menu (containing zooming/resizing menu items)
+    menu(label: 'Window', underline: 0) if OS.mac?
     
     menu(label: 'Help', underline: 0) {
-      menu_item(:help) {
-        on('command') do
-          message_box(parent: r, title: 'Help', message: 'Help for my application.')
-        end
-      }
+      if OS.mac?
+        menu_item(:help) {
+          on('command') do
+            message_box(parent: r, title: 'Help', message: 'Help for my application.')
+          end
+        }
+      end
       
       menu_item(label: 'Manual', underline: 0) {
-        accelerator 'Command+Shift+M'
+        accelerator OS.mac? ? 'Command+Shift+M' : 'Control+U'
 
         on('command') do
           message_box(parent: r, title: 'Manual', message: 'Manual Contents')
@@ -241,7 +246,7 @@ root { |r|
       }
       
       menu_item(label: 'Tutorial', underline: 0) {
-        accelerator 'Command+Shift+T'
+        accelerator OS.mac? ? 'Command+Shift+T' : 'Control+T'
 
         on('command') do
           message_box(parent: r, title: 'Tutorial', message: 'Tutorial Contents')

data/samples/hello/hello_scrollbar.rb

@@ -0,0 +1,67 @@
+# Copyright (c) 2020-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-tk'
+
+include Glimmer
+
+root {
+  title 'Hello, Scrollbar!'
+  width 400
+  height 500
+  
+  notebook {
+    grid sticky: 'nsew', row_weight: 1, column_weight: 1
+    
+    frame(text: 'Scrollable List') {
+      @list = list {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        items 40.times.map {|n| "Item #{n + 1} of a very long list" }
+      }
+      
+      @scrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @list.yscrollbar @scrollbar
+    }
+    
+    frame(text: 'Scrollable Text') {
+      @text = text {
+        grid sticky: 'nsew', row: 0, column: 0, row_weight: 1, column_weight: 1
+        value ("This is a random sample of text that will repeat over and over and over"*2 + "\n")*40
+      }
+      
+      @yscrollbar = scrollbar {
+        grid row: 0, column: 1
+        # orient 'vertical' # default
+      }
+      @text.yscrollbar @yscrollbar
+       
+      @xscrollbar = scrollbar {
+        grid row: 1, column: 0, column_span: 2, row_weight: 0
+        orient 'horizontal'
+      }
+      @text.xscrollbar @xscrollbar
+    }
+  }
+  
+}.open

data/samples/hello/hello_text.rb

@@ -105,32 +105,32 @@ class HelloText
       height 800
       
       frame {
-        grid row: 0, column: 0
+        grid row: 0, column: 0, column_span: 2
         
         column_index = -1
         
         combobox { |cb|
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :font_family, after_write: ->(value) { @text.toggle_selection_font_format('family', value == FONT_FAMILY_PROMPT ? 'Courier New' : value, focus: 100) }]
+          text <=> [self, :font_family, after_write: ->(value) { @text.toggle_selection_font_format('family', value == FONT_FAMILY_PROMPT ? 'Courier New' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :font_size, after_write: ->(value) { @text.toggle_selection_font_format('size', value == FONT_SIZE_PROMPT ? 13 : value, focus: 100) }]
+          text <=> [self, :font_size, after_write: ->(value) { @text.toggle_selection_font_format('size', value == FONT_SIZE_PROMPT ? 13 : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :foreground, after_write: ->(value) { @text.add_selection_format('foreground', value == FOREGROUND_PROMPT ? 'black' : value, focus: 100) }]
+          text <=> [self, :foreground, after_write: ->(value) { @text.add_selection_format('foreground', value == FOREGROUND_PROMPT ? 'black' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         combobox {
           grid row: 1, column: column_index += 1, column_weight: 1
           readonly true
-          text <=> [self, :background, after_write: ->(value) { @text.add_selection_format('background', value == BACKGROUND_PROMPT ? 'white' : value, focus: 100) }]
+          text <=> [self, :background, after_write: ->(value) { @text.add_selection_format('background', value == BACKGROUND_PROMPT ? 'white' : value, focus: OS.mac? ? 100 : true) }]
         }
         
         separator {
@@ -282,7 +282,7 @@ class HelloText
       
       @text = text {
         grid row: 1, column: 0, row_weight: 1
-        wrap 'word'
+#         wrap 'word'
         undo true
         value <=> [self, :document]
         
@@ -303,6 +303,16 @@ class HelloText
           show_find_dialog if (event.keysym == 'f') && ((OS.mac? && event.state == 8) || (!OS.mac? && event.state == 4))
         end
       }
+      
+      @yscrollbar = y_scrollbar {
+        grid row: 1, column: 1
+      }
+      @text.yscrollbar @yscrollbar
+      
+      @xscrollbar = x_scrollbar {
+        grid row: 2, column: 0, column_span: 2, row_weight: 0
+      }
+      @text.xscrollbar @xscrollbar
     }
     @root.open
   end

data/samples/hello/hello_toplevel.rb

@@ -74,7 +74,7 @@ root { |root_window|
           
         frame {
           label {
-            text "This is a transparent window\nYou can hit ESCAPE to close."
+            text "This is a transparent window\n(Varies per platform)\nYou can hit ESCAPE to close."
             anchor 'center'
           }
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -240,6 +240,8 @@ files:
 - lib/glimmer/tk/notebook_proxy.rb
 - lib/glimmer/tk/radiobutton_proxy.rb
 - lib/glimmer/tk/root_proxy.rb
+- lib/glimmer/tk/scrollable.rb
+- lib/glimmer/tk/scrollbar_proxy.rb
 - lib/glimmer/tk/spinbox_proxy.rb
 - lib/glimmer/tk/text_proxy.rb
 - lib/glimmer/tk/text_variable_owner.rb
@@ -265,6 +267,7 @@ files:
 - samples/hello/hello_notebook.rb
 - samples/hello/hello_radiobutton.rb
 - samples/hello/hello_root.rb
+- samples/hello/hello_scrollbar.rb
 - samples/hello/hello_separator.rb
 - samples/hello/hello_spinbox.rb
 - samples/hello/hello_text.rb