omar
|
99c7622a1b
|
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
|
2017-09-27 16:20:53 +02:00 |
|
omar
|
a2b2e56e8e
|
Merge branch 'master' into navigation
|
2017-09-27 12:31:12 +02:00 |
|
omar
|
8374a454da
|
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
|
2017-09-27 11:39:13 +02:00 |
|
omar
|
8fd4beddb8
|
Merge branch 'master' into navigation
|
2017-09-26 20:28:40 +02:00 |
|
omar
|
072d6d8cb5
|
ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)
|
2017-09-26 19:26:16 +02:00 |
|
omar
|
f1a20ec66d
|
Merge branch 'master' into navigation
|
2017-09-26 16:54:37 +02:00 |
|
omar
|
be03882a15
|
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
|
2017-09-26 15:43:48 +02:00 |
|
omar
|
69d0d33451
|
Exposed PushMultiItemsWidths() to imgui_internal.h
|
2017-09-25 22:45:10 +02:00 |
|
omar
|
7e8069dd23
|
Merge branch 'master' into navigation
|
2017-09-25 22:08:38 +02:00 |
|
omar
|
0d56140b4a
|
BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
|
2017-09-25 21:45:34 +02:00 |
|
omar
|
4b82759598
|
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
|
2017-09-25 18:25:43 +02:00 |
|
omar
|
0a5fb24f10
|
Popups: Exposing a little more of popups internals in imgui_internals.h
|
2017-09-25 12:52:06 +02:00 |
|
omar
|
44e8d94aba
|
Merge branch 'master' into navigation
|
2017-09-18 15:32:31 +02:00 |
|
Bruce Mitchener
|
2fcdeb7f12
|
Remove commas after last item in enumeration.
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
|
2017-09-14 10:35:30 +07:00 |
|
omar
|
66a9d4856c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-09-06 20:37:29 +02:00 |
|
omar
|
cb2775ae54
|
Internals: ImGuiItemFlags comments
|
2017-09-06 20:36:36 +02:00 |
|
omar
|
62d7fa4324
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-09-06 20:33:39 +02:00 |
|
omar
|
f63c03c464
|
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
|
2017-09-06 20:28:36 +02:00 |
|
omar
|
5c4fda0fbc
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-09-06 19:17:51 +02:00 |
|
omar
|
2169bf6895
|
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317)
|
2017-09-06 17:25:36 +02:00 |
|
omar
|
790605e359
|
Minor comments + renaming internal fields
|
2017-09-06 17:20:54 +02:00 |
|
omar
|
e8dbf1c795
|
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
|
2017-09-01 22:10:13 +02:00 |
|
omar
|
804ee78731
|
Added IsWindowAppearing().
|
2017-09-01 21:55:59 +02:00 |
|
omar
|
ddf41b0398
|
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
|
2017-08-29 17:27:19 +08:00 |
|
omar
|
358e7a194e
|
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
|
2017-08-29 16:13:17 +08:00 |
|
omar
|
ee42fae468
|
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787)
|
2017-08-29 16:05:12 +08:00 |
|
omar
|
2ee1b70652
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-08-29 15:36:36 +08:00 |
|
omar
|
01d4bf299a
|
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76)
|
2017-08-29 15:22:30 +08:00 |
|
omar
|
7a9ea281be
|
ImSwap() helper.
|
2017-08-28 19:27:12 +08:00 |
|
omar
|
1f51e8f39d
|
Internals: Renamed some ImGuiCorner enums.
|
2017-08-28 14:11:11 +08:00 |
|
omar
|
807322c9a5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-08-26 18:43:10 +08:00 |
|
omar
|
419b22a487
|
Internals: Split some code out of NewFrame() into an Initialize() function.
|
2017-08-26 16:35:39 +08:00 |
|
omar
|
f72ca6d22c
|
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
|
2017-08-26 14:11:56 +08:00 |
|
omar
|
37f3a718c6
|
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
|
2017-08-25 16:10:14 +08:00 |
|
omar
|
40f608ce9b
|
Version 1.52 WIP
|
2017-08-25 15:12:12 +08:00 |
|
omar
|
55a6209931
|
Version 1.51
|
2017-08-25 00:29:59 +08:00 |
|
omar
|
141339e4b7
|
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
|
2017-08-22 19:51:12 +08:00 |
|
ocornut
|
2ad2190d47
|
Merge 20a0fde0124c08a7ead82357c9346acec0bafda6 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
|
2017-08-22 19:47:52 +08:00 |
|
omar
|
bea06117bb
|
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291)
|
2017-08-22 19:26:21 +08:00 |
|
ocornut
|
50b3a14d0a
|
Merge 2545d75c3b978638329ac65cc1851f3f5998bb5b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
|
2017-08-22 18:26:27 +08:00 |
|
omar
|
d5b0d51274
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
|
2017-08-22 18:13:10 +08:00 |
|
omar
|
9670fe9ca7
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-08-22 17:51:20 +08:00 |
|
omar
|
6ee317d26d
|
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
|
2017-08-22 17:46:50 +08:00 |
|
omar
|
53e73182ff
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-08-21 00:04:45 +08:00 |
|
omar
|
530baee1a7
|
Removed tabs that slipped through the cracks
|
2017-08-21 00:03:37 +08:00 |
|
omar
|
067127f113
|
Columns: Caching columns clipping rectangles (#125)
|
2017-08-20 23:17:59 +08:00 |
|
omar
|
adeaf1cd72
|
Columns: Moved PushColumnClipRect() to imgui_internal.h
|
2017-08-20 23:09:43 +08:00 |
|
omar
|
1c83b073c6
|
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (#519, #125, #913)
|
2017-08-20 20:58:23 +08:00 |
|
omar
|
7f0063f858
|
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125)
|
2017-08-20 19:32:50 +08:00 |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
2017-08-20 18:44:48 +08:00 |
|