ed2105d4a2
Merge branch 'master' into navigation
omar2017-12-25 16:45:27 +01:00
3849bb4470
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
omar2017-12-25 16:03:58 +01:00
78f48bb795
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
omar2017-12-25 14:54:54 +01:00
de5c304b49
Merge branch 'master' into navigation
omar2017-12-24 18:59:40 +01:00
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
omar2017-12-24 18:59:14 +01:00
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
omar2017-12-24 18:45:11 +01:00
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
omar2017-12-24 18:16:22 +01:00
b1930c5672
Merge branch 'master' into navigation
omar2017-12-23 20:37:53 +01:00
e9ceef4762
ImVector: Revert 6172e93272 actually problematic with our current use (because we don't construct the instances).
omar2017-12-23 20:37:36 +01:00
b263bc5689
Examples: DirectX: Using IM_ARRAYSIZE()
omar2017-12-23 14:07:27 +01:00
1f26652944
Various zealous warning fixes (thanks Clang).
omar2017-12-23 14:07:03 +01:00
cf9b893841
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
omar2017-12-23 13:40:01 +01:00
1c1e490316
Merge branch 'master' into navigation
omar2017-12-22 20:21:54 +01:00
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() (#125)
omar2017-12-22 19:45:15 +01:00
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. (#125)
omar2017-12-22 19:35:58 +01:00
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)
omar2017-12-22 13:41:41 +01:00
287380261c
Merge branch 'master' into navigation
omar2017-12-21 19:55:21 +01:00
c8c872c753
Internals: String functions uses size_t in their signature
omar2017-12-21 13:43:09 +01:00
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
omar2017-12-21 19:48:51 +01:00
d139bd088d
Begin: Moved modal darkening draw block
omar2017-12-21 19:27:06 +01:00
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.
omar2017-12-21 19:01:53 +01:00
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.
omar2017-12-21 18:50:27 +01:00
4c2514dc29
Merge branch 'master' into navigation
omar2017-12-21 11:18:42 +01:00
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag (#744)
omar2017-12-21 11:18:30 +01:00
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
omar2017-12-20 17:40:58 +01:00
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
omar2017-12-15 15:44:27 +01:00
6497f5dc1b
Merge branch 'master' into navigation
omar2017-12-15 11:59:50 +01:00
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143)
omar2017-12-15 11:16:10 +01:00
6effcf21d6
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. (#143)
omar2017-12-15 11:09:18 +01:00
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143)
omar2017-12-15 10:15:51 +01:00
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)
omar2017-12-14 18:42:41 +01:00
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382)
omar2017-12-13 22:30:16 +01:00
5f39758202
Minor tweaks, comments, spacing fixes
omar2017-12-13 22:21:49 +01:00
cc3192f347
Merge branch 'master' into navigation
omar2017-12-13 22:09:08 +01:00
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.
omar2017-12-13 22:05:48 +01:00
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
omar2017-12-13 21:51:23 +01:00
ba71e1c0e4
Columns: Minor stylistic fixes. (#125)
omar2017-12-13 21:48:56 +01:00
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)
omar2017-12-13 19:44:54 +01:00
e8e84a6ad6
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
omar2017-12-13 19:26:04 +01:00
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)
omar2017-12-13 19:21:21 +01:00
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
omar2017-12-13 19:07:09 +01:00
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
omar2017-12-13 18:37:58 +01:00
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).
omar2017-12-12 23:49:04 +01:00
16fb58984f
Merge branch 'master' into navigation
omar2017-12-12 23:41:48 +01:00
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
omar2017-12-12 23:41:20 +01:00
8b59ed0708
Drag and Drop: Exposed some internals.
omar2017-12-12 23:37:27 +01:00
3ea5e67ba2
Merge branch 'master' into navigation
omar2017-12-12 18:47:23 +01:00
02e0a078f4
Begin: Tidying up code to make it more readable.
omar2017-12-12 18:46:42 +01:00
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
omar2017-12-12 18:45:57 +01:00
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)
omar2017-12-12 18:17:18 +01:00
08b72eb5c0
IsWindowFocused() refactor will flags. (#1382) Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow). Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
omar2017-12-12 14:06:24 +01:00
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)
omar2017-12-11 23:16:27 +01:00
omar