Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,569 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6ef3dbc342'
${ noResults }
Commit Graph

6569 Commits (6ef3dbc3421dd6d813dbf542623f2b06993560f5)
 

Author SHA1 Message Date
TheCherno 6ef3dbc342 Merge branch 'docking' of https://github.com/ocornut/imgui into docking 
Resolved .gitignore conflict
 5 years ago
omar 7ddc1adefb Internals: FIxed commented out IMGUI_DEBUG_LOG_xxx macros, added extra. Revert incorrect 103c5edaa. 5 years ago
Yan Chernikov 37d11c74d1
Merge pull request #8 from LovelySanta/patch-1 
Add VS project to .gitignore
 5 years ago
lovely_santa 4d8acd8d8c
Add VS project to .gitignore 
See TheCherno/Hazel#215 for details
 5 years ago
ocornut 266dff9bed Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
 5 years ago
ocornut c0283c1289 TestEngine: Changed PushID hooks into GetID(), makes more sense and catches more information. 5 years ago
omar 37f665b619 Backends: Win32: Support for #define NOGDI, won't try to call GetDeviceCaps(). (#3137, #2327) 5 years ago
Rokas Kupstys 7f8b076f2b Viewports, Backends: GLFW: Fix windows resizing incorrectly due to GLFW firing window positioning callbacks on next frame after window is resized manually. (#2117) 
+ Docking fixed PVS warning
 5 years ago
Patryk Czachurski 36ac557df0
Docking: Fix unused variable warning. (#3135) 5 years ago
András Kucsma 388bf66247
Fix missing comma in FAQ.md (#3134) 5 years ago
omar 9f9ff84ba1 TestEngine: Added PushID() hooks. 5 years ago
omar b0e9092d6f TestEngine: Added extra storage and global enable flag. Added missing ItemInfo hooks. 5 years ago
omar 3233fbff0e Internals: Added SetNextWindowScroll() (#1526) 5 years ago
omar 1fd9e131e4 TreeNode: Fixed bug where dragging a payload over a TreeNode() with either _OpenOnDoubleClick or _OpenOnArrow would open the node. (#143) 5 years ago
omar 54b38d88f7 TreeNode: Fixed bug where BeginDragDropSource() failed when the _OpenOnDoubleClick flag is set. Added basic demo code. (Amend 05420ea) 5 years ago
omar e8c986b34e Version 1.77 WIP 5 years ago
SergeyN 013013737f Viewports, Backends: DX12: Fix for crash caused by early resource release. (#3121) 5 years ago
omar b8e2b2bd6b Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 5 years ago
omar 5503c0a12e Version 1.76 
+ fixed PVS warning, update demo binaries, update readme image
 5 years ago
omar 7ee623d9b1 Internals: FocusScope not inherited by popups, modals. Amend a5041c88 2ebe08be) 5 years ago
omar ec7294d890 Backends: OpenGL3: Fixed version check mistakenly testing for GL 4.0+ instead of 3.2+ to enable ImGuiBackendFlags_RendererHasVtxOffset, leaving 3.2 contexts without it. (#3119, #2866, #2852) 5 years ago
omar 71eb4034eb Viewports: Fixed viewport merge code not testing the Minimized flag correctly. (#3118) 5 years ago
SergeyN 977ac53dd8 Examples: Win32+DX12: Fixed resizing main window, enabled debug layer. (#3087, #3115) 5 years ago
omar f7852fa8e8 Internals: Extracted GetWindowScrollbarRect() out of Scrollbar() and tidying up code to make it more obvious how to draw over scrollbars. (#3114) 5 years ago
omar fb70d90fef Made default clipboard handlers for Win32 and OSX use a buffer inside the main context instead of a static buffer, so it can be freed properly on Shutdown. (#3110) 5 years ago
omar 832fda8488 Fixed stray end of line blanks, added comments in .editorconfig, tweaked some headers. 5 years ago
Rokas Kupstys c142540705 Viewports, Backends: GLFW: Avoid using window positioning workaround for glfw versions that have it fixed. Amend 09780b8. 5 years ago
omar 4e7ceb5f90 Plot: Internals: Added hovered index to PlotEx() function. (#2670) 5 years ago
omar e9366b4c73 Regretfully moved .gitignore file from examples/ into root directory because OSX keeps pooping its DS_Store/ artifacts everywhere. (#3088) 5 years ago
omar cc0e43e631 Backends: Comments next to include, misc minor comments/tweaks, fix imgui_impl_osx.h using IMGUI_API instead of IMGUI_IMPL_API. (#3105) 5 years ago
OmarEmaraDev 00927105ba Backends: Include imgui.h in implementation headers. (#3105) 
Currently, the implementation headers don't include the imgui.h header.
Which means that the compilation will fail if the implementation header
was included before the imgui.h header in the compilation unit. For
instance, a compilation unit with the following will work:

  #include "imgui.h"
  #include "imgui_impl_glfw.h"
  #include "imgui_impl_opengl3.h"

But a compilation unit with the following will fail because IMGUI_IMPL_API
and possibly other symbols will not be defined:

  #include "imgui_impl_glfw.h"
  #include "imgui_impl_opengl3.h"
  #include "imgui.h"

This patch includes imgui.h in the implementation headers to make
inclusions order-invariant, which is a recommended practice.
 5 years ago
omar 3930472f34 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 5 years ago
omar 752436219d Metrics: Made Tools section more prominent, added options, made mesh viewer more accessible. 5 years ago
omar 6d03f93067 Docking: Fixed assert preventing dockspace from being stored into a tab. (#3101) 5 years ago
omar cc0d4e346a Misc: Added an explicit compile-time test for non-scoped IM_ASSERT() macros to redirect users to a solution + fixed our stb wrappers. 
+ Nav: Use nav layer enum, comments.
 5 years ago
omar b7e1b13ca7 Update docs, FAQ, comments (mainly related to io.WantCaptureMouse / WantCaptureKeyboard flags). 5 years ago
omar 11116eee80 Columns: undid the change in 1.75 were Columns()/BeginColumns() were preemptively limited to 64 columns with an assert. (#3037, #125) 
Essentially reverting 9d444062f9.
 5 years ago
omar 3490046c97 Nav: Disabled clipping g.NavId and fixed interactions with ImGuiListClipper. (#787) 5 years ago
omar fd56de1144 Nav: Store key mods associated to a nav request (for range_select) + use io.KeyMods. 
+ renamed NavScoringRectScreen > NavScoringRect
 5 years ago
omar 0e884304ee Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
 5 years ago
omar 05420ea2cf TreeNode: Made clicking on arrow with _OpenOnArrow toggle the open state on the Mouse Down event rather than the Mouse Down+Up sequence (this is rather standard behavior). 5 years ago
Dylan 68c5d030cd
Typo in readme (#3078) 5 years ago
omar ec2a24a5f1 Selectable: Allow using ImGuiSelectableFlags_SpanAllColumns in other columns than first. Comments. (#125) 5 years ago
omar 5be5add1ad Selectable: Removed extraneous WindowPadding.x worth of width when auto-sized selectable label goes off available width (would not be noticeable) + Renamed ImGuiSelectableFlags_DrawFillAvailWidth to ImGuiSelectableFlags_SpanAvailWidth. 5 years ago
omar b4d1287011 Selectable: Clarifying the code around use of ImGuiSelectableFlags_DrawFillAvailWidth (with intent of trying to remove it). 
Amend old 6251d379, 2bcafc86
 5 years ago
omar 7c11997bcc Selectable: Fixed honoring style.SelectableTextAlign with unspecified size. (#2347, #2601) 5 years ago
omar ac2247f551 Selectable: Removed seemingly ineffective text clipping offset in SpanAllColumns handling path + tweaks. 
made max_x absolutely to reduce confusion.
amend cf481e1
 5 years ago
omar 1d4b5def51 Alter definition of IM_UNICODE_ defines to faclitate C-binding. (#2538, #2541, #2815) 5 years ago
omar 670367e51d Added IMGUI_USE_WCHAR32 instead of "#define ImWchar ImWchar32" to faclitate C-binding. (#2538, #2541, #2815) 5 years ago
omar 9085c2cae2 Docking: Fixed unused definition leftover from a hasty merge. 5 years ago