shoes-swt 4.0.0.pre3 → 4.0.0.pre4

data/lib/shoes/swt/list_box.rb

@@ -25,10 +25,14 @@ class Shoes
           @dsl.call_change_listeners
         end
         update_items
+
+        # Set initial selection without triggering callbacks!
+        choice = @dsl.style[:choose]
+        @real.text = choice if choice
       end
 
       def update_items
-        @real.items = @dsl.items.map(&:to_s)
+        @real.items = @dsl.items.to_a.map(&:to_s)
       end
 
       def text
@@ -38,6 +42,7 @@ class Shoes
 
       def choose(item)
         @real.text = item
+        @dsl.call_change_listeners
       end
 
       def enabled(value)

data/lib/shoes/swt/progress.rb

@@ -5,9 +5,10 @@ class Shoes
       include Common::Remove
       include Common::Visibility
       include Common::UpdatePosition
+      include DisposedProtection
       include ::Shoes::BackendDimensionsDelegations
 
-      attr_reader :parent, :real, :dsl
+      attr_reader :parent, :dsl
 
       def initialize(dsl, parent)
         @dsl = dsl
@@ -15,20 +16,20 @@ class Shoes
 
         @real = ::Swt::Widgets::ProgressBar.new(@parent.real,
                                                 ::Swt::SWT::SMOOTH)
-        @real.minimum = 0
-        @real.maximum = 100
+        real.minimum = 0
+        real.maximum = 100
 
         if @dsl.element_width && @dsl.element_height
-          @real.setSize dsl.element_width, dsl.element_height
+          real.setSize dsl.element_width, dsl.element_height
         else
-          @real.pack
-          @dsl.element_width  = @real.size.x
-          @dsl.element_height = @real.size.y
+          real.pack
+          @dsl.element_width  = real.size.x
+          @dsl.element_height = real.size.y
         end
       end
 
       def fraction=(value)
-        @real.selection = (value * 100).to_i unless @real.disposed?
+        real.selection = (value * 100).to_i
       end
     end
   end

data/lib/shoes/swt/redrawing_aspect.rb

