Merge pull request #73 from tim-rex/support_imgui_v1.61

Support imgui v1.61

README.md

@@ -1,4 +1,4 @@
-[![completion](https://img.shields.io/badge/completion-66%25%20%28270%20of%20409%29-blue.svg)](https://github.com/swistakm/pyimgui)
+[![completion](https://img.shields.io/badge/completion-66%25%20%28294%20of%20442%29-blue.svg)](https://github.com/swistakm/pyimgui)
 [![Coverage Status](https://coveralls.io/repos/github/swistakm/pyimgui/badge.svg?branch=master)](https://coveralls.io/github/swistakm/pyimgui?branch=master)
 [![Documentation Status](https://readthedocs.org/projects/pyimgui/badge/?version=latest)](https://pyimgui.readthedocs.io/en/latest/?badge=latest)
 

conftest.py

@@ -51,11 +51,25 @@ def runtest(self):
         self.exec_snippet(self.code)
 
     def exec_snippet(self, source):
+
+        # Strip out new_frame/end_frame from source
+        lines = [
+            line
+            if all([
+                "imgui.new_frame()" not in line,
+                "imgui.render()" not in line,
+                "imgui.end_frame()" not in line
+            ]) else ""
+            for line in
+            source.split('\n')
+        ]
+        source = "\n".join(lines)
+
         code = compile(source, '<str>', 'exec')
         frameinfo = getframeinfo(currentframe())
 
+        imgui.create_context()
         io = imgui.get_io()
-        io.render_callback = lambda *args, **kwargs: None
         io.delta_time = 1.0 / 60.0
         io.display_size = 300, 300
 
@@ -73,6 +87,7 @@ def exec_snippet(self, source):
             lines = source.split('\n')
             lines.insert(sys.exc_info()[2].tb_next.tb_lineno, "^^^")
             self.code = "\n".join(lines)
+            imgui.end_frame()
             raise
 
         imgui.render()

doc/examples/glfw3.py

@@ -40,6 +40,7 @@ def main():
         gl.glClear(gl.GL_COLOR_BUFFER_BIT)
 
         imgui.render()
+        impl.render(imgui.get_draw_data())
         glfw.swap_buffers(window)
 
     impl.shutdown()

doc/requirements-test.txt

@@ -1,5 +1,6 @@
 Cython>=0.24,<=0.28.2
 click
+wheel
 # note: sphinx and docutils are for collecting tests
 Sphinx==1.4.8
 docutils<0.13.1

doc/source/gen_example.py

@@ -9,7 +9,7 @@
 import imgui
 from imgui.integrations.glfw import GlfwRenderer
 
-
+imgui.create_context()
 io = imgui.get_io()
 
 
@@ -70,7 +70,8 @@ def render_snippet(
         line
         if all([
             "imgui.new_frame()" not in line,
-            "imgui.render()" not in line
+            "imgui.render()" not in line,
+            "imgui.end_frame()" not in line
         ]) else ""
         for line in
         source.split('\n')
@@ -145,7 +146,7 @@ def render_snippet(
 
             if auto_layout:
                 imgui.set_next_window_size(width - 10, height - 10)
-                imgui.set_next_window_centered()
+                imgui.set_next_window_position(impl.io.DisplaySize.x * 0.5, implio.DisplaySize.y * 0.5, 1, pivot_x = 0.5, pivot_y = 0.5)
 
             exec(code, locals(), globals())
 

doc/source/guide/first-steps.rst

@@ -82,6 +82,7 @@ commands.
   # pass all drawing comands to the rendering pipeline
   # and close frame context
   imgui.render()
+  imgui.end_frame()
 
 
 Of course this is not enough to create fully working GUI application with

doc/source/guide/window-flags.rst

@@ -17,7 +17,7 @@ so many different flags can be joined together with ``|`` operator.
     imgui.set_next_window_position(10, 0)
     imgui.begin(
         "Custom window",
-        flags=imgui.WINDOW_MENU_BAR | imgui.WINDOW_SHOW_BORDERS
+        flags=imgui.WINDOW_MENU_BAR
     )
     imgui.text("Custom window with menu bar and borders")
     imgui.end()
@@ -56,23 +56,6 @@ Window flags are also available for new scrollable child regions created with
 
     imgui.end()
 
-Note that in case of scrollable regions it is possible to override the
-``border`` argument with the :any:`imgui.WINDOW_SHOW_BORDERS` flag.
-
-.. visual-example::
-    :width: 310
-    :height: 100
-    :title: Child region flags override border
-    :auto_layout:
-
-    imgui.begin("Region border override")
-    imgui.begin_child(
-        "Child region", border=False,
-        flags=imgui.WINDOW_SHOW_BORDERS
-    )
-    imgui.end_child()
-    imgui.end()
-
 List of all available window flags (click to see documentation):
 
 .. _window-flag-options:
@@ -84,7 +67,6 @@ List of all available window flags (click to see documentation):
 * :py:data:`imgui.WINDOW_NO_SCROLL_WITH_MOUSE` 
 * :py:data:`imgui.WINDOW_NO_COLLAPSE` 
 * :py:data:`imgui.WINDOW_ALWAYS_AUTO_RESIZE` 
-* :py:data:`imgui.WINDOW_SHOW_BORDERS` 
 * :py:data:`imgui.WINDOW_NO_SAVED_SETTINGS` 
 * :py:data:`imgui.WINDOW_NO_INPUTS` 
 * :py:data:`imgui.WINDOW_MENU_BAR`