dan
/
eufon
1
0
Fork 0
Code Issues Pull Requests Releases Activity

make names more consistent

phoen
Daniel Barlow 2022-03-06 23:05:24 +00:00
parent f5503c3838
commit 8567c4d81c
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
just/just.fnl
View File

@ -44,10 +44,10 @@
:on_clicked #(webview:refresh) :on_clicked #(webview:refresh)
}) })
(: :set_image (named-image "view-refresh"))) (: :set_image (named-image "view-refresh")))
show-tabs (Gtk.Button { show-overview (Gtk.Button {
:label "><" :label "><"
:on_clicked #(webview:show-pages) :on_clicked #(webview:show-overview)
}) })
back (doto back (doto
(Gtk.Button { (Gtk.Button {
:on_clicked #(webview:go-back) :on_clicked #(webview:go-back)
@ -61,7 +61,7 @@
(widget:pack_start refresh false false 2) (widget:pack_start refresh false false 2)
(widget:pack_start stop false false 2) (widget:pack_start stop false false 2)
(widget:pack_start url true true 2) (widget:pack_start url true true 2)
(widget:pack_end show-tabs false false 2) (widget:pack_end show-overview false false 2)
(webview:listen :uri #(url:set_text $1)) (webview:listen :uri #(url:set_text $1))

37
just/viewplex.fnl
View File

@ -73,7 +73,7 @@
:width thumbnail-width :width thumbnail-width
:height thumbnail-height :height thumbnail-height
:image-position Gtk.PositionType.TOP :image-position Gtk.PositionType.TOP
:on_clicked #(self:focus w) :on_clicked #(self:focus-view w)
})] })]
(on-swipe b #(self:remove-view w)) (on-swipe b #(self:remove-view w))
(webview-thumbnail-image w.widget #(b:set_image $1)) (webview-thumbnail-image w.widget #(b:set_image $1))
@ -104,14 +104,18 @@
:show_tabs false :show_tabs false
}) })
overview (Gtk.ScrolledWindow) overview (Gtk.ScrolledWindow)
overview-page (widget:append_page overview) overview-page-num (widget:append_page overview)
relay-event (fn [source event-name]
(source:listen
event-name
#(if (= source foreground-view)
(listeners:notify event-name $1))))
views {}] views {}]
{ {
:listen (fn [_ name fun] :listen (fn [_ name fun]
(if (not (. relay-events name)) (if (not (. relay-events name))
(each [_ v (pairs views)] (each [_ v (pairs views)]
(v:listen name #(if (= v foreground-view) (relay-event v name)))
(listeners:notify name $1)))))
(table.insert relay-events name) (table.insert relay-events name)
(listeners:add name fun)) (listeners:add name fun))
@ -121,8 +125,7 @@
(set foreground-view webview) (set foreground-view webview)
(webview.widget:show) (webview.widget:show)
(each [_ event-name (ipairs relay-events)] (each [_ event-name (ipairs relay-events)]
(webview:listen event-name (relay-event webview event-name))
#(listeners:notify event-name $1)))
(let [page (widget:append_page webview.widget)] (let [page (widget:append_page webview.widget)]
(tset views page webview) (tset views page webview)
(set widget.page page) (set widget.page page)
@ -132,20 +135,20 @@
(let [page (widget:page_num view.widget)] (let [page (widget:page_num view.widget)]
(tset views page nil) (tset views page nil)
(widget:remove_page page) (widget:remove_page page)
(self:show-pages) (self:show-overview)
)) ))
:focus (fn [_ view] :focus-view (fn [_ view]
(when view (when view
(set foreground-view view) (set foreground-view view)
(each [_ prop (ipairs relay-events)] (each [_ prop (ipairs relay-events)]
(listeners:notify prop (. view.properties prop))) (listeners:notify prop (. view.properties prop)))
(set widget.page (widget:page_num view.widget)))) (set widget.page (widget:page_num view.widget))))
:show-pages (fn [self] :show-overview (fn [self]
(set foreground-view nil) (set foreground-view nil)
(set widget.page overview-page) (set widget.page overview-page-num)
(refresh-overview self overview views)) (refresh-overview self overview views))
:visit #(and foreground-view (foreground-view:visit $2)) :visit #(and foreground-view (foreground-view:visit $2))
:stop-loading #(and foreground-view :stop-loading #(and foreground-view