@@ -25,7 +25,7 @@ class Shoes
 
       # These need to trigger a redraw
       SAME_POSITION    = { Common::Visibility      => [:update_visibility],
-                           Image                   => [:update_image],
+                           Image                   => [:create_image],
                            ::Shoes::Common::Style  => [:update_style],
                            ::Shoes::Common::Remove => [:remove],
                            ::Shoes::Slot           => [:mouse_hovered,

data/lib/shoes/swt/shape.rb

@@ -1,6 +1,8 @@
 class Shoes
   module Swt
     class Shape
+      include Common::Clickable
+      include Common::Visibility
       include Common::Remove
       include Common::Fill
       include Common::Stroke
@@ -41,7 +43,7 @@ class Shoes
         @element.cubic_to(cx1, cy1, cx2, cy2, x, y)
       end
 
-      def arc(x, y, width, height, start_angle, arc_angle)
+      def arc_to(x, y, width, height, start_angle, arc_angle)
         @element.add_arc(x - (width / 2), y - (height / 2), width, height,
                          -start_angle * 180 / ::Shoes::PI,
                          (start_angle - arc_angle) * 180 / ::Shoes::PI)

data/lib/shoes/swt/shoes_layout.rb

@@ -4,42 +4,56 @@ class Shoes
       attr_accessor :gui_app
 
       def layout(*_dontcare)
-        dsl_app = @gui_app.dsl
-        height = dsl_app.height
-        scrollable_height = dsl_app.top_slot.contents_alignment
-        set_gui_size(height, scrollable_height)
-
-        dsl_app.top_slot.width  = dsl_app.width
-        dsl_app.top_slot.height = [scrollable_height, height].max
+        height, scroll_height, is_scrolling = gather_height_info(@gui_app.dsl)
+        set_heights(@gui_app.dsl, @gui_app.real, height, scroll_height)
 
-        vertical_bar = @gui_app.shell.getVerticalBar
-        vertical_bar.setVisible(scrollable_height > height)
-        if scrollable_height > height
-          handle_scroll_bar(vertical_bar, height, scrollable_height)
+        if is_scrolling
+          show_scrollbar(vertical_scrollbar, height, scroll_height)
         else
-          set_gui_location
+          hide_scrollbar(vertical_scrollbar, @gui_app.real)
         end
       end
 
       private
 
-      def set_gui_size(height, scrollable_height)
-        width          = @gui_app.dsl.width
-        maximum_height = [scrollable_height, height].max
-        size           = @gui_app.real.compute_trim 0, 0, width, maximum_height
-        @gui_app.real.set_size(size.width, size.height)
+      def gather_height_info(dsl_app)
+        height = dsl_app.height
+        scroll_height = dsl_app.top_slot.contents_alignment
+        [height, scroll_height, scroll_height > height]
       end
 
-      def handle_scroll_bar(vertical_bar, height, scrollable_height)
-        vertical_bar.setThumb height * height / scrollable_height
-        vertical_bar.setMaximum scrollable_height - height + vertical_bar.getThumb
-        vertical_bar.increment = 10
+      def set_heights(dsl_app, real_app, height, scroll_height)
+        maximum_height = [height, scroll_height].max
+        set_real_size(dsl_app, real_app, maximum_height)
+        set_top_slot_size(dsl_app, maximum_height)
       end
 
-      def set_gui_location
-        location   = @gui_app.real.getLocation
+      def set_real_size(dsl_app, real_app, maximum_height)
+        size  = real_app.compute_trim 0, 0, dsl_app.width, maximum_height
+        real_app.set_size(size.width, size.height)
+      end
+
+      def set_top_slot_size(dsl_app, maximum_height)
+        dsl_app.top_slot.width  = dsl_app.width
+        dsl_app.top_slot.height = maximum_height
+      end
+
+      def show_scrollbar(scrollbar, height, scroll_height)
+        scrollbar.visible   = true
+        scrollbar.thumb     = height * height / scroll_height
+        scrollbar.maximum   = scroll_height - height + scrollbar.thumb
+        scrollbar.increment = 10
+      end
+
+      def hide_scrollbar(scrollbar, real_app)
+        scrollbar.visible = false
+        location   = real_app.location
         location.y = 0
-        @gui_app.real.setLocation location
+        real_app.location = location
+      end
+
+      def vertical_scrollbar
+        @gui_app.shell.vertical_bar
       end
     end
   end

data/lib/shoes/swt/text_block.rb

@@ -7,15 +7,16 @@ class Shoes
       include ::Shoes::BackendDimensionsDelegations
 
       DEFAULT_SPACING = 4
+      NEXT_ELEMENT_OFFSET = 1
 
       attr_reader :dsl, :app
       attr_accessor :segments
 
       def initialize(dsl, app)
-        @dsl            = dsl
-        @app            = app
-        @segments       = []
-        @painter        = Painter.new @dsl
+        @dsl      = dsl
+        @app      = app
+        @segments = TextSegmentCollection.new(@dsl, [], default_text_styles)
+        @painter  = Painter.new @dsl
         @app.add_paint_listener @painter
       end
 
@@ -35,16 +36,45 @@ class Shoes
 
       def contents_alignment(current_position)
         dispose_existing_segments
-        @segments = Fitter.new(self, current_position).fit_it_in
+        raw_segments = Fitter.new(self, current_position).fit_it_in
 
-        set_absolutes_on_dsl(current_position)
-        set_calculated_sizes
+        if raw_segments && raw_segments.any?
+          @segments = TextSegmentCollection.new(@dsl, raw_segments, default_text_styles)
+          set_absolutes_on_dsl(current_position)
+          set_calculated_sizes
+        else
+          @segments = TextSegmentCollection.new(@dsl, [], default_text_styles)
+        end
+      end
+
+      def default_text_styles
+        style = @dsl.style
+
+        {
+          fg: style[:fg],
+          bg: style[:bg],
+          strikecolor: style[:strikecolor],
+          undercolor: style[:undercolor],
+          font_detail: {
+            name: @dsl.font,
+            size: @dsl.size,
+            styles: [::Swt::SWT::NORMAL]
+          }
+        }
       end
 
       def adjust_current_position(current_position)
+        current_position.y = @dsl.absolute_bottom + NEXT_ELEMENT_OFFSET
+
         last_segment = segments.last
-        current_position.y = @dsl.absolute_bottom
-        current_position.y -= last_segment.last_line_height unless @bumped_to_next_line
+        if last_segment && !@bumped_to_next_line
+          # Not quite sure why this is necessary. Could be a problem in some
+          # other part of positioning, or something about how text layouts
+          # actually draw themselves.
+          current_position.x -= 1
+
+          current_position.y -= last_segment.last_line_height
+        end
       end
 
       def set_absolutes_on_dsl(current_position)
@@ -65,10 +95,10 @@ class Shoes
         last_segment = segments.last
 
         @dsl.absolute_right  = starting_left + last_segment.last_line_width +
-          margin_right
+          margin_right - NEXT_ELEMENT_OFFSET
 
         @dsl.absolute_bottom = starting_top + last_segment.height +
-          margin_top + margin_bottom
+          margin_top + margin_bottom - NEXT_ELEMENT_OFFSET
       end
 
       def bump_absolutes_to_next_line
@@ -104,7 +134,6 @@ class Shoes
       end
 
       def dispose_existing_segments
-        @segments.map(&:dispose)
         @segments.clear
       end
 

data/lib/shoes/swt/text_block/cursor_painter.rb

@@ -42,7 +42,7 @@ class Shoes
         end
 
         def remove_textcursor
-          return unless @text_block_dsl.has_textcursor?
+          return unless @text_block_dsl.textcursor?
 
           @text_block_dsl.textcursor.remove
           @text_block_dsl.textcursor = nil

data/lib/shoes/swt/text_block/fitter.rb

@@ -95,6 +95,10 @@ class Shoes
         end
 
         def fit_as_empty_first_layout(height)
+          if height == :unbounded || height == 0
+            return []
+          end
+
           height += ::Shoes::Slot::NEXT_ELEMENT_OFFSET
           generate_two_layouts(empty_segment, "", @dsl.text, height)
         end
@@ -117,6 +121,7 @@ class Shoes
         end
 
         def generate_two_layouts(first_layout, first_text, second_text, height)
+          first_layout.fill_background = true
           second_layout = generate_second_layout(second_text)
           position_two_segments(first_layout, second_layout, first_text, height)
         end
@@ -132,7 +137,7 @@ class Shoes
             first_layout.position_at(@dsl.element_left,
                                      @dsl.element_top),
             second_layout.position_at(parent.absolute_left + @dsl.margin_left,
-                                      @dsl.element_top + first_height + 1)
+                                      @dsl.element_top + first_height)
           ]
         end
 
