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 |
|
omar
|
b1d90b565d
|
Columns: Fixed previous commit (wrong chunk commited) (#125)
|
2017-12-15 17:09:41 +01:00 |
|
omar
|
b9391d1692
|
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
|
2017-12-15 17:06:47 +01:00 |
|
omar
|
6497f5dc1b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-15 11:59:50 +01:00 |
|
omar
|
0c6e260f73
|
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143)
|
2017-12-15 11:17:21 +01:00 |
|
omar
|
6effcf21d6
|
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. (#143)
|
2017-12-15 11:17:21 +01:00 |
|
omar
|
51433e26af
|
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143)
|
2017-12-15 10:15:51 +01:00 |
|
omar
|
eefea0588a
|
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (#1380, #1502)
|
2017-12-14 18:42:41 +01:00 |
|
Branimir Karadžić
|
ac8e708c3e
|
Fixed unused variable warning.
|
2017-12-14 18:14:43 +01:00 |
|
omar
|
07ed9f8451
|
TODO list update
|
2017-12-14 11:08:16 +01:00 |
|
omar
|
fa68cb5364
|
Demo: Console: Tweak.
|
2017-12-13 23:07:07 +01:00 |
|
omar
|
45bca7851d
|
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382)
|
2017-12-13 22:30:16 +01:00 |
|
omar
|
5f39758202
|
Minor tweaks, comments, spacing fixes
|
2017-12-13 22:21:49 +01:00 |
|
omar
|
cc3192f347
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-12-13 22:09:08 +01:00 |
|
omar
|
f265e16b84
|
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
This reverts commit 7ac1583411.
|
2017-12-13 22:07:18 +01:00 |
|
omar
|
3905816082
|
Added ShowFontSelector(), ShowStyleSelector(). (#707)
|
2017-12-13 21:59:16 +01:00 |
|
omar
|
ddbcda8c1b
|
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
|
2017-12-13 21:51:23 +01:00 |
|
omar
|
ba71e1c0e4
|
Columns: Minor stylistic fixes. (#125)
|
2017-12-13 21:48:56 +01:00 |
|
omar
|
f7c5f420e7
|
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. (#1500)
|
2017-12-13 19:45:03 +01:00 |
|
omar
|
e8e84a6ad6
|
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
|
2017-12-13 19:26:04 +01:00 |
|
omar
|
4ae5c7e227
|
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)
|
2017-12-13 19:21:21 +01:00 |
|
omar
|
b016215c80
|
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
|
2017-12-13 19:07:09 +01:00 |
|
omar
|
3a31a75e3b
|
Columns: Refactor: Renamed all members. (#125, #1499)
|
2017-12-13 18:42:06 +01:00 |
|
omar
|
78320aa633
|
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
|
2017-12-13 18:41:51 +01:00 |
|
omar
|
027ffd91ea
|
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
|
2017-12-12 23:49:04 +01:00 |
|
omar
|
16fb58984f
|
Merge branch 'master' into navigation
|
2017-12-12 23:41:48 +01:00 |
|
omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
2017-12-12 23:41:20 +01:00 |
|
omar
|
8b59ed0708
|
Drag and Drop: Exposed some internals.
|
2017-12-12 23:37:27 +01:00 |
|
omar
|
90788a1242
|
ImVector: Added ImVector::contains() helper
|
2017-12-12 23:36:42 +01:00 |
|
omar
|
7c7a7baf76
|
Merged miscellaneous small stuff (from nav/dock branches).
|
2017-12-12 23:36:25 +01:00 |
|
omar
|
b174fcc9af
|
Added IsAnyWindowFocused() (from Nav branch).
|
2017-12-12 23:35:04 +01:00 |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2017-12-12 20:44:12 +01:00 |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
2017-12-12 20:39:52 +01:00 |
|
omar
|
ab049c6fc0
|
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-12-12 20:34:16 +01:00 |
|
omar
|
7faa5b16bb
|
Tweak
|
2017-12-12 19:15:00 +01:00 |
|
omar
|
3ea5e67ba2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-12-12 18:47:23 +01:00 |
|
omar
|
02e0a078f4
|
Begin: Tidying up code to make it more readable.
|
2017-12-12 18:46:42 +01:00 |
|
omar
|
28bbf1ade6
|
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
|
2017-12-12 18:45:57 +01:00 |
|
omar
|
d561a43a4d
|
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. (#143)
|
2017-12-12 18:17:37 +01:00 |
|
Branimir Karadžić
|
ef1a683ebe
|
Removed use of obsolete ImGui API.
|
2017-12-12 17:59:09 +01:00 |
|
omar
|
e98df91dc4
|
Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707)
|
2017-12-12 15:44:22 +01:00 |
|
omar
|
7ec934f439
|
Drag and Drop: Comments
|
2017-12-12 15:33:26 +01:00 |
|
omar
|
052b6021dd
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-12-12 15:02:05 +01:00 |
|
omar
|
0a3db267c3
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2017-12-12 14:58:53 +01:00 |
|