omar
|
03c8a78f04
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
|
2018-05-25 12:44:56 +02:00 |
|
omar
|
9770c8b21d
|
Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. (#1836)
|
2018-05-25 12:09:14 +02:00 |
|
omar
|
251f178a6f
|
Drag and Drop: Source doesn't report as hovered (at a lower-level). Source disable AllowOverlap flag if any set. (#143)
|
2018-05-24 18:05:50 +02:00 |
|
omar
|
5fd23eeb74
|
Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. (#1835)
|
2018-05-24 17:42:50 +02:00 |
|
omar
|
b88fbd69cc
|
Drag and Drop: BeginDragDropSource(): Offset tooltip position so it is off the mouse cursor, but also closer to it than regular tooltips, and not clamped by viewport. (#1739)
|
2018-05-23 23:19:01 +02:00 |
|
omar
|
09ea376a6a
|
BeginCombo(), BeginMainMenuBar(), BeginChildFrame(): restore modified style at end of Begin instead of End so doesn't affect child windows, BeginTooltip() etc.. (allowed since 7b6b7038c5)
|
2018-05-23 23:05:26 +02:00 |
|
omar
|
002e513b82
|
Added float GetWindowDpiScale(). (#1542, #1676)
|
2018-05-23 18:25:37 +02:00 |
|
omar
|
ed84b2aaeb
|
Viewport, Platform: Fixed a crash if the back-end set the PlatformRequestMove/PlatformRequestSize flags while viewports were disabled (it happened in the SDL back-end, and generally we want to tolerate it to make back-end implementation simpler). (#1542)
|
2018-05-23 18:01:50 +02:00 |
|
omar
|
bef0a13283
|
Examples: Comments about GLSL version not being the same as GL context version. (#1828)
|
2018-05-21 11:28:30 +02:00 |
|
omar
|
663e2c9237
|
Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. (#1827)
|
2018-05-21 10:36:50 +02:00 |
|
ice1000
|
e8a72d3e72
|
Examples: GLFW* Make subsequent window creation possible.
|
2018-05-21 10:34:17 +02:00 |
|
omar
|
bf56b6b9a5
|
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. (#1826)
|
2018-05-21 10:13:21 +02:00 |
|
omar
|
1176460e44
|
Viewport: Fixed using ImGuiConfigFlags_ViewportsNoMerge always showing the Debug window by testing the Active flag as well. (#1542)
|
2018-05-19 20:45:49 +02:00 |
|
omar
|
7c7e96e1aa
|
ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions
|
2018-05-18 23:00:48 +02:00 |
|
omar
|
6c684ae39b
|
Fixed GCC pre-8 build. (#1822) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
|
2018-05-17 18:10:20 +02:00 |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-17 15:03:56 +02:00 |
|
omar
|
64b1645deb
|
Disabled GCC 8.1.0 warnings -Wclass-memaccess (#1822)
|
2018-05-17 14:19:20 +02:00 |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
2018-05-17 14:12:37 +02:00 |
|
omar
|
ede5059e69
|
Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose
|
2018-05-17 10:48:15 +02:00 |
|
omar
|
4c35e00f49
|
Viewport: Made GetWindowViewport() not flag the window as written to.
|
2018-05-16 22:48:54 +02:00 |
|
omar
|
86f8cdbd98
|
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
|
2018-05-16 18:03:37 +02:00 |
|
omar
|
7f960616e0
|
Viewport: When resizing/moving a window using the host OS/WM we attempt to merge back into host viewport. (#1542)
|
2018-05-16 14:34:46 +02:00 |
|
omar
|
1cafdb5b46
|
Viewport: Added GetWindowViewport() to query the current viewport for the current window. Comments. (#1542)
|
2018-05-15 11:04:07 +02:00 |
|
omar
|
640c056602
|
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
|
2018-05-14 23:36:37 +02:00 |
|
omar
|
99ff6fc7e4
|
Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). (#787)
|
2018-05-14 23:07:35 +02:00 |
|
omar
|
e11610d6ff
|
Nav: To keep the navigated item in view we also attempt to scroll the parent window as well as the current window. (#787)
|
2018-05-14 19:50:48 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
Kirill Artemov
|
721ca97d95
|
ImVector: Tweaked reserve() flow to avoid calling MemFree(NULL) which is unnecessary. (#1796)
|
2018-05-14 17:52:29 +02:00 |
|
omar
|
19544629be
|
Examples: OpenGL3: Trying to make the call to glBindSampler optional to make the example code easier to use/share with different context version. (#1806)
|
2018-05-14 17:47:22 +02:00 |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-05-14 13:15:21 +02:00 |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
2018-05-14 12:34:47 +02:00 |
|
omar
|
d7cc4bc317
|
Demo: Tweaked custom rendering custom, added a Thickness drag. Clarified use of vertical/horizontal line. Add a single pixel demo (wowow)
|
2018-05-13 23:42:19 +02:00 |
|
omar
|
3f29ed6fd5
|
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
|
2018-05-13 23:41:43 +02:00 |
|
omar
|
725c13ca68
|
Fix for atof with glibc.
|
2018-05-13 22:43:43 +02:00 |
|
omar
|
2a2bb8970d
|
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
|
2018-05-13 22:31:29 +02:00 |
|
omar
|
ff033f431b
|
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
|
2018-05-13 21:04:07 +02:00 |
|
omar
|
f8ca7f45c4
|
Comments about AddConvexPolyFilled(), PathFillConvex() requiring a clockwise order path. (#1811)
|
2018-05-13 15:55:15 +02:00 |
|
omar
|
e61b224b24
|
Update README.md
|
2018-05-12 19:20:54 +02:00 |
|
omar
|
d53bae4c14
|
Demo: Fixing build due to using INT_MAX, UINT_MAX, LLONG_MAX, ULLONG_MAX.
|
2018-05-12 18:58:59 +02:00 |
|
omar
|
8adbf081af
|
Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!
|
2018-05-12 18:07:22 +02:00 |
|
omar
|
a7a1b3b0a7
|
Demo: Added demo for DragScalar(), InputScalar(), SliderScalar(). (#643)
|
2018-05-12 17:53:34 +02:00 |
|
omar
|
7475c1e7dd
|
Data types: DragScalar: Fixed speed of integer values tweaking with keyboard/gamepad when speed < 1. Enforce min/max bounds when power curves are used. SliderScalar: Fixed integer/slow tweaking. (#643)
|
2018-05-12 17:39:34 +02:00 |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-11 22:22:41 +02:00 |
|
omar
|
fc7fc83f9e
|
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
|
2018-05-11 19:27:27 +02:00 |
|
omar
|
0dc18a6ca6
|
Documentation tweaks, comments
|
2018-05-11 16:54:50 +02:00 |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
2018-05-11 16:48:50 +02:00 |
|
omar
|
090eb437ed
|
Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. (#1542)
|
2018-05-11 16:41:43 +02:00 |
|
omar
|
d574604a5d
|
Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. (#1542)
|
2018-05-11 16:41:03 +02:00 |
|
omar
|
14f575ff76
|
Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. (#1804)
|
2018-05-10 14:31:04 +02:00 |
|
omar
|
6eacddb50f
|
Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. (#1542)
|
2018-05-10 13:10:04 +02:00 |
|