@@ -193,10 +198,10 @@ class Shoes
 
           offsets = layout.line_offsets
           offsets[0...-1].each_with_index do |_, i|
-            height_so_far += layout.line_bounds(i).height
+            height_so_far += layout.line_bounds(i).height + TextBlock::NEXT_ELEMENT_OFFSET
             ending_offset = offsets[i + 1]
 
-            break if height_so_far > height
+            break if height_so_far >= height
           end
           [layout.text[0...ending_offset], layout.text[ending_offset..-1]]
         end

data/lib/shoes/swt/text_block/painter.rb

@@ -6,40 +6,21 @@ class Shoes
         include Common::Resource
 
         attr_reader :app
+
         def initialize(dsl)
           @dsl = dsl
-          @style = @dsl.style
-          @app = @dsl.app.gui
         end
 
         def paintControl(paint_event)
-          reset_graphics_context(paint_event.gc)
-          return if @dsl.hidden?
-
-          draw_layouts(paint_event.gc)
-        end
+          # See #636 for discussion, contents_alignment may not run or if the
+          # space is very narrow we might squish things down to be very narrow.
+          # If paint is triggered then, code later on will crash.
+          return if @dsl.hidden? ||
+                    @dsl.gui.segments.nil? ||
+                    @dsl.gui.segments.empty?
 
