glimmer-dsl-tk 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ce065d32aa469d1e55999bdcd730d0837110d6fb7cda8fd8992e297c9ed600
-  data.tar.gz: 48c7e0517d0135656c36698cee1d2ccf65c342aed1793c135766e860572dec6a
+  metadata.gz: fbb49ce9e435d0313cdec33a81afec3ad4d7716ee6e8363004651417d3535704
+  data.tar.gz: 9ad46f88ace884c5d670d2449728369af8510b95e24c291a3bda7580cef65820
 SHA512:
-  metadata.gz: 4f06cb1144383c64b489f58016c880c4fb82d506ce63f8dd1953448748017b9f3910c0d7792d926d5479bc89564a503639b406e3d62728a690e11ef8e81e3126
-  data.tar.gz: 2d6fa5b4cede272fd2aeec4a83a58cfd2dc8d59157692052b179d4ec91a1a7925061f20bf0dcc06160fb9d375ac493c5f75169106ea61878a011a8c5fec022f9
+  metadata.gz: d58a0179466efe9991f53eefb23c6dd3749c386230d70722e0a6c3f24c85f2affc361e18c21d65b34b2cb37269dfb8c7ceff9953a1bc5059f1db971051b0c4c8
+  data.tar.gz: bad07c9519d483534306b04be7e4d110fe302c6dc3f03028d85aa5c85fcfe01437c0471d58b49e3db013abc99d6f55535d5aefacc4bdc651df50b30ecda467e0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 0.0.42
+
+- Add vertical/horizontal scrollbars to Meta-Sample
+- Keep only vertical scrollbar in Hello, Text!
+- Fix issue with including bwidgets and iwidgets in Windows
+- Fix Hello, Menu Bar! sample in Windows (by disabling Windows-special System menu, which does not seem to be working in Tk)
+
 ## 0.0.41
 
 - Support `scrollbar_frame` Glimmer custom widget as a frame that automatically provides scrollbars when its content's size exceeds its size

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.41
+# [<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.42
 ## 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)
@@ -181,7 +181,7 @@ gem install glimmer-dsl-tk
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-tk', '~> 0.0.41'
+gem 'glimmer-dsl-tk', '0.0.42'
 ```
 
 And, then run:

data/VERSION

@@ -1 +1 @@
-0.0.41
+0.0.42

data/lib/glimmer/tk/menu_proxy.rb

@@ -71,8 +71,9 @@ module Glimmer
             @tk = ::TkSysMenu_Help.new(@parent_proxy.tk)
           elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.mac? && window?
             @tk = ::Tk::TkSysMenu_Window.new(@parent_proxy.tk)
-          elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.windows? && system?
-            @tk = ::TkSysMenu_System.new(@parent_proxy.tk)
+          # Windows system menu does not seem to work
+#           elsif @parent_proxy.parent_proxy.is_a?(ToplevelProxy) && OS.windows? && system?
+#             @tk = ::TkSysMenu_System.new(@parent_proxy.tk)
           else
             tk_widget_class = self.class.tk_widget_class_for(@keyword)
             @tk = tk_widget_class.new(@parent_proxy.tk)

data/lib/glimmer/tk/widget_proxy.rb

@@ -127,7 +127,7 @@ module Glimmer
       end
 
       def tk_widget_has_attribute_setter?(attribute)
-        return true if @tk.respond_to?(attribute)
+        return true if @tk.respond_to?(attribute) && attribute != 'focus' # TODO configure exceptions via constant if needed
         result = nil
         begin
           # TK Widget currently doesn't support respond_to? properly, so I have to resort to this trick for now
@@ -384,6 +384,7 @@ module Glimmer
               if observer.is_a?(Glimmer::DataBinding::ModelBinding)
                 model = observer.model
                 options_model_property = observer.property_name + '_options'
+                # TODO perform data-binding to values too
                 @tk.values = model.send(options_model_property) if model.respond_to?(options_model_property)
               end
               @tk.bind('<ComboboxSelected>') {

data/lib/glimmer-dsl-tk.rb

@@ -27,8 +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 'tkextlib/bwidget' # does not work on Windows
+#require 'tkextlib/iwidgets' # does not work on Windows
 require 'os'
 require 'facets/hash/symbolize_keys'
 require 'facets/string/underscore'

data/samples/elaborate/meta_sample.rb

@@ -130,6 +130,16 @@ class MetaSample
         grid row: 0, column: 1, column_weight: 1
         value File.read(file_path_for(selected_sample))
       }
+      
+      @yscrollbar = scrollbar {
+        grid row: 0, column: 2
+      }
+      @code_text.yscrollbar @yscrollbar
+      
+      @xscrollbar = scrollbar {
+        grid row: 1, column: 1, column_span: 2
+      }
+      @code_text.xscrollbar @xscrollbar
     }
     @root.open
   end

data/samples/hello/hello_menu_bar.rb

@@ -25,7 +25,7 @@ include Glimmer
 
 COLORS = [:white, :red, :yellow, :green, :blue, :magenta, :gray, :black]
 
-Tk::Tile::Style.theme_use "classic" # this enables setting background on label just for demo purposes
+Tk::Tile::Style.theme_use 'classic' if OS.mac? # this enables setting background on label just for demo purposes
 
 root { |r|
   title 'Hello, Menu Bar!'
@@ -65,11 +65,6 @@ 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 OS.mac? ? 'Command+N' : 'Control+N'
@@ -166,7 +161,7 @@ root { |r|
       end
     }
     
-    menu(label: 'Country', underline: 3) {
+    menu(label: 'Country', underline: 0) {
       ['denmark', 'finland', 'france', 'germany', 'italy', 'mexico', 'netherlands', 'norway', 'usa'].each do |image_name|
         menu_item(:radiobutton, label: image_name.capitalize) {
           selection image_name == 'usa'
@@ -176,7 +171,7 @@ root { |r|
       end
     }
     
-    menu(label: 'Format', underline: 0) {
+    menu(label: 'Format', underline: 3) {
       menu(label: 'Background Color', underline: 0) {
         COLORS.each { |color_style|
           menu_item(:radiobutton, label: color_style.to_s.split('_').map(&:capitalize).join(' ')) {

data/samples/hello/hello_text.rb

@@ -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]
         
@@ -304,15 +304,10 @@ class HelloText
         end
       }
       
-      @yscrollbar = y_scrollbar {
+      @yscrollbar = 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-tk
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: Glimmer DSL for Tk