finish popup (probably)

wookay · Sep 2, 2020 · 64125fb · 64125fb
1 parent dee69bb
commit 64125fb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ docs/build
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+Manifest.toml
diff --git a/src/Desktop.jl b/src/Desktop.jl
@@ -1,7 +1,7 @@
 module Desktop # Poptart
 
 export Application, Window
-export Button, InputText, Label, Slider, Checkbox, Popup, open_popup
+export Button, InputText, Label, Slider, Checkbox, Popup, OpenPopup
 export Canvas
 export ScatterPlot, Spy, BarPlot, LinePlot, MultiLinePlot, Histogram
 export Separator, SameLine, NewLine, Spacing, Group
@@ -40,6 +40,7 @@ include("Desktop/imgui_controls.jl")
 include("Desktop/imgui_drawings.jl")
 include("Desktop/menus.jl")
 include("Desktop/events.jl")
+include("Desktop/popups.jl")
 
 env = Dict{Ptr{Cvoid},UIApplication}()
 include("Desktop/glfw.jl") # env exit_on_esc

diff --git a/src/Desktop/imgui_controls.jl b/src/Desktop/imgui_controls.jl
@@ -103,8 +103,4 @@ function imgui_control_item(imctx::Ptr, item::Popup)
     end
 end
 
-function open_popup(popup::Popup)
-    CImGui.OpenPopup(popup.label)
-end
-
 # module Poptart.Desktop
diff --git a/src/Desktop/popups.jl b/src/Desktop/popups.jl
@@ -0,0 +1,7 @@
+# module Poptart.Desktop
+
+function OpenPopup(popup::Popup)
+    CImGui.OpenPopup(popup.label)
+end
+
+# module Poptart.Desktop
diff --git a/test/poptart/desktop/controls.jl b/test/poptart/desktop/controls.jl
@@ -31,10 +31,8 @@ popup1 = Popup(label="popup1", items = [Label("A popup")])
 push!(window1.items, popup1)
 
 didClick(popup_button) do event
-    open_popup(popup1)
+    OpenPopup(popup1)
 end
-# For now, you cannot use Mouse.leftClick to open a popup
-# Mouse.leftClick(popup_button)
 
 pause(app)