680162eb32
Merge branch 'master' into navigation
2018-01-24 17:41:14 +01:00
823e1f0b94
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments ( #787 )
2018-01-24 10:43:57 +01:00
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
2018-01-23 21:56:15 +01:00
f6ee8d30fb
Comments ( #1567 )
2018-01-23 19:21:17 +01:00
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2018-01-23 19:16:43 +01:00
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
2018-01-23 19:13:49 +01:00
2645ab5f7f
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084
2018-01-23 17:25:59 +01:00
13c407591e
Nav: Comments, tweaks
2018-01-23 16:45:46 +01:00
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
2018-01-23 09:57:49 +01:00
9edf211c0e
Merge branch 'master' into navigation
2018-01-21 20:46:50 +01:00
5e2aa6185c
Reorganized context handling to be more explicit,
...
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
5eb293c879
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
2018-01-20 20:32:23 +01:00
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
2018-01-20 20:25:12 +01:00
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
2018-01-20 12:36:16 +01:00
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-01-20 12:06:06 +01:00
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-19 15:42:28 +01:00
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ( #143 )
2018-01-18 17:39:40 +01:00
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
2018-01-18 17:32:34 +01:00
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
2018-01-18 10:06:58 +01:00
d1f726cd9d
Comments about Begin/End pair and handling of return value.
2018-01-17 12:46:07 +01:00
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-15 20:13:42 +01:00
28a76af185
Internal: DrawData: Tidying, renaming.
2018-01-15 20:12:48 +01:00
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
2018-01-12 19:28:37 +01:00
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 16:49:59 +01:00
398a4e1865
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. ( #1382 )
2018-01-11 13:58:25 +01:00
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
2018-01-11 13:51:18 +01:00
fe919995da
Merge branch 'master' into navigation
2018-01-08 16:35:12 +01:00
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
2018-01-08 15:30:39 +01:00
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
2018-01-07 18:17:47 +01:00
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
2018-01-07 18:13:01 +01:00
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-07 14:25:05 +01:00
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
2018-01-05 22:05:02 +01:00
2b8224692e
Merge branch 'master' into navigation
2018-01-03 20:26:24 +01:00
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
2018-01-03 17:02:51 +01:00
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
2018-01-03 15:11:14 +01:00
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2018-01-03 12:33:27 +01:00
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
2018-01-03 12:31:56 +01:00
7a15fc8de5
Merge branch 'master' into navigation
2017-12-29 18:28:23 +01:00
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
2017-12-29 18:16:19 +01:00
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
2017-12-29 18:14:36 +01:00
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
...
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e
2017-12-29 17:59:13 +01:00
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-29 13:39:07 +01:00
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
2017-12-28 23:52:37 +01:00
49eed6e2d1
Version 1.54 WIP
2017-12-28 15:17:35 +01:00
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-26 15:37:31 +01:00
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
2017-12-26 15:36:55 +01:00
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
2017-12-25 22:27:32 +01:00
e916310b2e
Version 1.53
2017-12-25 17:41:41 +01:00