-        def draw_layouts(graphic_context)
-          layouts = TextSegmentCollection.new(@dsl,
-                                              @dsl.gui.segments,
-                                              default_text_styles)
-          layouts.paint_control(graphic_context)
-        end
-
-        private
-
-        def default_text_styles
-          {
-            fg: @style[:fg],
-            bg: @style[:bg],
-            strikecolor: @style[:strikecolor],
-            undercolor: @style[:undercolor],
-            font_detail: {
-              name: @dsl.font,
-              size: @dsl.size,
-              styles: [::Swt::SWT::NORMAL]
-            }
-          }
+          reset_graphics_context(paint_event.gc)
+          @dsl.gui.segments.paint_control(paint_event.gc)
         end
       end
     end

data/lib/shoes/swt/text_block/text_segment.rb

@@ -14,7 +14,8 @@ class Shoes
       class TextSegment
         DEFAULT_SPACING = 4
 
-        attr_reader :layout, :element_left, :element_top
+        attr_reader   :layout, :element_left, :element_top
+        attr_accessor :fill_background
 
         extend Forwardable
         def_delegators :@layout, :text, :text=, :bounds, :width, :spacing,
@@ -23,11 +24,14 @@ class Shoes
         def initialize(dsl, text, width)
           @dsl = dsl
           @layout = ::Swt::TextLayout.new Shoes.display
+          @fill_background = false
+
           @font_factory = TextFontFactory.new
           @style_factory = TextStyleFactory.new
+          @color_factory = ColorFactory.new
 
           layout.text = text
-          layout.width = width unless layout_fits_in?(width)
+          layout.width = width
           style_from(font_styling, @dsl.style)
         end
 
@@ -35,6 +39,7 @@ class Shoes
           @layout.dispose unless @layout.disposed?
           @font_factory.dispose
           @style_factory.dispose
+          @color_factory.dispose
         end
 
         def position_at(element_left, element_top)
@@ -78,10 +83,6 @@ class Shoes
           }
         end
 
-        def layout_fits_in?(width)
-          layout.bounds.width <= width
-        end
-
         def height
           layout.bounds.height - layout.spacing
         end
@@ -95,6 +96,15 @@ class Shoes
         end
 
         def draw(graphics_context)
+          # Why not use TextLayout's background? Unfortunately it doesn't draw
+          # all the way to the edges--just around the literal text. This leaves
+          # things jagged when we flow, so do it ourselves.
+          if fill_background && @dsl.style[:fill]
+            background_color = @color_factory.create(@dsl.style[:fill])
+            background_color.apply_as_fill(graphics_context)
+            graphics_context.fill_rectangle(element_left, element_top, width, height)
+          end
+
           layout.draw(graphics_context, element_left, element_top)
         end
 

data/lib/shoes/swt/text_block/text_segment_collection.rb

@@ -3,7 +3,8 @@ class Shoes
     class TextBlock
       class TextSegmentCollection
         extend Forwardable
-        def_delegators :@segments, :length
+        def_delegators :@segments, :length, :last, :inject,
+                                   :one?, :any?, :empty?
 
         attr_reader :dsl, :default_text_styles
 
@@ -13,14 +14,26 @@ class Shoes
           @default_text_styles = default_text_styles
         end
 
+        def clear
+          @segments.map(&:dispose)
+          @segments.clear
+        end
+
         def paint_control(graphic_context)
-          style_from(dsl.style)
-          style_segment_ranges(dsl.text_styles)
-          create_links(dsl.text_styles)
+          ensure_styled
           draw(graphic_context)
           draw_cursor
         end
 
+        def ensure_styled
+          return if @styled
+
+          style_from(@dsl.style)
+          style_segment_ranges(@dsl.text_styles)
+          create_links(@dsl.text_styles)
+          @styled = true
+        end
+
         def style_from(style)
           @segments.each do |segment|
             segment.style_from(default_text_styles, style)
@@ -82,7 +95,6 @@ class Shoes
         # be in either, or both, of the segments. This method figures out which
         # segments apply, and what the relative ranges within each segment to use.
         def segment_ranges(text_range)
-          return [] unless @segments.first # TODO WTF #636
           return [] unless text_range.any?
 
           first_text = @segments.first.text