omar
|
3b9b1956cd
|
Merge branch 'master' into viewport
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
|
2018-04-25 15:32:04 +02:00 |
|
Bruce Mitchener
|
7ebdadf92b
|
Fix various typos.
|
2018-04-25 09:40:14 +02:00 |
|
omar
|
dc03c93164
|
Internals: Removed misleading ImRect::FixInverted + fix minor formatting in Readme.
Demo: Fixed Overlay: Added a context menu item to enable freely moving the window.
|
2018-04-24 14:19:10 +02:00 |
|
omar
|
7b6b7038c5
|
Window: Relaxed the internal stack size checker to allow Push/Begin/Pop/.../End patterns to be used with PushStyleColor, PushStyleVar, PushFont without causing a false positive assert. (#1767)
|
2018-04-23 17:58:49 +02:00 |
|
omar
|
22773e03a2
|
InputText: On Mac OS X, support Cmd+Shift+Z for Redo. Cmd+Y is also supported as major apps seems to default to support both. (#1765)
|
2018-04-23 11:15:13 +02:00 |
|
omar
|
037d5a7e98
|
Columns: Fixed a bug introduced in 1.51 where columns would affect the contents size of their container, often creating feedback loops when ImGuiWindowFlags_AlwaysAutoResize was used. (#1760)
|
2018-04-20 16:03:21 +02:00 |
|
omar
|
49a451d247
|
Window: Fixed windows using the ImGuiWindowFlags_NoSavedSettings flag from not using the same default position as other windows. (#1760)
|
2018-04-20 15:40:12 +02:00 |
|
omar
|
f93dce9513
|
InputText: Tweak to make the if statement more readable + update Changelog (#1747)
|
2018-04-19 16:21:32 +02:00 |
|
omar
|
bcac02809f
|
Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.
|
2018-04-18 21:55:12 +02:00 |
|
omar
|
3913297384
|
Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).
|
2018-04-18 21:51:14 +02:00 |
|
omar
|
1c385c2ca4
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui_internal.h
|
2018-04-18 19:06:49 +02:00 |
|
omar
|
6d6f4a85f6
|
Fixed DisplaySafeAreaPadding not affecting popups/tooltips/menus at it should have (partly broken in 2e5577f44f).
|
2018-04-18 17:40:38 +02:00 |
|
omar
|
6a0b2627ad
|
BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. (#1439)
|
2018-04-18 17:37:35 +02:00 |
|
omar
|
7241dc61d4
|
Fixed default proportional item width lagging by one frame on resize + miscellaneous minor tweaks.
|
2018-04-17 23:36:59 +02:00 |
|
daniel-murray
|
83d97d4a9b
|
Fix typos KeyDown => KeysDown
|
2018-04-14 10:28:10 +02:00 |
|
omar
|
e25da4230b
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-04-11 21:25:44 +02:00 |
|
omar
|
84fe711bdf
|
Settings: Fixed saving an empty .ini file if CreateContext/DestroyContext are called without a single call to NewFrame(). (#1741)
|
2018-04-11 10:08:23 +02:00 |
|
omar
|
9117632bf0
|
Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
|
2018-04-09 20:42:49 +02:00 |
|
omar
|
56ad2a2d74
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
|
2018-04-09 19:35:14 +02:00 |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
2018-04-09 14:02:32 +02:00 |
|
omar
|
3a29ddbcfa
|
Version 1.60
|
2018-04-08 00:45:02 +02:00 |
|
omar
|
f421e73b40
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2018-04-06 23:36:23 +02:00 |
|
omar
|
c2fc978983
|
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) (#707)
|
2018-04-06 23:25:25 +02:00 |
|
omar
|
2464e62a1a
|
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
|
2018-04-06 19:36:13 +02:00 |
|
omar
|
72b7f48870
|
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
|
2018-04-06 18:12:21 +02:00 |
|
omar
|
0cad274b87
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
2018-04-04 19:39:42 +02:00 |
|
omar
|
fc30462f18
|
Hide new windows for one frame until they calculate their size. Also fixes SetNextWindowPos() given a non-zero pivot. (#1694)
|
2018-04-04 19:35:08 +02:00 |
|
omar
|
4649967112
|
Added extra comments and assertions to avoid user combining ImGuiCond flags. (#1694)
|
2018-04-04 15:01:01 +02:00 |
|
omar
|
c19b27813d
|
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well.
|
2018-03-22 18:58:40 +01:00 |
|
omar
|
c796960ff9
|
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011)
|
2018-03-22 17:49:53 +01:00 |
|
omar
|
200754b013
|
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. (#1202) [@PhilCK]
|
2018-03-20 22:42:05 +01:00 |
|
omar
|
94116f1143
|
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. (#1202) [@PhilCK]
|
2018-03-20 22:41:05 +01:00 |
|
omar
|
172570acae
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
|
2018-03-20 22:14:34 +01:00 |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
2018-03-20 21:19:23 +01:00 |
|
omar
|
dcf7c3d188
|
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542)
|
2018-03-20 20:39:44 +01:00 |
|
omar
|
170f44e6f0
|
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787)
|
2018-03-20 20:12:34 +01:00 |
|
omar
|
fe5347ef94
|
imconfig: Added IMGUI_STB_TRUETYPE_FILENAME, IMGUI_STB_RECT_PACK_FILENAME + documenting IMGUI_DISABLE_STB_XXX flags and hiding IMGUI_STB_NAMESPACE which is misleading.
Fixed typos in todo list.
|
2018-03-20 18:25:37 +01:00 |
|
omar
|
ccc9a22db3
|
Viewport: Changelog + Internals: Renamed viewport mouse fields for consistency (going to add more). (#1542)
|
2018-03-19 22:59:55 +01:00 |
|
omar
|
1e296453ef
|
ImDrawList: Added Clone() helper function.
|
2018-03-17 21:18:14 +01:00 |
|
omar
|
e7670c0bcc
|
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707)
|
2018-03-12 11:48:04 +01:00 |
|
omar
|
351b3fa7b0
|
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
|
2018-03-09 10:29:41 +01:00 |
|
omar
|
1ef1acbd8d
|
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
|
2018-03-08 16:47:41 +01:00 |
|
omar
|
642c6748ac
|
Comments, Changelog
|
2018-03-08 11:15:27 +01:00 |
|
omar
|
a1f3949d71
|
Drag and Drop: Increased payload data type to 32 characters. (#143)
|
2018-03-08 10:42:51 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
2018-03-03 20:08:03 +01:00 |
|
omar
|
1549c5cf5e
|
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
|
2018-03-03 19:43:31 +01:00 |
|
omar
|
b3594a6407
|
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
|
2018-02-28 21:16:47 +01:00 |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
omar
|
bd267ad739
|
Changelog: Added all change infos since 1.53 up to the current version.
|
2018-02-25 14:15:38 +01:00 |
|
omar
|
133f06d658
|
Changelog: Added Changelog with info from 1.48 to 1.53. Haven't added 1.53..current yet.
|
2018-02-25 14:15:37 +01:00 |
|