omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-26 15:37:31 +01:00 |
|
omar
|
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 |
|
Branimir Karadžić
|
149523a101
|
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
|
2017-12-25 22:27:32 +01:00 |
|
omar
|
9511f22e8b
|
Demo: Console: More friendly to text color changes.
|
2017-12-25 18:47:44 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
3d48f5b8c2
|
Demo: BeginCombo() demo code
|
2017-12-25 17:41:02 +01:00 |
|
omar
|
ed2105d4a2
|
Merge branch 'master' into navigation
|
2017-12-25 16:45:27 +01:00 |
|
omar
|
3849bb4470
|
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
|
2017-12-25 16:03:58 +01:00 |
|
omar
|
78f48bb795
|
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
|
2017-12-25 14:54:54 +01:00 |
|
omar
|
de5c304b49
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-24 18:59:40 +01:00 |
|
omar
|
8d54b1b7af
|
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
|
2017-12-24 18:59:14 +01:00 |
|
omar
|
3a4a2bb27c
|
Examples: Vulkan: Tweak
|
2017-12-24 18:49:19 +01:00 |
|
omar
|
ce13426a1a
|
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
|
2017-12-24 18:45:11 +01:00 |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
2017-12-24 18:16:22 +01:00 |
|
omar
|
cead207535
|
Comments
|
2017-12-24 17:58:41 +01:00 |
|
omar
|
67191badc2
|
Merge branch 'master' into navigation
|
2017-12-23 23:10:41 +01:00 |
|
omar
|
bb8dfe4a34
|
Fixed incorrect IM_DELETE macro (9cda86d55a) (#1517, #484, #504)
|
2017-12-23 23:10:26 +01:00 |
|
omar
|
b1930c5672
|
Merge branch 'master' into navigation
|
2017-12-23 20:37:53 +01:00 |
|
omar
|
e9ceef4762
|
ImVector: Revert 6172e93272 actually problematic with our current use (because we don't construct the instances).
|
2017-12-23 20:37:36 +01:00 |
|
omar
|
6c63c7a8b1
|
Various zealous warning fixes (thanks Clang). (Navigation branch)
|
2017-12-23 16:40:12 +01:00 |
|
omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
2017-12-23 16:27:48 +01:00 |
|
omar
|
d976e4ea23
|
Internals: Missing IM_DELETE usage (#1517)
|
2017-12-23 16:27:16 +01:00 |
|
omar
|
9cda86d55a
|
Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
|
2017-12-23 16:24:33 +01:00 |
|
omar
|
a5739a0aa3
|
Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type (#1184)
|
2017-12-23 15:28:49 +01:00 |
|
omar
|
983d8f5f8e
|
Various zealous warning fixes (Clang).
|
2017-12-23 15:28:49 +01:00 |
|
omar
|
53b24ff79a
|
Removed reliance on ImU64 type for the ImDrawList assert. (#1184)
|
2017-12-23 15:02:36 +01:00 |
|
omar
|
69879dd4f3
|
ImVector: Spacing.
|
2017-12-23 14:55:22 +01:00 |
|
omar
|
8e8b5498f7
|
ImVector: insert() uses grow_capacity() - had inconsistent resize policy
|
2017-12-23 14:51:28 +01:00 |
|
omar
|
6172e93272
|
ImVector: Added assignments and = operators + comments.
|
2017-12-23 14:49:23 +01:00 |
|
omar
|
b263bc5689
|
Examples: DirectX: Using IM_ARRAYSIZE()
|
2017-12-23 14:07:27 +01:00 |
|
omar
|
1f26652944
|
Various zealous warning fixes (thanks Clang).
|
2017-12-23 14:07:03 +01:00 |
|
omar
|
cf9b893841
|
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
|
2017-12-23 13:40:01 +01:00 |
|
omar
|
1c1e490316
|
Merge branch 'master' into navigation
|
2017-12-22 20:21:54 +01:00 |
|
omar
|
46dcd9aa50
|
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() (#125)
|
2017-12-22 20:21:35 +01:00 |
|
omar
|
471bcf8b5e
|
Columns: Fixed dragging when using a same of columns multiple times in the frame. (#125)
|
2017-12-22 20:21:02 +01:00 |
|
omar
|
e1a103b251
|
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. (#143)
|
2017-12-22 20:20:52 +01:00 |
|
omar
|
8d21ee56d2
|
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 (#1519)
|
2017-12-22 20:19:48 +01:00 |
|
omar
|
287380261c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-21 19:55:21 +01:00 |
|
omar
|
c8c872c753
|
Internals: String functions uses size_t in their signature
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
996dfb21cf
|
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
d139bd088d
|
Begin: Moved modal darkening draw block
|
2017-12-21 19:49:54 +01:00 |
|
omar
|
14cb8177d0
|
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
|
2017-12-21 19:01:53 +01:00 |
|
omar
|
531c11d5c7
|
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
|
2017-12-21 18:52:34 +01:00 |
|
omar
|
230f826ef5
|
ImDrawList: Comments
|
2017-12-21 18:48:09 +01:00 |
|
omar
|
4c2514dc29
|
Merge branch 'master' into navigation
|
2017-12-21 11:18:42 +01:00 |
|
omar
|
6193f46af2
|
Active Modal window always set the WantCaptureKeyboard flag (#744)
|
2017-12-21 11:18:30 +01:00 |
|
omar
|
b366dd9322
|
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
|
2017-12-20 17:40:58 +01:00 |
|
omar
|
7fed4eb82d
|
Merge branch 'ibachar-master'
|
2017-12-20 16:25:21 +01:00 |
|
omar
|
55c0d2b9ab
|
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (#1506, #1508)
|
2017-12-20 16:25:03 +01:00 |
|
ibachar
|
abaf347deb
|
Added a flag for text input to disable undo / redo
|
2017-12-17 15:27:56 +02:00 |
|