0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
f0b4097c54
Begin: Simplified code and fixed a bug where appending into a window a second time (from a remote window) would incorrectly overwrite RootWindow with the current window in the stack. Our docking code uses this pattern.
7 years ago
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
7 years ago
982ce50b37
IsWindowHovered() returns true when moving window ( #1382 , #1404 )
7 years ago
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
7 years ago
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() ( #1382 , #1404 )
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
6ab20ff9bf
Minor tweaks to the user guide.
7 years ago
e55caf0b95
Merge pull request #1402 from elect86/patch-1
...
Minor fix typo
7 years ago
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
7 years ago
9e3f9fc2dd
Update imgui.cpp
7 years ago
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
7 years ago
17dd8e7c30
Merge branch 'master' into navigation
7 years ago
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?)
7 years ago
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline ( 0260fdd1c6)
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
7 years ago
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9f200d10d5
Version 1.52
7 years ago
cc78e9a213
Merge branch 'master' into navigation
7 years ago
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
7 years ago
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
7 years ago
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.
7 years ago
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
7 years ago
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
7 years ago
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
7 years ago
c432fcf2bb
Minor renaming.
7 years ago
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
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 )
7 years ago
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
7 years ago
fc25881207
Merge branch 'master' into navigation
7 years ago
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp ( #1038 )
...
(NB: imgui_demo stills uses it)
7 years ago
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
7 years ago
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 )
7 years ago
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
7 years ago
70cb427469
Add missing CloseClipboard call
7 years ago
d513546325
Merge branch 'master' into navigation
7 years ago
5b062c4c29
Fixed typos
7 years ago
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
7 years ago
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.
7 years ago
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
7 years ago
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
7 years ago
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
7 years ago
2ef2c104a1
Begin: Minor tweaks
7 years ago
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 )
7 years ago
omar
omar
Giuseppe Barbieri
Patrick Doane