Add longer tag info to available toolbar space (#197)

src/ProfileView.jl

@@ -236,6 +236,12 @@ function viewgui(fcolor, gdict::NestedGraphDict; data=nothing, lidict=nothing, w
             Gtk.GAccessor.tooltip_text(tb_zoom_out, "zoom out")
             tb_info = ToolButton("gtk-info")
             Gtk.GAccessor.tooltip_text(tb_info, "ProfileView tips")
+            tb_text_item = ToolItem()
+            Gtk.GAccessor.expand(tb_text_item, true)
+            tb_text = Entry()
+            Gtk.GAccessor.has_frame(tb_text, false)
+            Gtk.GAccessor.sensitive(tb_text, false)
+            push!(tb_text_item, tb_text)
 
             push!(tb, tb_open)
             push!(tb, tb_save_as)
@@ -245,6 +251,8 @@ function viewgui(fcolor, gdict::NestedGraphDict; data=nothing, lidict=nothing, w
             push!(tb, tb_zoom_in)
             push!(tb, SeparatorToolItem())
             push!(tb, tb_info)
+            push!(tb, SeparatorToolItem())
+            push!(tb, tb_text_item)
             # FIXME: likely have to do `allkwargs` in the open/save below (add in C, combine, recur)
             signal_connect(open_cb, tb_open, "clicked", Nothing, (), false, (widget(c),gsig,kwargs))
             signal_connect(save_as_cb, tb_save_as, "clicked", Nothing, (), false, (widget(c),data,lidict,g))
@@ -255,7 +263,7 @@ function viewgui(fcolor, gdict::NestedGraphDict; data=nothing, lidict=nothing, w
             push!(bx, f)
             # don't use the actual taskid as the tab as it's very long
             push!(nb_tasks, bx, task_tab_num == 1 ? task_tab : Symbol(task_tab_num - 1))
-            fdraw = viewprof(fcolor, c, gsig, (tb_zoom_fit, tb_zoom_out, tb_zoom_in), graphtype; kwargs...)
+            fdraw = viewprof(fcolor, c, gsig, (tb_zoom_fit, tb_zoom_out, tb_zoom_in, tb_text), graphtype; kwargs...)
             GtkObservables.gc_preserve(nb_threads, c)
             GtkObservables.gc_preserve(nb_threads, fdraw)
             _c, _fdraw, _tb_open, _tb_save_as = c, fdraw, tb_open, tb_save_as
@@ -288,19 +296,19 @@ function viewgui(fcolor, gdict::NestedGraphDict; data=nothing, lidict=nothing, w
     return win, _c, _fdraw, (_tb_open, _tb_save_as)
 end
 
-function viewprof(fcolor, c, gsig, zoom_buttons, graphtype; fontsize=14)
+function viewprof(fcolor, c, gsig, tb_items, graphtype; fontsize=14)
     obs = on(gsig) do g
-        viewprof_func(fcolor, c, g, fontsize, zoom_buttons, graphtype)
+        viewprof_func(fcolor, c, g, fontsize, tb_items, graphtype)
     end
     gsig[] = gsig[]
     return obs
 end
 
-function viewprof_func(fcolor, c, g, fontsize, zoom_buttons, graphtype)
+function viewprof_func(fcolor, c, g, fontsize, tb_items, graphtype)
     if !in(graphtype, (:flame, :icicle))
         throw(ArgumentError("Invalid option for `graphtype`: `$(repr(graphtype))`. Valid options are `:flame` and `:icicle`"))
     end
-    tb_zoom_fit, tb_zoom_out, tb_zoom_in = zoom_buttons
+    tb_zoom_fit, tb_zoom_out, tb_zoom_in, tb_text = tb_items
     # From a given position, find the underlying tag
     function gettag(tagimg, xu, yu)
         x = ceil(Int, Float64(xu))
@@ -364,12 +372,16 @@ function viewprof_func(fcolor, c, g, fontsize, zoom_buttons, graphtype)
                 xu, yu = btn.position.x, btn.position.y
                 sf = gettag(tagimg, xu, yu)
                 if sf != StackTraces.UNKNOWN
+                    str_long = long_info_str(sf)
+                    Gtk.GAccessor.text(tb_text, str_long)
                     str = string(basename(string(sf.file)), ", ", sf.func, ": line ", sf.line)
                     set_source(ctx, fcolor(:font))
                     Cairo.set_font_face(ctx, "sans-serif $(fontsize)px")
                     xi = zr[].currentview.x
                     xmin, xmax = minimum(xi), maximum(xi)
                     lasttextbb[] = deform(Cairo.text(ctx, xu, yu, str, halign = xu < (2xmin+xmax)/3 ? "left" : xu < (xmin+2xmax)/3 ? "center" : "right"), -2, 2, -2, 2)
+                else
+                    Gtk.GAccessor.text(tb_text, "")
                 end
                 reveal(c)
             end
@@ -384,11 +396,7 @@ function viewprof_func(fcolor, c, g, fontsize, zoom_buttons, graphtype)
                 clicked[] = sf
                 if sf != StackTraces.UNKNOWN
                     if btn.button == 1
-                        if sf.linfo isa Core.MethodInstance
-                            println(sf.file, ':', sf.line, ", ", sf.linfo)
-                        else
-                            println(sf.file, ':', sf.line, ", ", sf.func, " [inlined]")
-                        end
+                        println(long_info_str(sf))
                     elseif btn.button == 3
                         edit(string(sf.file), sf.line)
                     end
@@ -400,6 +408,14 @@ function viewprof_func(fcolor, c, g, fontsize, zoom_buttons, graphtype)
     return nothing
 end
 
+function long_info_str(sf)
+    if sf.linfo isa Core.MethodInstance
+        string(sf.file, ':', sf.line, ", ", sf.linfo)
+    else
+        string(sf.file, ':', sf.line, ", ", sf.func, " [inlined]")
+    end
+end
+
 @guarded function open_cb(::Ptr, settings::Tuple)
     c, gsig, kwargs = settings
     selection = open_dialog("Load profile data", toplevel(c), ("*.jlprof","*"))