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
omar
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
2017-10-24 20:19:32 +02:00
Patrick Doane
70cb427469
Add missing CloseClipboard call
2017-10-24 20:12:42 +02:00
omar
bc447bc0a4
ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ( #1391 )
2017-10-24 16:08:05 +02:00
omar
d513546325
Merge branch 'master' into navigation
2017-10-24 15:49:01 +02:00
omar
5b062c4c29
Fixed typos
2017-10-24 15:26:04 +02:00
omar
d2c65aa3e8
Examples: DirectX9/10/11: Tweak usage of SetCapture/ReleaseCapture. ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-24 14:48:00 +02:00
omar
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
2017-10-24 14:38:32 +02:00
omar
e9ff7162bc
ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
2017-10-24 10:43:41 +02:00
omar
de72e9cc87
Internals: ImLerp() helper for ImVec4
2017-10-23 17:22:00 +02:00
omar
f6ff373b22
Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
2017-10-23 14:54:23 +02:00
omar
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
2017-10-23 14:37:47 +02:00
omar
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
2017-10-23 12:38:39 +02:00
omar
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-23 12:34:46 +02:00
omar
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
2017-10-23 12:34:15 +02:00
omar
2ef2c104a1
Begin: Minor tweaks
2017-10-23 11:36:43 +02:00
omar
be12f8c55d
Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ( #787 )
2017-10-23 11:26:52 +02:00
omar
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
2017-10-23 11:26:30 +02:00
omar
d769e2515a
Merge branch 'master' into navigation
2017-10-23 10:05:36 +02:00
omar
50f5be9266
Examples: GLFW+GL2/GL3: Minor tweaks, comments.
2017-10-23 10:04:38 +02:00
omar
d6a9956781
Examples: DirectX9/10/11: Added WM_SYSKEYDOWN / WM_SYSKEYUP handlers so e.g. VK_MENU can be read.
2017-10-23 10:01:18 +02:00
omar
c14a66970b
Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct.
2017-10-23 09:57:59 +02:00
omar
cb10da02f9
Merge branch 'Gargaj-patch-1'
2017-10-23 09:47:49 +02:00
omar
a96f095deb
Examples: DirectX10, DirectX11: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
...
ps: DirectX 12 example (#302 ) may want to adopt that as well.
2017-10-23 09:46:49 +02:00
omar
3e0765ee22
Examples: DirectX9: Using SetCapture/ReleaseCapture to get correct behavior ( #1375 )
2017-10-23 09:43:30 +02:00
omar
e03198bb0f
Fixed compilation for #1375 + coding style fixes.
2017-10-23 09:43:30 +02:00
omar
c36e7fae93
Merge branch 'patch-1' of https://github.com/Gargaj/imgui into Gargaj-patch-1
2017-10-23 09:07:01 +02:00
omar
1bc1751670
MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ( #1387 )
2017-10-22 10:56:37 +02:00
omar
b177f2432d
MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ( #1387 )
2017-10-22 10:36:22 +02:00
omar
b52e207758
Merge branch 'inolen-atlas_build_clear_font'
2017-10-22 10:25:08 +02:00
omar
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
2017-10-22 10:24:56 +02:00
