omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2019-05-06 10:16:43 +02:00 |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
2019-05-06 10:02:59 +02:00 |
|
omar
|
526e2303bc
|
Window: Fixed SetNextWindowSizeConstraints() with non-rounded positions making windows drift. (#2067, #2530)
|
2019-05-03 19:09:44 +02:00 |
|
omar
|
9c1f02a42c
|
Misc: Made IMGUI_CHECKVERSION() macro also check for matching size of ImDrawIdx.
|
2019-05-03 18:42:53 +02:00 |
|
omar
|
2dc81057ec
|
Selectable: With ImGuiSelectableFlags_AllowDoubleClick doesn't return true on the mouse button releas efollowing the double-click. Only first mouse release + second mouse down (double-click) returns true. Likewise for internal ButtonBehavior() with both _PressedOnClickRelease | _PressedOnDoubleClick. (#2503)
|
2019-05-03 14:31:12 +02:00 |
|
omar
|
86f92fe756
|
Demo: Improved trees in columns demo. (#2136)
|
2019-05-02 21:32:36 +02:00 |
|
omar
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
2019-05-02 14:56:47 +02:00 |
|
Max Thrun
|
7c6ba3a1da
|
ImDrawCallback_ResetRenderState: Added Metal.
|
2019-04-30 22:18:25 +02:00 |
|
omar
|
5c1cd5c8c7
|
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
2019-04-30 22:15:59 +02:00 |
|
omar
|
3fbc0b7a9e
|
Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.
|
2019-04-29 18:33:08 +02:00 |
|
omar
|
db2d58a68b
|
Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). (#2521)
|
2019-04-29 16:34:02 +02:00 |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-29 13:06:55 +02:00 |
|
omar
|
0f2852806c
|
Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)
|
2019-04-29 12:44:17 +02:00 |
|
omar
|
842a720e72
|
Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).
|
2019-04-28 22:33:58 +02:00 |
|
omar
|
bda2cde68e
|
Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517)
Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.
|
2019-04-28 22:18:51 +02:00 |
|
omar
|
61d92580aa
|
Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active.
|
2019-04-26 23:32:29 +02:00 |
|
omar
|
c5d83d8af2
|
Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.
|
2019-04-26 23:31:31 +02:00 |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
2019-04-25 17:53:11 +02:00 |
|
omar
|
56c3aaf6bd
|
Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
|
2019-04-25 17:50:40 +02:00 |
|
omar
|
4dc4ace864
|
Window: Fixed window with the AlwaysAutoResize flag unnecessarily extending their hovering boundaries by a few pixels (this is used to facilitate resizing from borders when available for a given window). One of the noticeable minor side effect was that navigating menus would have had a tendency to disable highlight from parent menu items earlier than necessary while approaching the child menu.
+ Changelog fixed unfinished sentence and tweaks,
|
2019-04-25 11:50:28 +02:00 |
|
omar
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
2019-04-23 12:38:59 +02:00 |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-04-19 19:52:45 +02:00 |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
2019-04-18 18:29:28 +02:00 |
|
omar
|
0e46d65b03
|
Misc: Fixed PushItemWidth(-width) (for right-side alignment) laying out certain items (button, listbox, etc.) with negative sizes if the 'width' argument was smaller than the available width at the time of item submission,
|
2019-04-18 15:46:13 +02:00 |
|
omar
|
240dddff87
|
Combo, Slider: Improve rendering in situation when there's there's very little space available.
|
2019-04-18 15:46:12 +02:00 |
|
omar
|
1d3ebef364
|
Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
|
2019-04-17 21:51:13 +02:00 |
|
omar
|
7baf45cffa
|
Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
|
2019-04-16 22:02:56 +02:00 |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-04-16 13:14:10 +02:00 |
|
omar
|
742b5f4c68
|
Merged a bunch of small changes from Docking branch to reduce the difference between branches.
Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.
|
2019-04-16 13:07:43 +02:00 |
|
omar
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
2019-04-15 18:47:36 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
35cbf9c052
|
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
2019-04-15 01:28:44 +02:00 |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-13 18:53:00 +02:00 |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
2019-04-12 22:16:59 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
bd351e9ac5
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
2019-04-05 20:20:08 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
2019-04-04 23:40:28 +02:00 |
|
omar
|
4f54a527ab
|
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071)
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
66f4be2e13
|
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. (#2461, #2348, #2378, #2097, #2071, #1677)
|
2019-04-04 22:27:29 +02:00 |
|
omar
|
54b8a65d9e
|
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071)
|
2019-04-04 22:12:15 +02:00 |
|
omar
|
317859a3da
|
Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). (#2071)
|
2019-04-04 22:11:13 +02:00 |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
2019-04-04 22:10:18 +02:00 |
|
omar
|
1c3311e4d6
|
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
|
2019-04-04 22:09:26 +02:00 |
|
omar
|
cdb109f617
|
Renamed freeglut vcxproj files + Comments, Changelog (#2465)
|
2019-04-03 16:25:35 +02:00 |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
2019-04-03 11:17:26 +02:00 |
|
omar
|
01e29a3933
|
InputText: Fixed ImGuiInputTextFlags_AllowTabInput leading to two tabs characters being inserted if the back-end provided both Key and Character input. (#2467, #1336)
|
2019-04-03 10:45:51 +02:00 |
|
omar
|
4a57507f75
|
InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336)
Not using isprint. + todo items.
|
2019-04-03 10:40:14 +02:00 |
|
omar
|
3a737e665a
|
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
|
2019-04-02 10:36:35 +02:00 |
|
omar
|
e21bbee311
|
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. (#2454)
|
2019-03-29 18:32:57 +01:00 |
|
omar
|
512d39d031
|
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
|
2019-03-29 16:17:30 +01:00 |
|
omar
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-03-28 15:48:25 +01:00 |
|
omar
|
20188b19d6
|
Comments (#2441) + Freeglut fixes (#2430)
|
2019-03-26 12:16:23 +01:00 |
|
omar
|
cf1b02e54e
|
Rearrange code in UpdateMouseWheel(). (#2424, #1463) + Fix old io.FontAllowUserScaling feature (probably should be made obsolete, but until then best fixed)
|
2019-03-25 19:40:19 +01:00 |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2019-03-25 16:08:09 +01:00 |
|
omar
|
3d8ea352d1
|
InputText: Fixed selection background starts rendering one frame after the cursor movement when first transitioning from no-selection to has-selection. (Bug in 1.69) (#2436) [@Nazg-Gul]
|
2019-03-25 16:06:30 +01:00 |
|
omar
|
857381b9ca
|
GetMouseDragDelta(): also returns the delta on the mouse button released frame. Verify that mouse positions are valid otherwise returns zero. Removed obsolete comment. Tweaked demo. (#2419)
|
2019-03-15 15:03:37 +01:00 |
|
omar
|
ff03ae503b
|
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421)
|
2019-03-15 13:09:07 +01:00 |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
2019-03-15 13:07:30 +01:00 |
|
omar
|
b1af4d36ce
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
2019-03-13 15:30:35 +01:00 |
|
omar
|
55c02099c5
|
Version 1.69, comments, typos
|
2019-03-13 15:29:43 +01:00 |
|
omar
|
53e0c13be2
|
TabBar: Reworked scrolling policy (when ImGuiTabBarFlags_FittingPolicyScroll is set) to teleport the view when aiming at a tab far away the visible section, and otherwise accelerate the scrolling speed to cap the scrolling time to 0.3 seconds.
|
2019-03-12 20:57:02 +01:00 |
|
omar
|
99d8425173
|
TabBar: Fixed Tab tooltip code making drag and drop tooltip disappear during the frame where the drag payload activate a tab.
|
2019-03-12 18:56:19 +01:00 |
|
omar
|
9afb849e16
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
|
2019-03-12 18:28:47 +01:00 |
|
omar
|
cfa8f672f6
|
Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) (#2416)
|
2019-03-12 18:27:14 +01:00 |
|
omar
|
897badec7a
|
Demo: InputText: Demonstrating use of ImGuiInputTextFlags_CallbackResize. (#2006, #1443, #1008).
|
2019-03-12 11:24:49 +01:00 |
|
omar
|
a92c587c75
|
Added GetGlyphRangesVietnamese() helper. (#2403)
|
2019-03-11 22:02:59 +01:00 |
|
omar
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
2019-03-11 16:08:16 +01:00 |
|
Haldean Brown
|
79bb4ce128
|
Added ImGuiColorEditFlagsFlags_InputHSV. (#2383, #2384)
|
2019-03-08 18:16:41 +01:00 |
|
omar
|
8e0e91827f
|
ColorEdit: Fixed tooltip not honoring the ImGuiColorEditFlags_NoAlpha contract of never reading the 4th float in the array (value was read and discarded). (#2384)
|
2019-03-08 18:16:41 +01:00 |
|
omar
|
d77d3416d3
|
Merge branch 'master' into docking
|
2019-03-07 18:40:55 +01:00 |
|
omar
|
e9651aaa77
|
TabBar: Fixed ImGuiTabItemFlags_SetSelected being ignored if the tab is not visible (with scrolling policy enabled) or if is currently appearing.
|
2019-03-07 17:45:59 +01:00 |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-03-06 21:18:46 +01:00 |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
2019-03-06 18:00:04 +01:00 |
|
omar
|
c779fbb651
|
InputTextWithHint: Fix for Password fields. Update changelog, demo. (#2400)
|
2019-03-06 17:33:24 +01:00 |
|
omar
|
e02d6014bf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-03-05 22:13:38 +01:00 |
|
omar
|
344140004b
|
Fixed IsItemDeactivated()/IsItemDeactivatedAfterEdit() from not correctly returning true when tabbing out of a focusable widget (Input/Slider/Drag) in most situations. (#2215, #1875)
+ Minor renaming of a local variable in widget code.
|
2019-03-05 22:09:25 +01:00 |
|
omar
|
076be7ec41
|
MenuItem, Selectable: Fixed disabled widget interfering with navigation (fix c2db7f63 in 1.67).
|
2019-03-05 19:00:19 +01:00 |
|
omar
|
622a27506a
|
Text: Fixed large Text/TextUnformatted call not declaring its size when starting below the lower point of the current clipping rectangle. Somehow this bug has been there since v1.0! It was hardly noticeable but would affect the scrolling range, which in turn would affect some scrolling request functions when called during the opening frame of a window.
|
2019-03-05 15:23:11 +01:00 |
|
omar
|
ac4842fa17
|
Nav: Fixed Ctrl+Tab keeping active InputText() of a previous window active after the switch. (#2380)
|
2019-03-05 12:03:54 +01:00 |
|
omar
|
8414c0bb09
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-03-04 18:08:19 +01:00 |
|
omar
|
94e794f81b
|
Renamed GetOverlayDrawList() to GetForegroundDrawList() for consistency. Kept redirection function (will obsolete). (#2391)
Demo: Using GetBackgroundDrawList() and GetForegroundDrawList() in "Custom Rendering" demo.
|
2019-03-04 16:35:50 +01:00 |
|
omar
|
96b13760d4
|
Added GetBackgroundDrawList() helper to quickly get access to a ImDrawList that will be rendered behind every other windows. (#2391)
|
2019-03-04 16:10:51 +01:00 |
|
omar
|
49eb5f0280
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
|
2019-03-03 23:34:56 +01:00 |
|
omar
|
beb3062dc5
|
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
|
2019-03-03 23:34:28 +01:00 |
|
omar
|
1c67d09c0b
|
ColorPicker: Fix assertion when running in a collapsed window and dragging its title bar (#2389)
|
2019-03-01 00:06:36 +01:00 |
|
omar
|
1d0b4df3d9
|
Misc: Asserting in NewFrame() if style.WindowMinSize is zero or smaller than (1.0f,1.0f). Internal: ImHash functions tweaks. Added InputText() to query status section.
|
2019-02-28 22:57:22 +01:00 |
|
omar
|
ff0c6c2bde
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-02-27 19:00:09 +01:00 |
|
omar
|
f02705fbaa
|
InputInt, InputScalar: +/- buttons now respects the natural type limits instead of overflowing or underflowing the value.
|
2019-02-27 18:59:17 +01:00 |
|
omar
|
736d3e2654
|
DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. (#643, #320, #708, #1011)
|
2019-02-27 18:16:03 +01:00 |
|
omar
|
6de09a5e48
|
Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. (#2384) [@haldean]
|
2019-02-27 16:45:58 +01:00 |
|
omar
|
75641926e1
|
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
# Conflicts:
# examples/imgui_impl_allegro5.cpp
|
2019-02-27 14:39:41 +01:00 |
|
omar
|
5e3a1de4e6
|
Plot: Fixed divide-by-zero in PlotLines() when passing a count of 1. (#2387) [@Lectem]
|
2019-02-27 14:25:37 +01:00 |
|
omar
|
6b43a314bf
|
Merge branch 'master' into docking
|
2019-02-26 12:53:38 +01:00 |
|
omar
|
cf3cb7cf7e
|
InputText: Fixed various display corruption related to swapping the underlying buffer while a input widget is active (both for writable and read-only paths). Often they would manifest when manipulating the scrollbar of a multi-line input text.
|
2019-02-26 12:50:44 +01:00 |
|
omar
|
8915f7933a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-02-24 23:24:07 +01:00 |
|
omar
|
9558e327d2
|
Log/Capture: Fixed extraneous leading carriage return. Fixed an issue when empty string on a new line would not emit a carriage return.
|
2019-02-23 16:22:55 +01:00 |
|
omar
|
cd67d4d3c1
|
Log/Capture: Fixed LogXXX functions 'auto_open_depth' parameter being treated as an absolute tree depth instead of a relative one. Fixed CollapsingHeader trailing ascii representation being "#" instead of "##". Minor tidying up the of code.
|
2019-02-23 16:07:01 +01:00 |
|