Merge pull request #17 from kojix2/image

Image

Author: kojix2

README.md

@@ -440,7 +440,32 @@ Note: Grid Layout does not work as expected on macOS.
   </tbody>
 </table>
 
-### Timer
+### Image (experimental)
+
+<table>
+  <thead>
+    <tr>
+      <th>Example</th>
+      <th>Ubuntu</th>
+      <th>Windows</th>
+      <th>macOS</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><a href="examples/gallery/area_draw_image.cr">area_draw_image</a></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/area_draw_image-ubuntu.png" alt="area_draw_image-ubuntu"></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/area_draw_image-windows.png" alt="area_draw_image-windows"></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/area_draw_image-macos.png" alt="area_draw_image-macos"></td>
+    </tr>
+    <tr>
+      <td><a href="examples/gallery/image_viewer.cr">image_viewer</a></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/image_viewer-ubuntu.png" alt="image_viewer-ubuntu"></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/image_viewer-windows.png" alt="image_viewer-windows"></td>
+      <td><img src="https://raw.githubusercontent.com/kojix2/uing/screenshots/image_viewer-macos.png" alt="image_viewer-macos"></td>
+    </tr>
+  </tbody>
+</table>
 
 ## API Levels
 

download.cr

@@ -1,7 +1,7 @@
 require "compress/zip"
 require "file_utils"
 
-COMMIT_HASH = ENV["LIBUI_NG_COMMIT_HASH"]? || "b44b29e"
+COMMIT_HASH = ENV["LIBUI_NG_COMMIT_HASH"]? || "d846eac-experimental"
 
 # Path constants
 BUILD_DIR      = "builddir"

examples/gallery/area_draw_image.cr

@@ -0,0 +1,59 @@
+require "../../src/uing"
+require "stumpy_png"
+
+fname = "#{__DIR__}/crys.png"
+canvas = StumpyPNG.read(fname)
+width = canvas.width.to_i32
+height = canvas.height.to_i32
+
+pixels = Bytes.new(width * height * 4)
+(0...height).each do |y|
+  (0...width).each do |x|
+    offset = (y * width + x) * 4
+    r, g, b, a = canvas[x, y].to_rgba
+    pixels[offset] = r
+    pixels[offset + 1] = g
+    pixels[offset + 2] = b
+    pixels[offset + 3] = a || 255_u8
+  end
+end
+
+UIng.init
+
+image = UIng::Image.new(width, height)
+image.append(pixels, width, height, width * 4)
+
+window = UIng::Window.new("Draw Image Example", 400, 400, margined: true)
+window.on_closing do
+  UIng.quit
+  true
+end
+
+area_handler = UIng::Area::Handler.new do |header|
+  draw do |area, params|
+    ctx = params.context
+    white_brush = UIng::Area::Draw::Brush.new(:solid, 1.0, 1.0, 1.0, 1.0)
+    ctx.fill_path(white_brush) do |path|
+      path.add_rectangle(0, 0, params.area_width, params.area_height)
+    end
+    begin
+      ctx.draw_image(image, 10, 10, 100, 100)
+      ctx.draw_image(image, 160, 10, 200, 100)
+      ctx.draw_image(image, 10, 160, 100, 200)
+      ctx.draw_image(image, 160, 160, 200, 200)
+    rescue ex
+      UIng.handle_callback_error(ex, "draw_image")
+    end
+  end
+end
+
+area = UIng::Area.new(area_handler)
+box = UIng::Box.new(:horizontal)
+box.append(area, stretchy: true)
+window.set_child(box)
+window.show
+
+UIng.main
+
+image.free
+UIng.uninit

examples/gallery/basic_image_view.cr

@@ -0,0 +1,46 @@
+require "../../src/uing"
+require "http/client"
+require "stumpy_png"
+
+fname = "#{__DIR__}/crys.png"
+canvas = StumpyPNG.read(fname)
+width = canvas.width.to_i32
+height = canvas.height.to_i32
+
+pixels = Bytes.new(width * height * 4)
+(0...height).each do |y|
+  (0...width).each do |x|
+    offset = (y * width + x) * 4
+    r, g, b, a = canvas[x, y].to_rgba
+    pixels[offset] = r
+    pixels[offset + 1] = g
+    pixels[offset + 2] = b
+    pixels[offset + 3] = a || 255_u8
+  end
+end
+
+UIng.init
+
+window = UIng::Window.new("ImageView Example", 300, 200, margined: true)
+window.on_closing do
+  UIng.quit
+  true
+end
+
+vbox = UIng::Box.new(:vertical)
+
+image = UIng::Image.new(width, height)
+image.append(pixels, width, height, width * 4)
+image_view = UIng::ImageView.new(image, :fit)
+image.free
+
+label = UIng::Label.new(fname)
+
+vbox.append(image_view, stretchy: true)
+vbox.append(label)
+
+window.set_child(vbox)
+window.show
+
+UIng.main
+UIng.uninit

