gtk_paradise 0.12.25 → 0.13.33

data/lib/gtk_paradise/{gtk_classes → core_classes}/window.rb

@@ -4,7 +4,7 @@
 # =========================================================================== #
 # === Gtk::Window
 # =========================================================================== #
-# require 'gtk_paradise/gtk_classes/window.rb'
+# require 'gtk_paradise/core_classes/window.rb'
 # Gtk.popup_window
 # =========================================================================== #
 module Gtk
@@ -12,11 +12,13 @@ module Gtk
 class Window # === Gtk::Window
 
   require 'gtk_paradise/toplevel_methods/determine_which_gtk_version_is_in_use.rb'
+
   # ========================================================================= #
-  # Not sure if the next require is good here. Ideally we should not 
-  # require it here.
+  # === automatically_determine_the_title
   # ========================================================================= #
-  # require 'gtk_paradise/gtk_classes/widget.rb'
+  def automatically_determine_the_title(i = nil)
+    set_title(i)
+  end
 
   # ========================================================================= #
   # === xid_value?
@@ -74,12 +76,23 @@ end
   # Easier toplevel-method to instantiate a new ::Gtk::Window object.
   # ========================================================================= #
   def self.window(
-      i = :toplevel
+      i               = :toplevel,
+      optional_height = nil
     )
-    if use_gtk2?
-      i = ::Gtk::Window::TOPLEVEL
+    if optional_height.nil? and i.is_a?(Hash) and i.has_key?(:height)
+      optional_height = i.delete(:height)
     end
-    ::Gtk::Window.new(i)
+    if optional_height
+      window = ::Gtk::Window.new(:toplevel)
+      if i.is_a? Hash # Support syntax such as: (width: @width, height: @height)
+        optional_height = i.delete(:height) if i.has_key?(:height)
+        i               = i.delete(:width) 
+      end
+      window.set_size_request(i, optional_height) # We assume width and height were passed in this case.
+    else # This is the default entry point for this method.
+      window = ::Gtk::Window.new(i)
+    end
+    return window # And return it here.
   end
 
   # ========================================================================= #
@@ -92,11 +105,11 @@ end
   # ::Gtk::Window::POPUP.
   # ========================================================================= #
   def self.popup_window
-    if are_we_using_gtk2?
-      ::Gtk::Window.new(::Gtk::Window::POPUP).show_all
-    else
+    # if are_we_using_gtk2?
+    #   ::Gtk::Window.new(::Gtk::Window::POPUP).show_all
+    # else
       ::Gtk::Window.new(:popup).show_all
-    end
+    # end
   end
 
 end

data/lib/gtk_paradise/drawing/README.md

@@ -1,3 +1,3 @@
-This directory (and the code in this directory) is experimental
-as of August 2022. We may have to relocate the code into other
+This directory (and the code in this directory) is experimental as
+of August 2022. We may have to relocate the code into other
 directories at a later time.

data/lib/gtk_paradise/drawing/drawing.rb

@@ -6,11 +6,13 @@
 # =========================================================================== #
 # require 'gtk_paradise/drawing/drawing.rb'
 # =========================================================================== #
+module Gtk
+
 module Drawing
 
   require 'matrix'
-  require 'gtk2'
-  require 'gtk_paradise/gtk_classes/window.rb'
+  # require 'gtk2'
+  require 'gtk_paradise/core_classes/window.rb'
 
   # ========================================================================= #
   # Load up the rest of the Drawing-related code:
@@ -30,7 +32,7 @@ module Drawing
   W = ::Gtk::Window.new
 
   # ========================================================================= #
-  # === Drawing.app
+  # === Gtk::Drawing.app
   #
   # This will instantiate a new gtk-application.
   #
@@ -65,4 +67,4 @@ module Drawing
     Gtk.main
   end
 
-end
+end; end

data/lib/gtk_paradise/drawing/event.rb

@@ -2,15 +2,17 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
-# === Drawing::Event
+# === Gtk::Drawing::Event
 # =========================================================================== #
 # require 'gtk_paradise/drawing/event.rb'
 # =========================================================================== #
-require 'gtk_paradise/drawing/tool.rb'
+module Gtk
 
 module Drawing
- 
-class Event < Tool # === Drawing::Event
+
+require 'gtk_paradise/drawing/tool.rb'
+
+class Event < Tool # === Gtk::Drawing::Event
 
   # ========================================================================= #
   # === initialize
@@ -70,4 +72,4 @@ class Event < Tool # === Drawing::Event
     }
   end
 
-end; end
+end; end; end

data/lib/gtk_paradise/drawing/star.rb

@@ -2,15 +2,17 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
-# === Drawing::Star
+# === Gtk::Drawing::Star
 # =========================================================================== #
 # require 'gtk_paradise/drawing/star.rb'
 # =========================================================================== #
-require 'gtk_paradise/drawing/tool.rb'
+module Gtk
 
 module Drawing
 
-class Star < Tool # === Drawing::Star
+require 'gtk_paradise/drawing/tool.rb'
+
+class Star < Tool # === Gtk::Drawing::Star
 
   require 'matrix'
   include Math
@@ -37,20 +39,20 @@ class Star < Tool # === Drawing::Star
       y2,
       color
     )
+    reset
     @fill = fill
-    @o = []
-    @a = []
-    @b = []
     @o[0] = x1
     @o[1] = y1
     @a[0] = Vector[x2 - x1, y1 - y2]
     θ = PI / 5
     rt1 = Matrix[
       [
-        cos(θ), -sin(θ)
+        cos(θ),
+       -sin(θ)
       ],
       [
-        sin(θ), cos(θ)
+        sin(θ),
+        cos(θ)
       ]
     ]
     rt2 = rt1 * rt1
@@ -62,6 +64,15 @@ class Star < Tool # === Drawing::Star
     @color = color
   end
 
+  # ========================================================================= #
+  # === reset                                                     (reset tag)
+  # ========================================================================= #
+  def reset
+    @o = []
+    @a = []
+    @b = []
+  end
+
   # ========================================================================= #
   # === draw_triangle
   # ========================================================================= #
@@ -93,4 +104,4 @@ class Star < Tool # === Drawing::Star
     end
   end
 
-end; end
+end; end; end

data/lib/gtk_paradise/drawing/tool.rb

@@ -6,6 +6,8 @@
 # =========================================================================== #
 # require 'gtk_paradise/drawing/tool.rb'
 # =========================================================================== #
+module Gtk
+
 module Drawing
 
 class Tool # === Drawing::Tool
@@ -265,4 +267,4 @@ class Tool # === Drawing::Tool
     @height = i
   end; alias height= set_height # === height=
 
-end; end
+end; end; end

data/lib/gtk_paradise/drawing/turtle.rb

@@ -2,10 +2,12 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
-# === Drawing::Turtle
+# === Gtk::Drawing::Turtle
 # =========================================================================== #
 # require 'gtk_paradise/drawing/turtle.rb'
 # =========================================================================== #
+module Gtk
+
 module Drawing
 
 require 'gtk_paradise/drawing/tool.rb'
@@ -135,4 +137,4 @@ class Turtle < Tool
      @pen_po = Vector[x, y]
   end
 
-end; end
+end; end; end