eufon

commit 07708b47fda7c6644ebdfad4084975603687ed1c
parent 8567c4d81c44bd756dd4a0969eac489b93d07e6d
Author: Daniel Barlow <dan@telent.net>
Date:   Sun,  6 Mar 2022 23:11:55 +0000

move webview thumbnail code from viewplex to webview

Diffstat:
M
just/viewplex.fnl
 | 
31
+------------------------------
M
just/webview.fnl
 | 
32
++++++++++++++++++++++++++++++++

2 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/just/viewplex.fnl b/just/viewplex.fnl
@@ -5,35 +5,6 @@
 (local thumbnail-width 300)
 (local thumbnail-height 200)
 
-(fn scale-surface [source image-width image-height]
-  (let [scaled (cairo.ImageSurface.create
-                cairo.Format.ARGB32
-                image-width image-height)
-        ctx (cairo.Context.create scaled)
-        source-width (cairo.ImageSurface.get_width source)
-        source-height (cairo.ImageSurface.get_height source)
-        scale (/ image-width source-width)]
-    ;; XXX do we need to destroy this context? the example
-    ;; in C called cairo_destroy(cr), but I haven't found a
-    ;; gi equivalent
-    (doto ctx
-      (: :scale scale scale)
-      (: :set_source_surface source 0 0)
-      (: :paint))
-    scaled))
-
-(fn webview-thumbnail-image [webview-widget fun]
-  ;; underlying call is async, so use callback
-  (webview-widget:get_snapshot
-   WebKit2.SnapshotRegion.VISIBLE
-   WebKit2.SnapshotOptions.NONE
-   nil
-   (fn [self res]
-     (let [surface (webview-widget:get_snapshot_finish res)
-           scaled (scale-surface surface thumbnail-width thumbnail-height)
-           img (doto (Gtk.Image) (: :set_from_surface scaled))]
-       (fun img)))))
-
 (fn on-fake-swipe [widget fun]
   ;; this is here for testing on desktop systems that don't
   ;; have touch support
@@ -76,7 +47,7 @@
                             :on_clicked #(self:focus-view w)
                             })]
          (on-swipe b #(self:remove-view w))
-         (webview-thumbnail-image w.widget #(b:set_image $1))
+         (w:thumbnail-image thumbnail-width thumbnail-height #(b:set_image $1))
          b)
        false false 5))
 
diff --git a/just/webview.fnl b/just/webview.fnl
@@ -2,6 +2,35 @@
 
 (local Listeners (require :listeners))
 
+(fn scale-surface [source image-width image-height]
+  (let [scaled (cairo.ImageSurface.create
+                cairo.Format.ARGB32
+                image-width image-height)
+        ctx (cairo.Context.create scaled)
+        source-width (cairo.ImageSurface.get_width source)
+        source-height (cairo.ImageSurface.get_height source)
+        scale (/ image-width source-width)]
+    ;; XXX do we need to destroy this context? the example
+    ;; in C called cairo_destroy(cr), but I haven't found a
+    ;; gi equivalent
+    (doto ctx
+      (: :scale scale scale)
+      (: :set_source_surface source 0 0)
+      (: :paint))
+    scaled))
+
+(fn thumbnail-image [widget width height fun]
+  ;; underlying call is async, so use callback
+  (widget:get_snapshot
+   WebKit2.SnapshotRegion.VISIBLE
+   WebKit2.SnapshotOptions.NONE
+   nil
+   (fn [self res]
+     (let [surface (widget:get_snapshot_finish res)
+           scaled (scale-surface surface width height)
+           img (doto (Gtk.Image) (: :set_from_surface scaled))]
+       (fun img)))))
+
 
 {
  :new
@@ -24,6 +53,9 @@
      :refresh #(widget:reload)
      :go-back #(and (widget:can_go_back) (widget:go_back))
 
+     :thumbnail-image (fn [self width height fun]
+                        (thumbnail-image widget width height fun))
+
      :properties props
      :widget widget
      })