examples/gallery/crys.png

@@ -7,4 +7,10 @@ authors:
 scripts:
   postinstall: crystal run download.cr
 
+
+development_dependencies:
+  stumpy_png:
+    github: stumpycr/stumpy_png
+    version: "~> 5.0"
+
 license: MIT

shard.yml

@@ -133,6 +133,13 @@ module UIng
           LibUI.draw_text(@ref_ptr, text_layout.to_unsafe, x, y)
         end
 
+        def draw_image(img : UIng::Image, x : Number, y : Number, width : Number, height : Number) : Nil
+          raise ArgumentError.new("Width must be positive") if width <= 0
+          raise ArgumentError.new("Height must be positive") if height <= 0
+
+          LibUI.draw_image(@ref_ptr, img.to_unsafe, x.to_f64, y.to_f64, width.to_f64, height.to_f64)
+        end
+
         def to_unsafe
           @ref_ptr
         end

src/uing/area/area/draw/context.cr

@@ -0,0 +1,34 @@
+require "./control"
+
+module UIng
+  class ImageView < Control
+    enum ContentMode
+      Center
+      Fit
+    end
+
+    block_constructor
+
+    def initialize
+      @ref_ptr = LibUI.new_image_view
+    end
+
+    def initialize(image : Image, mode : ContentMode = ContentMode::Center)
+      @ref_ptr = LibUI.new_image_view
+      LibUI.image_view_set_image(@ref_ptr, image.to_unsafe)
+      LibUI.image_view_set_content_mode(@ref_ptr, mode)
+    end
+
+    def image=(image : Image)
+      LibUI.image_view_set_image(@ref_ptr, image.to_unsafe)
+    end
+
+    def content_mode=(mode : ContentMode)
+      LibUI.image_view_set_content_mode(@ref_ptr, mode)
+    end
+
+    def to_unsafe
+      @ref_ptr
+    end
+  end
+end

src/uing/image_view.cr

@@ -339,6 +339,7 @@ module UIng
     fun draw_free_text_layout = uiDrawFreeTextLayout(tl : Pointer(DrawTextLayout))
     fun draw_text = uiDrawText(c : Pointer(DrawContext), tl : Pointer(DrawTextLayout), x : LibC::Double, y : LibC::Double)
     fun draw_text_layout_extents = uiDrawTextLayoutExtents(tl : Pointer(DrawTextLayout), width : Pointer(LibC::Double), height : Pointer(LibC::Double))
+    fun draw_image = uiDrawImage(c : Pointer(DrawContext), img : Pointer(Image), x : LibC::Double, y : LibC::Double, width : LibC::Double, height : LibC::Double)
     alias FontButton = Void
     fun font_button_font = uiFontButtonFont(b : Pointer(FontButton), desc : Pointer(FontDescriptor))
     fun font_button_on_changed = uiFontButtonOnChanged(b : Pointer(FontButton), f : (Pointer(FontButton), Pointer(Void) -> Void), data : Pointer(Void))
@@ -413,5 +414,10 @@ module UIng
     fun table_get_selection = uiTableGetSelection(t : Pointer(Table)) : Pointer(TableSelection)
     fun table_set_selection = uiTableSetSelection(t : Pointer(Table), sel : Pointer(TableSelection))
     fun free_table_selection = uiFreeTableSelection(s : Pointer(TableSelection))
+
+    alias ImageView = Void
+    fun new_image_view = uiNewImageView : Pointer(ImageView)
+    fun image_view_set_image = uiImageViewSetImage(iv : Pointer(ImageView), image : Pointer(Image))
+    fun image_view_set_content_mode = uiImageViewSetContentMode(iv : Pointer(ImageView), mode : UIng::ImageView::ContentMode)
   end
 end