Commit Graph

  • 528b50a89f Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. (#1463, #1380, #1502) omar 2018-07-22 19:04:15 +0200
  • 4b8ce24e46 Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function. omar 2018-07-22 18:57:28 +0200
  • 4ebd442a24 Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958) omar 2018-07-22 18:53:27 +0200
  • e07f5d4c78 Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time. omar 2018-07-22 18:46:41 +0200
  • ec76009bc4 Readme: fixed typo + patron omar 2018-07-22 18:09:44 +0200
  • af38a5c41a Ignore GCC warning (-Wclass-memaccess) in imgui.h (#1959) Elias Daler 2018-07-22 19:05:13 +0300
  • c48a2c7ad2 Use && instead of and in #if Elias Daler 2018-07-22 19:03:04 +0300
  • 8e6bb509ba Add diagnostic push, remove comment about diagnostic and make on if expression for checking GNU's version Elias Daler 2018-07-22 18:57:42 +0300
  • fded746d03 Tweaked Contributing guidelines, Issue and PR templates omar 2018-07-22 17:32:31 +0200
  • 4fcc92fe42 Ignore GCC warning (-Wclass-memaccess) Elias Daler 2018-07-22 17:52:57 +0300
  • 74077491ce Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. (#1542) omar 2018-07-22 16:23:35 +0200
  • 048add5ef2 ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879) omar 2018-07-19 15:22:18 +0200
  • d016ef1825 Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. (#1954) (+1 squashed commits) omar 2018-07-19 12:51:20 +0200
  • db468b560f
    Merge 2ba46428c6 into 93321d3280 Trevor Hickey 2018-07-18 18:46:27 +0000
  • 2ba46428c6
    supress potentially unused identifier Trevor Hickey 2018-07-18 14:46:11 -0400
  • 23b67e6ff5 Merge branch 'master' into viewport omar 2018-07-17 19:52:14 +0200
  • 93321d3280 Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787) omar 2018-07-17 19:48:53 +0200
  • 7e59eb026b Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950) Rokas Kupstys 2018-07-17 18:17:56 +0300
  • 33d92f9240 Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. Rokas Kupstys 2018-07-17 17:23:40 +0300
  • 7b4fbf4301 Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542) omar 2018-07-17 16:37:10 +0200
  • b8b74970d7 Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542) omar 2018-07-17 15:59:09 +0200
  • defbf1c4b3 Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. (#1542) omar 2018-07-17 15:56:02 +0200
  • 16c6734bcb Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. (#1542). Will rework in the context of docking. (+1 squashed commits) + Fixed unused prototype warning (left-over from a merge) omar 2018-07-16 23:39:14 +0200
  • 0c207b7bc9 Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs. omar 2018-07-17 11:33:31 +0200
  • ee98a069f0 Merge branch 'master' into viewport omar 2018-07-16 22:25:36 +0200
  • d3be9185b3 Demo: Fixed spacing from b629f90 change. omar 2018-07-16 22:24:39 +0200
  • 73e13a0762 Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo. omar 2018-07-16 22:17:34 +0200
  • eab0472102
    Merge pull request #1 from ocornut/master Ronen Lapushner 2018-07-16 10:13:30 +0300
  • 6bec31f673
    Fix DisplayFramebufferScale > 1.0 bug on Mac Tiantian Xie 2018-07-15 22:28:38 -0400
  • 56fa2b56ba Making call to glPolygonMode() optional Omar Sherif Fathy 2018-07-13 14:18:07 +0200
  • 66cb0f5984
    removing useless glfw include Omar Sherif Fathy 2018-07-13 13:41:12 +0200
  • ffed96517d
    replace GLFW_INCLUDE_ES3 with direct header Omar Sherif Fathy 2018-07-13 13:13:21 +0200
  • abae6ea6c8
    replace __EMSCRIPTEN_BUILD__ with __EMSCRIPTEN__ Omar Sherif Fathy 2018-07-13 13:10:00 +0200
  • acaecfe797
    Update imgui_impl_opengl3.cpp Omar Sherif Fathy 2018-07-13 13:08:12 +0200
  • abe7b190dc Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. (#1944) omar 2018-07-13 11:25:54 +0200
  • a3e8a60ca6 Add EGL+OpenGLES 3.0 examples Guangli Li 2018-07-13 14:54:15 +0800
  • badde9a970 Demo: Spacing. omar 2018-07-12 11:58:50 +0200
  • b30b82835a Merge branch 'master' into viewport omar 2018-07-12 11:48:49 +0200
  • b629f90393 Demo: Re-ordered example app code to match their menu order and forward declaration order + added header to delimitate them. omar 2018-07-12 11:40:23 +0200
  • d107146687 Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch) omar 2018-07-12 11:19:17 +0200
  • 5e73e969fb Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper. omar 2018-07-12 11:08:24 +0200
  • 88df66ec83 Merge branch 'master' into viewport omar 2018-07-12 10:03:18 +0200
  • 23288547ec Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939) omar 2018-07-12 09:53:10 +0200
  • 59fb3274a7 Examples: include for intptr_t on tdm-gcc + mingw32 (#1936) + mouse buttons comments omar 2018-07-11 12:23:46 +0200
  • aa89c87f35
    Update imgui_impl_opengl3.cpp Omar Sherif Fathy 2018-07-11 08:29:38 +0200
  • 5686284260
    Update imgui_impl_opengl3.cpp Omar Sherif Fathy 2018-07-11 02:18:38 +0200
  • 4e9eab1b2b Add some ifdefs to add emscripten specific params and includes Omar Sherif Fathy 2018-07-11 00:11:45 +0200
  • 9007dff5eb IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211) + shallow changelog tweaks omar 2018-07-10 19:16:57 +0200
  • fff014dfed Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. (#1938, #1900, #1513, #1466, etc.) omar 2018-07-10 18:29:57 +0200
  • b829671df1 Fixed missing value in GetStyleColorName(). (#1939) broken with c7016c2 omar 2018-07-10 16:45:54 +0200
  • de13261f1b OpenGL3: Added error output when shaders fail to compile / link. (#1938) omar 2018-07-10 16:09:34 +0200
  • 4dfb9ef751 Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags. omar 2018-07-10 11:05:14 +0200
  • 4cf8545d50 * Pure win32 + opengl3 example, using gl3w for opengl bindings n00bmind 2018-07-09 21:11:21 +0100
  • ce18371d1b Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity) omar 2018-07-06 19:24:54 +0200
  • dc021f1c23 Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity) omar 2018-07-06 19:24:54 +0200
  • 9dea27b273 Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking) omar 2018-06-27 17:27:27 +0200
  • 140ece0aeb Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags. omar 2018-06-26 19:05:02 +0200
  • 7abf72ec78 Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. (#1542) omar 2018-06-26 20:51:44 +0200
  • 17f36038e0 Internals: Misc/shallow merge from Docking branch. omar 2018-07-09 21:06:46 +0200
  • 574185426c Internals: Misc/shallow merge from Docking branch. omar 2018-07-09 21:06:46 +0200
  • 7033b2043b Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit. omar 2018-07-03 18:28:46 +0200
  • dd61c4802a Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787) omar 2018-07-09 19:16:48 +0200
  • c7016c25e8 Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787) omar 2018-07-09 19:16:48 +0200
  • 1878c6fd58 removed unused function Jose L. Hidalgo 'PpluX 2018-07-09 17:01:58 +0200
  • 14cef31467 Merge branch 'master' into viewport omar 2018-07-09 16:24:01 +0200
  • 0708f91617 Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable). omar 2018-07-09 15:04:27 +0200
  • 902a2602ad added px_render.h example implementation Jose L. Hidalgo 'PpluX 2018-07-09 16:06:40 +0200
  • 6201cad2b4 Examples: Comments, Demo: Log early out, TODO. (#1553) omar 2018-07-09 11:32:20 +0200
  • 17efd7b3b0 Demo: Added basic Drag and Drop demo. (#143, #1931) omar 2018-07-08 19:55:57 +0200
  • bd6097ac6f Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks. omar 2018-07-08 20:04:49 +0200
  • 64938178b7 Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered) omar 2018-07-08 18:23:12 +0200
  • a33f0d1f7f Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143) omar 2018-07-08 16:38:46 +0200
  • 3a42eb6620 Fix missing ImmReleaseContext in default Win32 IME handler (#1932) vby 2018-07-08 21:24:12 +0800
  • 50ad437cb0 Fix missing ImmReleaseContext vby 2018-07-08 19:45:07 +0800
  • b0cdfe0ece Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909) omar 2018-07-08 13:27:16 +0200
  • 6277781e83 Merge branch 'master' into viewport omar 2018-07-08 13:08:16 +0200
  • c790723cfa Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143) omar 2018-07-08 13:03:39 +0200
  • 89e2ddf07f Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx omar 2018-07-08 11:16:11 +0200
  • 569e0f07f1 Examples: Removed old example_apple/ + tweak comments (#1873) omar 2018-07-08 10:57:16 +0200
  • 839e4d34bd Merge branch 'warrenm_osx' Omar Cornut 2018-07-08 10:47:55 +0200
  • c3f9220c15 Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments Omar Cornut 2018-07-08 10:47:31 +0200
  • d11d211e5d Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. (#1909) Wider generalization of b16603745c. omar 2018-07-06 18:28:12 +0200
  • 93950b8c32 Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code. omar 2018-07-06 14:54:22 +0200
  • 42bf149ac6 Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor `io.OptResizeWindowsFromEdges=true` to enable the feature globally. (#1495) The feature is not currently enabled by default because it is not satisfying enough. omar 2018-07-06 15:30:21 +0200
  • 76f5a0942d
    Merge d64157e803 into deb7aa29cd Warren Moore 2018-07-05 13:04:19 +0000
  • d64157e803 Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873) Warren Moore 2018-07-05 18:41:21 +0900
  • 0146f4b456 Internals: BeginChildEx tweaks. omar 2018-07-05 09:17:16 +0200
  • e2a64f57e8 fix mingw c++11 compilation monowii 2018-07-04 22:25:46 +0200
  • 7b2662d245 Examples: Comments, bits of documentation omar 2018-07-04 19:06:28 +0200
  • 4305ef4b2b Add support in imconfig.h for custom key list without having to directly modify imgui.h. Scott Mudge 2018-07-04 08:49:44 -0400
  • deb7aa29cd OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. (#1873) omar 2018-07-04 13:24:16 +0200
  • 0d7e779b37 Merge branch 'master' into osx omar 2018-07-04 13:13:11 +0200
  • 665bd1e140 Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body. omar 2018-07-04 10:07:50 +0200
  • a765c83bad Ignore list: added emscripten output omar 2018-07-03 15:57:34 +0200
  • 5b4544c1dc
    Merge 90524e36b4 into 770cba0bd0 Konstantin Podsvirov 2018-07-02 18:27:19 +0000
  • 770cba0bd0 Merge branch 'master' into viewport omar 2018-07-02 20:13:16 +0200
  • ddb09c6011 Examples: Ignore all *.user files (#1919) Konstantin Podsvirov 2018-07-02 20:43:33 +0300
  • 573fd45aea Ignore all *.user files Konstantin Podsvirov 2018-07-02 20:09:07 +0300
  • 645ab6633c Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276) omar 2018-07-01 12:25:37 +0200
  • c4e34aaace Examples: Comments to clarify how the keyboard data is indexed. omar 2018-06-30 14:33:45 +0200