Skip to content

Commit

Permalink
Merge 24219a8 into 5e7d253
Browse files Browse the repository at this point in the history
  • Loading branch information
billsix committed Jan 26, 2021
2 parents 5e7d253 + 24219a8 commit 12f4821
Show file tree
Hide file tree
Showing 4 changed files with 3,369 additions and 5 deletions.
6 changes: 4 additions & 2 deletions doc/examples/integrations_glfw3.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import imgui
from imgui.integrations.glfw import GlfwRenderer

from testwindow import show_test_window

def main():
imgui.create_context()
Expand All @@ -30,7 +30,6 @@ def main():
imgui.end_menu()
imgui.end_main_menu_bar()

imgui.show_test_window()

imgui.begin("Custom window", True)
imgui.text("Bar")
Expand All @@ -39,6 +38,9 @@ def main():
imgui.extra.text_ansi_colored("Eggs", 0.2, 1., 0.)
imgui.end()

show_test_window()
#imgui.show_test_window()

gl.glClearColor(1., 1., 1., 1)
gl.glClear(gl.GL_COLOR_BUFFER_BIT)

Expand Down
6 changes: 4 additions & 2 deletions doc/examples/integrations_pyglet.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import pyglet
from pyglet import gl
from testwindow import show_test_window

import imgui
# Note that we could explicitly choose to use PygletFixedPipelineRenderer
Expand Down Expand Up @@ -32,12 +33,13 @@ def update(dt):
imgui.end_menu()
imgui.end_main_menu_bar()

imgui.show_test_window()
show_test_window()
#imgui.show_test_window()

imgui.begin("Custom window", True)
imgui.text("Bar")
imgui.text_colored("Eggs", 0.2, 1., 0.)

imgui.text_ansi("B\033[31marA\033[mnsi ")
imgui.text_ansi_colored("Eg\033[31mgAn\033[msi ", 0.2, 1., 0.)

Expand Down
4 changes: 3 additions & 1 deletion doc/examples/integrations_pysdl2.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import imgui
from imgui.integrations.sdl2 import SDL2Renderer
from testwindow import show_test_window


def main():
Expand Down Expand Up @@ -37,7 +38,8 @@ def main():
imgui.end_menu()
imgui.end_main_menu_bar()

imgui.show_test_window()
show_test_window()
#imgui.show_test_window()

imgui.begin("Custom window", True)
imgui.text("Bar")
Expand Down

0 comments on commit 12f4821

Please sign in to comment.