wxruby3-shapes 0.9.0.pre.beta.3 → 0.9.6

data/lib/wx/shapes/shapes/manager_shape.rb

@@ -0,0 +1,77 @@
+# Wx::SF::ContainerShape - container shape mixin
+# Copyright (c) M.J.N. Corino, The Netherlands
+
+module Wx::SF
+
+  # Mixin for container shape classes that control there child shape size/position/alignment.
+  module ManagerShape
+
+    # Returns true if the shape manages (size/position/alignment) of it's child shapes.
+    # @return [Boolean] true
+    def is_manager
+      true
+    end
+    alias :manager? :is_manager
+
+    # Update the shape's position in order to its alignment
+    def do_alignment
+      super
+
+      # do alignment of shape's children
+      do_children_layout
+    end
+
+    protected
+
+    def do_children_layout
+      raise NotImplementedError, 'Manager shapes need override'
+    end
+
+    # Move and resize given shape so it will fit the given bounding rectangle.
+    #
+    # The shape is aligned inside the given bounding rectangle in accordance to the shape's
+    # valign and halign flags.
+    # @param [Shape] shape modified shape
+    # @param [Wx::Rect] rct Bounding rectangle
+    # @see Shape#set_v_align
+    # @see Shape#set_h_align
+    def fit_shape_to_rect(shape, rct)
+      shape_bb = shape.get_bounding_box
+      prev_pos = shape.get_relative_position
+
+      # do vertical alignment
+      case shape.get_v_align
+      when Shape::VALIGN::TOP
+        shape.set_relative_position(prev_pos.x, rct.top + shape.get_v_border)
+      when Shape::VALIGN::MIDDLE
+        shape.set_relative_position(prev_pos.x, rct.top + (rct.height/2 - shape_bb.height/2))
+      when Shape::VALIGN::BOTTOM
+        shape.set_relative_position(prev_pos.x, rct.bottom - shape_bb.height - shape.get_v_border)
+      when Shape::VALIGN::EXPAND
+        shape.set_relative_position(prev_pos.x, rct.top + shape.get_v_border)
+        shape.scale(1.0, (rct.height - 2*shape.get_v_border).to_f/shape_bb.height)
+      else
+        shape.set_relative_position(prev_pos.x, rct.top)
+      end
+
+      prev_pos = shape.get_relative_position
+
+      # do horizontal alignment
+      case shape.get_h_align
+      when Shape::HALIGN::LEFT
+        shape.set_relative_position(rct.left + shape.get_h_border, prev_pos.y)
+      when Shape::HALIGN::CENTER
+        shape.set_relative_position(rct.left + (rct.width/2 - shape_bb.width/2), prev_pos.y)
+      when Shape::HALIGN::RIGHT
+        shape.set_relative_position(rct.right - shape_bb.width - shape.get_h_border, prev_pos.y)
+      when Shape::HALIGN::EXPAND
+        shape.set_relative_position(rct.left + shape.get_h_border, prev_pos.y)
+        shape.scale((rct.width - 2*shape.get_h_border).to_f/shape_bb.width, 1.0)
+      else
+        shape.set_relative_position(rct.left, prev_pos.y)
+      end
+    end
+
+  end
+
+end

data/lib/wx/shapes/shapes/multi_sel_rect.rb

@@ -60,7 +60,7 @@ module Wx::SF
         lst_selection.each do |shape|
           # scale main parent shape
           if !shape.is_a?(LineShape)
