shoes-swt 4.0.0.pre12 → 4.0.0.rc1

data/lib/shoes/swt/shape.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Shape
@@ -20,7 +21,9 @@ class Shoes
         @app = app
         @element = ::Swt::Path.new(::Swt.display)
         @painter = ShapePainter.new(self)
+        @transform = nil
         @app.add_paint_listener @painter
+        @scroll_top_applied = nil
       end
 
       def dispose
@@ -28,9 +31,8 @@ class Shoes
         @element.dispose   unless @element.nil? || @element.disposed?
       end
 
-      attr_reader :dsl, :app
-      attr_reader :element, :transform
-      attr_reader :painter
+      attr_reader :dsl, :app, :element, :painter
+      attr_accessor :scroll_top_applied
 
       def redraw_target
         @dsl

data/lib/shoes/swt/shape_painter.rb

@@ -1,7 +1,19 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class ShapePainter < Common::Painter
+      def before_painted
+        if @obj.scroll_top_applied != @obj.dsl.parent.scroll_top
+          # Put back what we've already done
+          @obj.transform.translate(0, @obj.scroll_top_applied) if @obj.scroll_top_applied
+
+          # Move it!
+          @obj.transform.translate(0, -@obj.dsl.parent.scroll_top)
+          @obj.scroll_top_applied = @obj.dsl.parent.scroll_top
+        end
+      end
+
       def fill(gc)
         gc.fill_path(@obj.element)
       end

data/lib/shoes/swt/shoes_layout.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class ShoesLayout < ::Swt::Widgets::Layout

data/lib/shoes/swt/slot.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Slot
@@ -14,27 +15,37 @@ class Shoes
         @real = parent.real
 
         @app = @parent.app
+
+        @scroll = ::Swt::Widgets::Slider.new(@app.real, ::Swt::SWT::VERTICAL)
+        @scroll.add_selection_listener do |_event|
+          update_scroll
+        end
       end
 
       # needed by Layouter code, but slots are no physical elements so they
       def update_position
       end
 
-      # This is more like a temporary work around until slots have a real
-      # backend representations that can just hide their contents all together
-      # I decided to put this logic in the backend since the hiding is a backend
-      # responsibility, although this is more DSL code
-      # #904 #905
-      def update_visibility
-        # Only alter contents on a visibility change
-        return if @last_hidden_state == dsl.hidden?
+      def update_scroll
+        @dsl.scroll_top = @scroll.selection
+      end
+
+      # This is more than the scrollbar is expected to be on any OS
+      SCROLLBAR_MAX_WIDTH = 20
 
-        @last_hidden_state = dsl.hidden?
+      # For some reason, if we set max to match, you can't get past last 10!
+      SCROLLBAR_PADDING = 10
+
+      def update_visibility
+        @scroll.set_visible(@dsl.scroll && @dsl.scroll_max.positive?)
 
-        if @last_hidden_state
-          dsl.contents.each(&:hide)
-        else
-          dsl.contents.each(&:show)
+        if @dsl.scroll
+          @scroll.selection = @dsl.scroll_top
+          @scroll.maximum = @dsl.scroll_max + SCROLLBAR_PADDING
+          @scroll.set_bounds @dsl.element_right - SCROLLBAR_MAX_WIDTH + 1,
+                             @dsl.element_top,
+                             SCROLLBAR_MAX_WIDTH,
+                             @dsl.element_height
         end
       end
 

data/lib/shoes/swt/sound.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # JavaZOOM Sound-API Projects
 #  - Shared lib
 require 'shoes/swt/support/tritonus_share.jar'
@@ -43,7 +44,6 @@ class Shoes
             # Play now.
             rawplay(decoded_audio_format, decoded_audio_input_stream)
             audio_input_stream.close
-
           rescue UnsupportedAudioFileException => uafex
             puts uafex.inspect, uafex.backtrace
           rescue IOException => ioex

data/lib/shoes/swt/star.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Star

data/lib/shoes/swt/star_painter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class StarPainter < Common::Painter
@@ -15,7 +16,7 @@ class Shoes
         inner = obj.inner
         points = obj.points
         left = obj.translate_left + obj.element_left
-        top = obj.translate_top + obj.element_top
+        top = obj.translate_top + drawing_top
         @polygon = []
         add_edge(left, top + outer)
         (1..points * 2).each do |i|

data/lib/shoes/swt/swt_button.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class SwtButton

data/lib/shoes/swt/text_block.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextFontFactory
       def initialize
         @fonts = []
+        @display = nil
       end
 
       def create_font(font_style)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextBlock

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class TextStyleFactory

data/lib/shoes/swt/timer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Shoes
   module Swt
     class Timer

data/lib/shoes/swt/tooling/leak_hunter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'swt'
 require 'shoes/swt'
 # Interested what hometown is and what it does?

data/lib/shoes/swt/version.rb

@@ -2,6 +2,6 @@
 
 class Shoes
   module Swt
-    VERSION = "4.0.0.pre12"
+    VERSION = "4.0.0.rc1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoes-swt
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre12
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Team Shoes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre12
+        version: 4.0.0.rc1
   name: shoes-core
   prerelease: false
   type: :runtime
@@ -51,13 +51,13 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre12
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre12
+        version: 4.0.0.rc1
   name: shoes-package
   prerelease: false
   type: :runtime
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre12
+        version: 4.0.0.rc1
 description: A JRuby and Swt backend for Shoes, the best little GUI toolkit for Ruby.
   Shoes makes building for Mac, Windows, and Linux super simple.
 email:
@@ -114,6 +114,7 @@ files:
 - lib/shoes/swt/generate_backend.rb
 - lib/shoes/swt/gradient.rb
 - lib/shoes/swt/image.rb
+- lib/shoes/swt/image_painter.rb
 - lib/shoes/swt/image_pattern.rb
 - lib/shoes/swt/input_box.rb
 - lib/shoes/swt/key_listener.rb