omar
dcbf976a8e
Merge branch 'master' into viewport + comments
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
omar
aa668c410a
Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. ( #2168 ) + adding a else block to make NavCalcPreferredRefPos() more explicit.
6 years ago
omar
f2d577c33f
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
6 years ago
omar
f52f0a5277
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). ( #2186 )
6 years ago
omar
19b4fcdacb
Made IsWindowFocused() work outside of NewFrame()-EndFrame() and added comments about how ImGuiFocusedFlags_AnyWindow should NOT be used in place of io.WantCaptureMouse. ( #2185 )
6 years ago
omar
5b1394c5ac
Update README.md
6 years ago
omar
6c1ae6cc71
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
6 years ago
omar
6d7677534f
Internals: SliderBehavior: Using axis indexing.
6 years ago
omar
a3d6554e8e
Merge branch 'master' into viewport + specific changes for GLFW callbacks
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
6 years ago
omar
772354377b
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. ( #1759 )
6 years ago
omar
9d155c73bc
Examples: Misc comments mainly related to GLFW callbacks. ( #1759 )
6 years ago
omar
a419d46205
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). ( #2178 )
6 years ago
omar
131bf5ee4a
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
6 years ago
omar
797f2044cd
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. ( #2175 )
6 years ago
omar
5ea08394f5
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
6 years ago
omar
9ee86f22b7
Examples: Win32: Handle UTf-8 in platform window title setting. ( #2164 )
6 years ago
omar
52ca91ca57
Merge branch 'master' into viewport
6 years ago
omar
f388216ff0
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. ( #2010 , #2043 , #2091 )
6 years ago
omar
c808eb92c6
Config: Added IMGUI_DISABLE_WIN32_FUNCTIONS to disable linking with _any_ Win32 function, as a general forward compatible measure.
6 years ago
omar
eb592bf7d3
ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. ( #2173 ). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.
6 years ago
Torkel Bjørnson-Langen
1441756a0f
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() ( #2153 )
6 years ago
Michał Janiszewski
2e6e1bec58
Examples: Add missing include guards ( #2166 )
6 years ago
Cort
ed0f7004d0
Examples: Vulkan: Avoid unreferenced parameter warning. ( #2162 )
6 years ago
omar
7fa3e71abb
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155 )
6 years ago
Hui
e6db078eda
gladLoadGL() return 0 to indicate failure ( #2157 )
6 years ago
omar
50f6e12d31
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
omar
f3e642322f
Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.
6 years ago
omar
eed1fba157
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. ( #2152 )
6 years ago
Konstantin Podsvirov
faecf90383
SliderAngle: Added optional `format` argument to allow users customize precision and make localization. ( #2150 )
6 years ago
omar
12c72d2893
Fixed OpenGL texture loading example in comment + Discourse link to root of discourse
6 years ago
omar
a72d5ada61
Misc comments improvements
6 years ago
omar
ac9aaf4b6e
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
6 years ago
omar
f270c81c49
Viewport, Docking: Fixed incorrectly setting the ImGuiViewportFlags_NoInputs flag, affecting split docking node. ( #2109 )
6 years ago
omar
e610afeea3
Font readme: Added OpenFontIcons, tweaks, links, removed spaces ( #2141 )
6 years ago
omar
056af2b1af
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
Brandon
5f79a28a07
Examples: SDL: Fixed usage of SDL_GetDisplayDPI ( #2137 , #1676 )
6 years ago
omar
82873c7ad4
Update README.md
6 years ago
omar
745f01022e
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) ( #2133 , #1929 )
6 years ago
omar
31fd6c585a
Removed unnecessary ImGui:: qualifiers in internal code.
6 years ago
Warren Moore
b4488d4f48
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) ( #2133 )
6 years ago
omar
000c1fc221
Demo: Added comments / tweaks related to the popups.
6 years ago
omar
5be915d6ab
Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. ( #1660 , #787 )
6 years ago
omar
90b50bd4c3
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. ( #1660 )
6 years ago
omar
69db792bf0
Viewport: Exposed GetOverlayDrawList(ImGuiViewport* viewport) in public API. ( #1542 , #1660 , #1878 , etc.)
6 years ago
Elias Daler
8606d9fa11
Fix Clang/GCC's null-conversion warning: ( #2081 )
...
The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example.
6 years ago
omar
b039dbc62e
Update README.md
6 years ago
Konstantin Podsvirov
edb06a6c4d
Fixed typo in misc/README.txt ( #2131 )
6 years ago
omar
e73217d6f7
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
omar
ca753829cb
Revert using wchar_t functions ( 9cf94d5
+ 2eaf5b0
). Big mistake, wchar_t is not guaranteed to be 16-bits.
6 years ago
omar
28953208d4
Tests: Added imgui-test engine hooks (experimental).
6 years ago