-            shape.scale(sx, 1, WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
+            shape.scale(sx, 1, children: WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
             if shape.has_style?(STYLE::POSITION_CHANGE)
               dx = (shape.get_absolute_position.x - (get_absolute_position.x + DEFAULT_ME_OFFSET))/(get_rect_size.x - 2*DEFAULT_ME_OFFSET)*handle.get_delta.x
               shape.move_by(dx, 0)
@@ -90,7 +90,7 @@ module Wx::SF
     
         lst_selection.each do |shape|
           if !shape.is_a?(LineShape)
-            if shape.has_style?(STYLE:POSITION_CHANGE)
+            if shape.has_style?(STYLE::POSITION_CHANGE)
               if shape.get_parent_shape
                 shape.set_relative_position(shape.get_relative_position.x*sx, shape.get_relative_position.y)
               else
@@ -98,7 +98,7 @@ module Wx::SF
                 shape.move_by(dx, 0)
               end
             end
-            shape.scale(sx, 1, WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
+            shape.scale(sx, 1, children: WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
             shape.fit_to_children unless shape.has_style?(STYLE::NO_FIT_TO_CHILDREN)
           else
             if shape.has_style?(STYLE::POSITION_CHANGE)
@@ -132,7 +132,7 @@ module Wx::SF
                 shape.move_by(0, dy)
               end
             end
-            shape.scale(1, sy, WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
+            shape.scale(1, sy, children: WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
             shape.fit_to_children unless shape.has_style?(STYLE::NO_FIT_TO_CHILDREN)
           else
             if shape.has_style?(STYLE::POSITION_CHANGE)
@@ -153,12 +153,12 @@ module Wx::SF
     def on_bottom_handle(handle)
       if get_parent_canvas && !any_height_exceeded(handle.get_delta)
         sy = (get_rect_size.y - 2*DEFAULT_ME_OFFSET + handle.get_delta.y).to_f/(get_rect_size.y - 2*DEFAULT_ME_OFFSET)
-    
+
         lst_selection = get_parent_canvas.get_selected_shapes
     
         lst_selection.each do |shape|
           if !shape.is_a?(LineShape)
-            shape.scale(1, sy, WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
+            shape.scale(1, sy, children: WITHCHILDREN) if shape.has_style?(STYLE::SIZE_CHANGE)
             if shape.has_style?(STYLE::POSITION_CHANGE)
               dy = (shape.get_absolute_position.y - (get_absolute_position.y + DEFAULT_ME_OFFSET))/(get_rect_size.y - 2*DEFAULT_ME_OFFSET)*handle.get_delta.y
               shape.move_by(0, dy)
@@ -187,7 +187,7 @@ module Wx::SF
         lst_selection = get_parent_canvas.get_selected_shapes
         # determine whether any shape in the selection exceeds its bounds
         lst_selection.each do |shape|
-          return true if !shape.is_a?(LineShape) && (shape.get_bounding_box.width + delta.x) <= 1
+          return true if !shape.is_a?(LineShape) && (shape.get_bounding_box.width + delta.x) < 1
         end
         return false
       end
@@ -202,7 +202,7 @@ module Wx::SF
         lst_selection = get_parent_canvas.get_selected_shapes
         # determine whether any shape in the selection exceeds its bounds
         lst_selection.each do |shape|
-          return true if !shape.is_a?(LineShape) && (shape.get_bounding_box.height + delta.y) <= 1
+          return true if !shape.is_a?(LineShape) && (shape.get_bounding_box.height + delta.y) < 1
         end
         return false
       end

data/lib/wx/shapes/shapes/ortho_shape.rb

@@ -11,14 +11,12 @@ module Wx::SF
 
     SEGMENTCPS = ::Struct.new(:src, :trg)
 
-    # @overload initialize()
-    #   default constructor
-    # @overload initialize(src, trg, path, manager)
-    #   @param [Wx::SF::Serializable::ID] src ID of the source shape
-    #   @param [Wx::SF::Serializable::ID] trg ID of the target shape
-    #   @param [Array<Wx::RealPoint>] path List of the line control points (can be empty)
-    #   @param [Diagram] diagram containing diagram
-    def initialize(*args)
+    # Constructor
+    # @param [Shape] src source shape
+    # @param [Shape] trg target shape
+    # @param [Array<Wx::RealPoint>] path List of the line control points (can be empty)
+    # @param [Diagram] diagram containing diagram
+    def initialize(src = nil, trg = nil, path: nil, diagram: nil)
       super
     end
 
@@ -31,33 +29,33 @@ module Wx::SF
   
       src = trg = cp_src = cp_trg = nil
     
-      shape = @diagram.find_shape(@src_shape_id)
-      if shape
-        cp_src = shape.get_nearest_connection_point(get_mod_src_point)
+      if @src_shape
+        cp_src = @src_shape.get_nearest_connection_point(get_mod_src_point)
       end
-      shape = @diagram.find_shape(@trg_shape_id)
-      if shape
-        cp_trg = shape.get_nearest_connection_point(get_mod_trg_point)
+      if @trg_shape
+        cp_trg = @trg_shape.get_nearest_connection_point(get_mod_trg_point)
       end
   
       case @mode
       when LINEMODE::READY
         # draw basic line parts
-        line_segment_count.times do |i|
+        n = line_segment_count-1
+        (0..n).each do |i|
           src, trg = get_line_segment(i)
+          # at starting (src) segment draw src arrow and get updated arrow connection point
+          if i == 0 && @src_arrow
+            asrc, atrg = get_first_subsegment(src, trg, get_used_connection_points(cp_src, cp_trg, 0))
+            src = @src_arrow.draw(atrg, asrc, dc)
+            cp_src = nil
+          end
+          # at end (tgt) segment draw tgt arrow and get updated connection point
+          if i == n && @trg_arrow
+            asrc, atrg = get_last_subsegment(src, trg, get_used_connection_points(cp_src, cp_trg, @lst_points.size))
+            trg = @trg_arrow.draw(asrc, atrg, dc)
+            cp_trg = nil
+          end
           draw_line_segment(dc, src, trg, get_used_connection_points(cp_src, cp_trg, i))
         end
-        # draw target arrow
-        if @trg_arrow
-          asrc, atrg = get_last_subsegment(src, trg, get_used_connection_points(cp_src, cp_trg, @lst_points.size))
-          @trg_arrow.draw(asrc, atrg, dc)
-        end
-        # draw source arrow
-        if @src_arrow
-          src, trg = get_line_segment(0)
-          asrc, atrg = get_first_subsegment(src, trg, get_used_connection_points(cp_src, cp_trg, 0))
-          @src_arrow.draw(atrg, asrc, dc)
-        end
 
       when LINEMODE::UNDERCONSTRUCTION
         # draw basic line parts
@@ -71,11 +69,10 @@ module Wx::SF
           if @lst_points.size>1
             draw_line_segment(dc, trg, @unfinished_point.to_real, get_used_connection_points(cp_src, cp_trg, @lst_points.size))
           else
-            src_shape = @diagram.find_shape(@src_shape_id)
-            if src_shape
-              if src_shape.get_connection_points.empty?
+            if @src_shape
+              if @src_shape.get_connection_points.empty?
                 draw_line_segment(dc,
-                                  src_shape.get_border_point(src_shape.get_center, @unfinished_point.to_real),
+                                  @src_shape.get_border_point(@src_shape.get_center, @unfinished_point.to_real),
                                   @unfinished_point.to_real,
                                   get_used_connection_points(cp_src, cp_trg, 0))
               else
@@ -133,13 +130,11 @@ module Wx::SF
       cp_src = nil
       cp_trg = nil
 
-      shape = @diagram.find_shape(@src_shape_id)
-      if shape
-        cp_src = shape.get_nearest_connection_point(get_mod_src_point)
+      if @src_shape
+        cp_src = @src_shape.get_nearest_connection_point(get_mod_src_point)
       end
-      shape = @diagram.find_shape(@trg_shape_id)
-      if shape
-        cp_trg = shape.get_nearest_connection_point(get_mod_trg_point)
+      if @trg_shape
+        cp_trg = @trg_shape.get_nearest_connection_point(get_mod_trg_point)
       end
 
       # Get all polyline segments

data/lib/wx/shapes/shapes/polygon_shape.rb

@@ -19,23 +19,14 @@ module Wx::SF
 
     property :connect_to_vertex, :vertices
 
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, size, diagram)
-    #   User constructor.
-    #   @param [Array<Wx::RealPoint>] pts Array of the polygon vertices
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [Array<Wx::RealPoint>] vertices Array of the polygon vertices
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, vertices: [], diagram: nil)
+      super(pos, Wx::RealPoint.new(1,1), diagram: diagram)
       @connect_to_vertex = DEFAULT::VERTEXCONNECTIONS
-      @vertices = []
-      if args.empty?
-        super
-      else
-        pts, pos, diagram = args
-        super(pos,Wx::RealPoint.new(1,1), diagram)
-        set_vertices(pts)
-      end
+      set_vertices(vertices)
     end
 
     # Set connecting mode.
@@ -104,8 +95,9 @@ module Wx::SF
         intersection
       else
         success = false
+        min_dist = 0.0
         pts.each_with_index do |pt, i|
-          if tmp_intersection = Wx::SF::Shape.lines_intersection(pt, pts[(i+1) % pts.size], start, end_pt)
+          if (tmp_intersection = Wx::SF::Shape.lines_intersection(pt, pts[(i+1) % pts.size], start, end_pt))
             if !success
               min_dist = intersection.distance_to(end_pt)
               intersection = tmp_intersection
@@ -166,12 +158,14 @@ module Wx::SF
     def fit_vertices_to_bounding_box
       minx, miny, maxx, maxy = get_extents
 
-      sx = rect_size.x/(maxx - minx)
-      sy = rect_size.y/(maxy - miny)
+      width = (maxx - minx)
+      height = (maxy - miny)
+      sx = rect_size.x/width
+      sy = rect_size.y/height
 
       @vertices.each do |pt|
-        pt.x *= sx
-        pt.y *= sy
+        pt.x = (width != 0.0) ? pt.x*sx : minx
+        pt.y = (height != 0.0) ? pt.y*sy : miny
       end
     end
 
@@ -227,8 +221,8 @@ module Wx::SF
     def draw_normal(dc)
       # HINT: overload it for custom actions...
 
-      dc.with_pen(@border) do
-        dc.with_brush(@fill) do
+      dc.with_pen(border) do
+        dc.with_brush(fill) do
           draw_polygon_shape(dc)
         end
       end
@@ -241,7 +235,7 @@ module Wx::SF
       # HINT: overload it for custom actions...
 
       dc.with_pen(Wx::Pen.new(get_hover_colour, 1)) do
-        dc.with_brush(@fill) do
+        dc.with_brush(fill) do
           draw_polygon_shape(dc)
         end
       end
@@ -255,7 +249,7 @@ module Wx::SF
       # HINT: overload it for custom actions...
 
       dc.with_pen(Wx::Pen.new(get_hover_colour, 2)) do
-        dc.with_brush(@fill) do
+        dc.with_brush(fill) do
           draw_polygon_shape(dc)
         end
       end
@@ -266,7 +260,7 @@ module Wx::SF
     def draw_shadow(dc)
       # HINT: overload it for custom actions...
 
-      if @fill.get_style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
+      if fill.get_style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
         dc.with_pen(Wx::TRANSPARENT_PEN) do
           dc.with_brush(get_parent_canvas.get_shadow_fill) do
             offset = get_parent_canvas.get_shadow_offset
@@ -280,15 +274,15 @@ module Wx::SF
     end
 
     # Deserialize attributes and recalculate rectangle size afterwards.
-    # @param [Hash] data
     # @return [self]
-    def from_serialized(data)
-      super
+    def deserialize_finalize
       normalize_vertices
       fit_vertices_to_bounding_box
       self
     end
 
+    define_deserialize_finalizer :deserialize_finalize
+
   end
 
 end

data/lib/wx/shapes/shapes/rect_shape.rb

@@ -7,64 +7,76 @@ module Wx::SF
 
     # default values
     module DEFAULT
+      class << self
+        # Default value of RectShape fill data member.
+        def fill; fill ||= Wx::WHITE_BRUSH.dup; end
+        # Default value of RectShape @border data member.
+        def border; @border ||= Wx::BLACK_PEN.dup; end
+      end
       # Default value of RectShape @rect_size data member.
       SIZE = Wx::RealPoint.new(100, 50)
-      # Default value of RectShape @fill data member.
-      FILL = Wx::Brush.new(Wx::WHITE) if Wx::App.is_main_loop_running
-      Wx.add_delayed_constant(self, :FILL) { Wx::Brush.new(Wx::WHITE) }
-      # Default value of RectShape @border data member.
-      BORDER = Wx::Pen.new(Wx::BLACK) if Wx::App.is_main_loop_running
-      Wx.add_delayed_constant(self, :BORDER) { Wx::Pen.new(Wx::BLACK) }
     end
 
-    property :rect_size, :fill, :border
-
-    # @overload initialize()
-    #   Default constructor.
-    # @overload initialize(pos, size, diagram)
-    #   User constructor.
-    #   @param [Wx::RealPoint] pos Initial position
-    #   @param [Wx::RealPoint] size Initial size
-    #   @param [Wx::SF::Diagram] diagram parent diagram
-    def initialize(*args)
-      size = nil
-      if args.empty?
-        super
-      else
-        pos, size, diagram = args
-        super(pos, diagram)
-      end
-      @rect_size = size ? size.to_real_point : DEFAULT::SIZE.dup
-      @fill = DEFAULT::FILL
-      @border = DEFAULT::BORDER
-      @prev_size = @prev_position = Wx::RealPoint
+    property rect_size: :serialize_rect_size
+    property({ fill: :serialize_rect_fill,
+               border: :serialize_rect_border },
+             optional: true)
+
+    # Constructor.
+    # @param [Wx::RealPoint,Wx::Point] pos Initial position
+    # @param [Wx::RealPoint,Wx::Size,Wx::Point,Array(Float,Float)] size Initial size
+    # @param [Wx::SF::Diagram] diagram parent diagram
+    def initialize(pos = Shape::DEFAULT::POSITION, size = DEFAULT::SIZE, diagram: nil)
+      super(pos, diagram: diagram)
+      set_rect_size(size.to_real_point)
+      @fill = nil
+      @border = nil
     end
 
     # Set rectangle's fill style.
-    # @param [Wx::Brush] brush Reference to a brush object
-    def set_fill(brush)
-      @fill = brush
+    # @overload set_fill(brush)
+    #   @param [Wx::Brush] brush
+    # @overload set_fill(color, style=Wx::BrushStyle::BRUSHSTYLE_SOLID)
+    #   @param [Wx::Colour,Symbol,String] color brush color
+    #   @param [Wx::BrushStyle] style
+    # @overload set_fill(stipple_bitmap)
+    #   @param [Wx::Bitmap] stipple_bitmap
+    def set_fill(*args)
+      @fill = if args.size == 1 && Wx::Brush === args.first
+                args.first
+              else
+                Wx::Brush.new(*args)
+              end
     end
     alias :fill= :set_fill
 
     # Get current fill style.
     # @return [Wx::Brush] Current brush
     def get_fill
-      @fill
+      @fill || (@diagram&.shape_canvas ? @diagram.shape_canvas.fill_brush : DEFAULT.fill)
     end
     alias :fill :get_fill
 
     # Set rectangle's border style.
-    # @param [Wx::Pen] pen Reference to a pen object
-    def set_border(pen)
-      @border = pen
+    # @overload set_border(pen)
+    #   @param [Wx::Pen] pen
+    # @overload set_border(color, width=1, style=Wx::PenStyle::PENSTYLE_SOLID)
+    #   @param [Wx::Colour,String,Symbol] color
+    #   @param [Integer] width
+    #   @param [Wx::PenStyle] style
+    def set_border(*args)
+      @border = if args.size == 1 && Wx::Pen === args.first
+                  args.first
+                else
+                  Wx::Pen.new(*args)
+                end
     end
     alias :border= :set_border
 
     # Get current border style.
     # @return [Wx::Pen] Current pen
     def get_border
-      @border
+      @border || (@diagram&.shape_canvas ? @diagram.shape_canvas.border_pen : DEFAULT.border)
     end
     alias :border :get_border
 
@@ -73,9 +85,11 @@ module Wx::SF
     #   @param [Float] x Horizontal size
     #   @param [Float] y Vertical size
     # @overload set_rect_size(size)
-    #   @param [Wx::RealPoint] size New size
-    def set_rect_size(arg1, arg2 = nil)
-      @rect_size = arg2 ? Wx::RealPoint.new(arg1.to_f, arg2.to_f) : arg1.to_real_point
+    #   @param [Wx::RealPoint,Array(Float, Float)] size New size
+    def set_rect_size(*args)
+      x, y = args.size == 1 ? args.first.to_real_point : args
+      # set new size while preventing 'invisible' shapes
+      @rect_size = Wx::RealPoint.new([1.0, x].max, [1.0, y].max)
     end
     alias :rect_size= :set_rect_size
 
@@ -163,7 +177,7 @@ module Wx::SF
     def fit_to_children
       # HINT: overload it for custom actions...
   
-      # get bounding box of the shape and children set be inside it
+      # get bounding box of the shape and children set to be inside it
       ch_bb = get_bounding_box
       shp_bb = ch_bb.dup
     
@@ -183,7 +197,7 @@ module Wx::SF
           move_to(shp_bb.get_position.x, shp_bb.get_position.y)
           @rect_size = Wx::RealPoint.new(shp_bb.get_size.x.to_f, shp_bb.get_size.y.to_f)
           if has_style?(STYLE::EMIT_EVENTS)
-            evt = ShapeEvent.new(EVT_SF_SHAPE_SIZE_CHANGED, id)
+            evt = ShapeEvent.new(EVT_SF_SHAPE_SIZE_CHANGED, self.object_id)
             evt.set_shape(self)
             get_parent_canvas.get_event_handler.process_event(evt)
           end
@@ -200,11 +214,11 @@ module Wx::SF
     end
 
     # Scale the shape size by in both directions. The function can be overridden if necessary
-    # (new implementation should call default one ore scale shape's children manualy if neccesary).
+    # (new implementation should call default one ore scale shape's children manually if necessary).
     # @param [Float] x Horizontal scale factor
     # @param [Float] y Vertical scale factor
     # @param [Boolean] children true if the shape's children should be scaled as well, otherwise the shape will be updated after scaling via update() function.
-    def scale(x, y, children = WITHCHILDREN)
+    def scale(x, y, children: WITHCHILDREN)
       # HINT: overload it for custom actions...
       if x > 0 && y > 0
         scale_rectangle(x, y)
@@ -218,8 +232,7 @@ module Wx::SF
 
     # Handle action at handle drag beginning
     def do_begin_handle
-      @prev_position = @relative_position.dup
-      @prev_size = @rect_size.dup
+      # noop
     end
 
     # Scale the rectangle size for this shape.
@@ -270,8 +283,8 @@ module Wx::SF
     def draw_normal(dc)
       # HINT: overload it for custom actions...
 
-      dc.with_pen(@border) do
-        dc.with_brush(@fill) do
+      dc.with_pen(border) do
+        dc.with_brush(fill) do
           dc.draw_rectangle(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -283,8 +296,8 @@ module Wx::SF
     def draw_hover(dc)
       # HINT: overload it for custom actions...
 
-      dc.with_pen(Wx::Pen.new(@hover_color, 1)) do
-        dc.with_brush(@fill) do
+      dc.with_pen(Wx::Pen.new(hover_colour, 1)) do
+        dc.with_brush(fill) do
           dc.draw_rectangle(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -297,8 +310,8 @@ module Wx::SF
     def draw_highlighted(dc)
       # HINT: overload it for custom actions...
 
-      dc.with_pen(Wx::Pen.new(@hover_color, 2)) do
-        dc.with_brush(@fill) do
+      dc.with_pen(Wx::Pen.new(hover_colour, 2)) do
+        dc.with_brush(fill) do
           dc.draw_rectangle(get_absolute_position.to_point, @rect_size.to_size)
         end
       end
@@ -309,7 +322,7 @@ module Wx::SF
     def draw_shadow(dc)
       # HINT: overload it for custom actions...
 
-      if @fill.style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
+      if fill.style != Wx::BrushStyle::BRUSHSTYLE_TRANSPARENT
         dc.with_pen(Wx::TRANSPARENT_PEN) do
           dc.with_brush(get_parent_canvas.get_shadow_fill) do
             dc.draw_rectangle((get_absolute_position + get_parent_canvas.get_shadow_offset).to_point, @rect_size.to_size)
@@ -325,6 +338,7 @@ module Wx::SF
       # HINT: overload it for custom actions...
 
       @rect_size.x += handle.get_delta.x
+      @rect_size.x = 1.0 if @rect_size.x < 1.0
     end
 
     # Event handler called during dragging of the left shape handle.
@@ -334,7 +348,11 @@ module Wx::SF
       # HINT: overload it for custom actions...
   
       dx = handle.get_delta.x.to_f
-    
+
+      if (@rect_size.x - dx) < 1.0
+        dx = @rect_size.x - 1.0
+      end
+
       # update position of children
       unless has_style?(STYLE::LOCK_CHILDREN)
         @child_shapes.each do |child|
@@ -353,7 +371,11 @@ module Wx::SF
       # HINT: overload it for custom actions...
   
       dy = handle.get_delta.y.to_f
-    
+
+      if (@rect_size.y - dy) < 1.0
+        dy = @rect_size.y - 1.0
+      end
+
       # update position of children
       unless has_style?(STYLE::LOCK_CHILDREN)
         @child_shapes.each do |child|
@@ -372,7 +394,27 @@ module Wx::SF
       # HINT: overload it for custom actions...
 
       @rect_size.y += handle.get_delta.y
+      @rect_size.y = 1.0 if @rect_size.y < 1.0
+    end
+
+    def serialize_rect_size(*val)
+      @rect_size = val.first unless val.empty?
+      @rect_size
     end
+    private :serialize_rect_size
+
+    def serialize_rect_fill(*val)
+      @fill = val.first unless val.empty?
+      @fill
+    end
+    private :serialize_rect_fill
+
+    def serialize_rect_border(*val)
+      @border = val.first unless val.empty?
+      @border
+    end
+    private :serialize_rect_border
+
   end
 
 end

data/lib/wx/shapes/shapes/round_ortho_shape.rb

@@ -13,14 +13,12 @@ module Wx::SF
 
     property :max_radius
 
-    # @overload initialize()
-    #   default constructor
-    # @overload initialize(src, trg, path, manager)
-    #   @param [Wx::SF::Serializable::ID] src ID of the source shape
-    #   @param [Wx::SF::Serializable::ID] trg ID of the target shape
-    #   @param [Array<Wx::RealPoint>] path List of the line control points (can be empty)
-    #   @param [Diagram] diagram containing diagram
-    def initialize(*args)
+    # Constructor
+    # @param [Shape] src source shape
+    # @param [Shape] trg target shape
+    # @param [Array<Wx::RealPoint>] path List of the line control points (can be empty)
+    # @param [Diagram] diagram containing diagram
+    def initialize(src = nil, trg = nil, path: nil, diagram: nil)
       super
       @max_radius = MAX_RADIUS
     end