omar
|
c547b97e4e
|
Merge branch 'patch-1' of https://github.com/elect86/imgui into elect86-patch-1
|
2017-11-02 10:40:01 +01:00 |
|
omar
|
78f9511f4d
|
Merge pull request #1410 from elect86/master
Fixed a comment
|
2017-11-01 17:58:42 +01:00 |
|
Giuseppe Barbieri
|
6fb43f2011
|
Update imgui.h
|
2017-11-01 17:56:03 +01:00 |
|
Giuseppe Barbieri
|
db190c16f6
|
Update imgui_draw.cpp
|
2017-11-01 16:48:56 +01:00 |
|
omar
|
63f6f2dd13
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-11-01 15:09:23 +01:00 |
|
omar
|
fba704bf5d
|
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard (#1262, #1237, #1219, #635, #1058, #1051, #912, #533, #703, #446, #459, #364, #213, #52, and more)
|
2017-11-01 14:24:09 +01:00 |
|
omar
|
59323b54da
|
Demo: Comments (#1408)
|
2017-11-01 12:57:12 +01:00 |
|
omar
|
6ab20ff9bf
|
Minor tweaks to the user guide.
|
2017-11-01 12:33:58 +01:00 |
|
omar
|
e55caf0b95
|
Merge pull request #1402 from elect86/patch-1
Minor fix typo
|
2017-10-30 09:51:49 +01:00 |
|
omar
|
7f06d385a1
|
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
|
2017-10-30 09:50:54 +01:00 |
|
Giuseppe Barbieri
|
9e3f9fc2dd
|
Update imgui.cpp
|
2017-10-30 09:35:42 +01:00 |
|
omar
|
b13d281356
|
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
|
2017-10-29 23:49:01 +01:00 |
|
omar
|
fd88bc270a
|
Merge branch 'nProtect-master'
|
2017-10-29 11:29:21 +01:00 |
|
omar
|
53f9e28c77
|
GetGlyphRangesThai(): removed extraneous codepoints (#1396)
|
2017-10-29 11:28:29 +01:00 |
|
omar
|
ae3dc66214
|
Merge branch 'master' of https://github.com/nProtect/imgui into nProtect-master
|
2017-10-29 11:24:25 +01:00 |
|
omar
|
f793562b4e
|
TODO
|
2017-10-29 11:23:38 +01:00 |
|
omar
|
36f00811b9
|
Examples: Comments to guide people unfamiliar with the librairies used.
|
2017-10-28 19:28:22 +02:00 |
|
omar
|
cb38caeda4
|
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397, #1366, #1341, #1222, #1193, #1115, #951, etc.)
|
2017-10-28 18:21:44 +02:00 |
|
Adisorn Aeksatean
|
3185a3a697
|
Add missing thai punctuations
|
2017-10-28 16:59:39 +07:00 |
|
omar
|
17dd8e7c30
|
Merge branch 'master' into navigation
|
2017-10-27 23:01:54 +02:00 |
|
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?)
|
2017-10-27 20:54:48 +02:00 |
|
omar
|
f962ca0b01
|
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline (0260fdd1c6)
|
2017-10-27 20:36:51 +02:00 |
|
omar
|
d55b69ad6e
|
Styles: Nav tweaks.
|
2017-10-27 20:06:45 +02:00 |
|
omar
|
edafbcd630
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-10-27 20:04:51 +02:00 |
|
omar
|
c503a50cff
|
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
|
2017-10-27 20:01:30 +02:00 |
|
omar
|
77df1ba9e0
|
Version 1.53 WIP
|
2017-10-27 19:54:56 +02:00 |
|
omar
|
b422f35872
|
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
|
2017-10-27 18:21:30 +02:00 |
|
omar
|
c0b366b316
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-10-27 17:27:53 +02:00 |
|
omar
|
9f200d10d5
|
Version 1.52
|
2017-10-27 17:10:41 +02:00 |
|
omar
|
cc78e9a213
|
Merge branch 'master' into navigation
|
2017-10-27 16:46:03 +02:00 |
|
omar
|
267ea506de
|
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
|
2017-10-27 16:45:56 +02:00 |
|
omar
|
5afee1c6f3
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-10-27 16:42:06 +02:00 |
|
omar
|
8dd7648db2
|
Comments
|
2017-10-27 16:41:22 +02:00 |
|
omar
|
ccdb58b17e
|
Internal: Added ImVec4 operators
|
2017-10-27 16:40:04 +02:00 |
|
omar
|
3b83cd24f5
|
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
|
2017-10-27 16:39:55 +02:00 |
|
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.
|
2017-10-27 16:39:23 +02:00 |
|
omar
|
a6edd10ee6
|
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
|
2017-10-27 16:38:14 +02:00 |
|
omar
|
6243252d5a
|
Internal: BeginTooltipEx() in imgui_internal.h
|
2017-10-27 16:21:12 +02:00 |
|
omar
|
f10a1d7b9e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-10-27 15:53:59 +02:00 |
|
omar
|
d42f6bb6cc
|
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
|
2017-10-27 15:52:45 +02:00 |
|
omar
|
c432fcf2bb
|
Minor renaming.
|
2017-10-27 12:01:52 +02:00 |
|
omar
|
a6ff14d66e
|
Exposed IM_ARRAYSIZE() in imgui.h
|
2017-10-26 16:12:53 +02:00 |
|
omar
|
c5027d4fa1
|
Examples: Extra clarification for the 100th person who insist on using the OpenGL2 code in spite of existing documentation leaning against it. (#1394)
|
2017-10-25 20:55:15 +02:00 |
|
omar
|
549f9e3f03
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-10-25 16:37:10 +02:00 |
|
omar
|
daef33e268
|
Comments about mouse setup and clearing HoveredWindow when mouse down isn't owned by imgui (will affect some future hovered test and drag'n drop patterns) (#143, #1382, #1392)
|
2017-10-25 11:01:41 +02:00 |
|
omar
|
4faf99eff5
|
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported (#211, #1012)
|
2017-10-25 09:28:54 +02:00 |
|
omar
|
fc25881207
|
Merge branch 'master' into navigation
|
2017-10-24 21:13:24 +02:00 |
|
omar
|
efcd53a0c3
|
Removed direct dependency on sprintf() in imgui.cpp (#1038)
(NB: imgui_demo stills uses it)
|
2017-10-24 20:57:41 +02:00 |
|
omar
|
1f3372b7f1
|
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. (#1038)
|
2017-10-24 20:48:29 +02:00 |
|
omar
|
8fd5620277
|
Renamed IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS to IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS for consistency. (ref #238, #520, #738)
|
2017-10-24 20:23:42 +02:00 |
|