Commit Graph

6100 Commits (7ca70dcb81c77c37b5e225d476c0fc82256735ae)
 

Author SHA1 Message Date
omar 78f9511f4d
Merge pull request from elect86/master
Fixed a comment
Giuseppe Barbieri 6fb43f2011
Update imgui.h
omar 66f42324ad Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
Giuseppe Barbieri db190c16f6
Update imgui_draw.cpp
omar 63f6f2dd13 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar fba704bf5d Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (, , , , , , , , , , , , , , and more)
omar 59323b54da Demo: Comments ()
omar 6ab20ff9bf Minor tweaks to the user guide.
omar e55caf0b95
Merge pull request from elect86/patch-1
Minor fix typo
omar 7f06d385a1 Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
Giuseppe Barbieri 9e3f9fc2dd
Update imgui.cpp
omar 5956fff7e2 Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
omar a810619555 Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
omar 1d7d8f8574 Merge branch 'master' into drag_and_drop
omar b13d281356 Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
omar d46772b429 Comments
omar 0e775807b4 Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
omar acf78da742 Drag and drop: moved to imgui.h
omar b5f714e9f9 Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
omar c5536e49ef Drag and drop API experiment
omar fd88bc270a Merge branch 'nProtect-master'
omar 53f9e28c77 GetGlyphRangesThai(): removed extraneous codepoints ()
omar ae3dc66214 Merge branch 'master' of https://github.com/nProtect/imgui into nProtect-master
omar f793562b4e TODO
omar 36f00811b9 Examples: Comments to guide people unfamiliar with the librairies used.
omar cb38caeda4 Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. , , , , , , , etc.)
Adisorn Aeksatean 3185a3a697
Add missing thai punctuations
omar 17dd8e7c30 Merge branch 'master' into navigation
omar b9ebb34a04 Nav: ColorButton: Fixed a case of not using local 'hovered' flag directly, messes with some of my drag and drop work, and I can't find/understand the reason why this was left as is (there _was_ a reason at the time but it appears to be obsolete now?)
omar f962ca0b01 ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline (0260fdd1c6)
omar d55b69ad6e Styles: Nav tweaks.
omar edafbcd630 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
omar c503a50cff Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
omar 77df1ba9e0 Version 1.53 WIP
omar b422f35872 IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
omar c0b366b316 Merge branch 'master' into navigation
# Conflicts:
#	imgui.h
omar 9f200d10d5 Version 1.52
omar cc78e9a213 Merge branch 'master' into navigation
omar 267ea506de Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
omar 5afee1c6f3 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar 8dd7648db2 Comments
omar ccdb58b17e Internal: Added ImVec4 operators
omar 3b83cd24f5 Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
omar 3656f2c769 NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
omar a6edd10ee6 NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
omar 6243252d5a Internal: BeginTooltipEx() in imgui_internal.h
omar f10a1d7b9e Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar d42f6bb6cc Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
omar c432fcf2bb Minor renaming.
omar a6ff14d66e Exposed IM_ARRAYSIZE() in imgui.h