omar
|
e0a2a832cd
|
Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent (#787)
|
2017-09-28 19:18:41 +02:00 |
|
omar
|
ca4db8c905
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-09-28 17:40:25 +02:00 |
|
omar
|
926c1cf9a4
|
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
|
2017-09-28 17:02:28 +02:00 |
|
omar
|
f99348711b
|
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
|
2017-09-28 16:41:01 +02:00 |
|
omar
|
d394c7ad0b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-09-28 15:45:35 +02:00 |
|
omar
|
0106dcbd02
|
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
|
2017-09-28 15:43:26 +02:00 |
|
omar
|
35f65e05ed
|
Merge branch 'master' into navigation
|
2017-09-28 00:33:29 +02:00 |
|
omar
|
fafe65a8fc
|
Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.
|
2017-09-28 00:21:47 +02:00 |
|
omar
|
7bcb1d3816
|
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
|
2017-09-27 22:59:40 +02:00 |
|
omar
|
cc26db8ec7
|
Merge branch 'master' into navigation
|
2017-09-27 17:25:50 +02:00 |
|
omar
|
0adcddac39
|
IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.
|
2017-09-27 17:21:50 +02:00 |
|
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 20a0fde012 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 2545d75c3b 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 |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-08-20 18:22:34 +08:00 |
|
omar
|
bf0d9c123e
|
Merge branch 'master' into navigation
|
2017-08-18 00:25:12 +08:00 |
|
omar
|
8be7a60f20
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:19:54 +08:00 |
|
omar
|
1086c87767
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:13:14 +08:00 |
|
omar
|
4075cc58e9
|
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)
|
2017-08-17 20:44:44 +08:00 |
|
omar
|
a85a14370b
|
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
|
2017-08-16 15:47:10 +08:00 |
|
omar
|
d2259f65e5
|
Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)
|
2017-08-16 13:42:41 +08:00 |
|
omar
|
e682362f35
|
TODO list update, comments
|
2017-08-16 12:54:51 +08:00 |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-08-11 13:44:25 +08:00 |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-08-11 13:36:28 +08:00 |
|
omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-08-08 17:30:32 +08:00 |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
2017-08-08 15:54:20 +08:00 |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2017-08-07 22:51:18 +08:00 |
|
omar
|
fb54dce71c
|
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
|
2017-07-31 21:11:41 +08:00 |
|
omar
|
1a26d0bc98
|
Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
|
2017-07-31 18:56:51 +08:00 |
|
omar
|
72da4081f8
|
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
|
2017-07-31 17:54:40 +08:00 |
|
omar
|
390188dfa9
|
Comments about parts of imgui_internal.h that will self-destruct.
|
2017-07-30 16:16:06 +08:00 |
|
omar
|
fef8aac523
|
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)
|
2017-07-30 16:15:52 +08:00 |
|
omar
|
7537dff806
|
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code (#346)
|
2017-07-29 15:54:45 +08:00 |
|
omar
|
bfec9c657e
|
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. (#346)
|
2017-07-27 16:26:32 +08:00 |
|
omar
|
69dd1ed583
|
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346)
|
2017-07-26 22:20:43 +08:00 |
|
omar
|
19c6a9c0e0
|
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments
|
2017-07-26 17:38:33 +08:00 |
|
omar
|
78a8f798c5
|
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346)
|
2017-07-26 15:24:09 +08:00 |
|
omar
|
a8b202782f
|
ColorPicker,ColorButton: Honor Border/Shadow style settings (#346)
|
2017-07-22 19:37:13 +08:00 |
|
omar
|
15be7e1a71
|
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h (#346)
|
2017-07-22 18:01:16 +08:00 |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-21 02:34:19 +08:00 |
|
omar
|
138a9dbaeb
|
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862)
|
2017-07-21 02:21:48 +08:00 |
|
omar
|
85d9c8fb46
|
Internals: renaming IndexWithinParent to OrderWithinParent
|
2017-07-20 21:25:31 +08:00 |
|
omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-19 14:53:25 +08:00 |
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
2017-06-13 11:30:22 +02:00 |
|
omar
|
5e1caaaef3
|
Version 1.50
|
2017-06-02 12:22:34 +02:00 |
|
omar
|
2a3c61e5f8
|
Merge branch 'master' into 2016-07-navigation
|
2017-03-16 19:31:12 +01:00 |
|
omar
|
92ea8d1131
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-03-16 19:28:30 +01:00 |
|
omar
|
b8043d3ee5
|
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917)
|
2017-01-14 13:47:16 +01:00 |
|
omar
|
b6c0227add
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-01-11 21:03:35 +01:00 |
|
omar
|
c76be71acf
|
Merge branch 'master' into 2016-07-navigation
|
2017-01-11 21:03:25 +01:00 |
|
omar
|
6257b5814a
|
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
|
2017-01-11 20:56:55 +01:00 |
|
ocornut
|
3028ccc25b
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-11-27 18:25:20 +01:00 |
|
ocornut
|
f4cf972ea9
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-11-27 18:21:14 +01:00 |
|