omar
|
e6bc840f6f
|
Merge branch 'master' into examples_refactor
|
2018-02-23 10:47:32 +01:00 |
|
omar
|
8040cf1425
|
Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master
|
2018-02-22 23:22:16 +01:00 |
|
Podgorskiy
|
94466745bb
|
A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call.
ab_lenSqr -> ab_len_sqr
Moved line where ab_len_sqr is computed after the first return
|
2018-02-22 10:57:20 -05:00 |
|
omar
|
b28995b667
|
Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h (#1640)
|
2018-02-22 15:39:49 +01:00 |
|
omar
|
91cadc1130
|
Merge branch 'master' into examples_refactor
|
2018-02-21 22:47:03 +01:00 |
|
omar
|
2c3c5125b3
|
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. (#143, #1637)
|
2018-02-21 21:33:58 +01:00 |
|
omar
|
bcdfd5d61c
|
Merge branch 'master' into examples_refactor
|
2018-02-20 16:18:02 +01:00 |
|
omar
|
7cbcccd96b
|
Update Breaking Change section with moved misc/fonts/ (#1631)
|
2018-02-20 12:08:37 +01:00 |
|
omar
|
7ee2bc8f5e
|
FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. (#1397)
|
2018-02-20 10:24:31 +01:00 |
|
omar
|
b33f0e215f
|
Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization.
|
2018-02-18 23:28:56 +01:00 |
|
omar
|
45cbebad64
|
Added dummy io.DisplayPos field.
|
2018-02-18 21:04:17 +01:00 |
|
omar
|
1399c9c8a9
|
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
|
2018-02-18 20:21:21 +01:00 |
|
omar
|
bdb27366e7
|
Nav: Tweak windowing highlighting for full viewport windows.
|
2018-02-17 00:19:04 +01:00 |
|
omar
|
63332d152a
|
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599)
Examples: Updated examples.
|
2018-02-16 19:18:16 +01:00 |
|
omar
|
20c14f9589
|
Fixed GCC zealous warnings (#1623)
|
2018-02-16 15:43:28 +01:00 |
|
omar
|
1cbfe0700c
|
Plot: plot a flat line if scale_min==scale_max (#1621)
|
2018-02-16 14:34:49 +01:00 |
|
omar
|
eb1d481915
|
Comments (#1230, #1611)
|
2018-02-12 15:38:04 +01:00 |
|
omar
|
d8d1da27fd
|
Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master
|
2018-02-12 15:35:16 +01:00 |
|
Randy Gaul
|
2c4a761982
|
__cdecl markup for non-standard calling conventions via MSVC
|
2018-02-12 00:50:40 -08:00 |
|
omar
|
64e0666803
|
Internals: Moved some of NewFrame() into UpdateMovingWindow().
|
2018-02-11 22:48:30 +01:00 |
|
omar
|
7cc1bc7635
|
Added IsAnyMouseDown() helper.
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
|
2018-02-10 16:50:19 +01:00 |
|
omar
|
3b163ac35b
|
Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.)
|
2018-02-08 23:11:51 +01:00 |
|
omar
|
d17d21da1b
|
Warning fix. (#1565)
|
2018-02-06 20:21:29 +01:00 |
|
omar
|
7c16d52f72
|
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)
|
2018-02-06 20:20:34 +01:00 |
|
omar
|
f0364aa359
|
Merge branch 'context'
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
2018-02-06 20:16:03 +01:00 |
|
omar
|
4e5b7612ae
|
Nav: Documentation tweaks. (#787)
|
2018-02-06 20:10:05 +01:00 |
|
omar
|
3171f90a1a
|
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787)
|
2018-02-06 19:54:30 +01:00 |
|
omar
|
7e32fc7109
|
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787)
|
2018-02-06 19:23:12 +01:00 |
|
omar
|
ed4bbc4fd4
|
Nav: Comments, guides.
|
2018-02-06 18:48:31 +01:00 |
|
omar
|
cea8017e0b
|
Merge branch 'master' into context
|
2018-02-06 18:04:44 +01:00 |
|
omar
|
db071184a0
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-02-06 13:51:09 +01:00 |
|
omar
|
b50dce54ea
|
Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (#1597, #143)
|
2018-02-06 13:46:14 +01:00 |
|
omar
|
c6ba7c8231
|
Internals: TreeNode: Renaming local to be more consistent with other widgets.
|
2018-02-06 13:41:46 +01:00 |
|
omar
|
e6926d9f7c
|
Internals: Refactored bool LastItemRectHovered into flags. (#1597)
|
2018-02-06 13:34:41 +01:00 |
|
omar
|
ce2b8d3255
|
Nav: Comments, removed extraneous parameter.
|
2018-02-06 13:16:44 +01:00 |
|
omar
|
0c0d811859
|
Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787)
|
2018-02-05 23:53:40 +01:00 |
|
omar
|
fb9fecea5e
|
Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. (#787)
|
2018-02-05 20:16:38 +01:00 |
|
omar
|
4932303e62
|
Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
|
2018-02-05 20:15:31 +01:00 |
|
omar
|
e5e3cc617e
|
Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
|
2018-02-05 19:37:29 +01:00 |
|
omar
|
fb7cf4a475
|
Nav: Removed old unnecessary ifdefs.
|
2018-02-05 18:25:03 +01:00 |
|
omar
|
f35734c925
|
Nav: Debugging code. (#787)
|
2018-02-05 17:02:30 +01:00 |
|
omar
|
92ee6b1185
|
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787)
|
2018-02-05 16:07:54 +01:00 |
|
omar
|
348c46d21e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-02-05 15:50:28 +01:00 |
|
omar
|
11d0fc8220
|
Tooltip: BeginTooltip() sets NoInputs flag.
|
2018-02-05 15:10:07 +01:00 |
|
omar
|
1dedbf8091
|
Style: Fixed missing style.MouseCursorScale initialization (#939), messed up original commit badly.
|
2018-02-05 15:07:25 +01:00 |
|
omar
|
533fe8cb55
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-02-05 14:55:57 +01:00 |
|
omar
|
8ad88f725c
|
Nav: Minor tidying up. (#787)
|
2018-02-05 14:53:22 +01:00 |
|
omar
|
3f297e74e4
|
Merging the minor/shallow changes from Navigation branch.
|
2018-02-05 14:52:28 +01:00 |
|
omar
|
2081fc15b5
|
Added assert in BeginChild(ImGuiId id).
|
2018-02-05 13:42:34 +01:00 |
|
omar
|
223be68d77
|
Nav: Debugging stuff.
|
2018-02-05 13:42:33 +01:00 |
|