omar
|
052b6021dd
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-12-12 15:02:05 +01:00 |
|
omar
|
c22657985a
|
Added GetFrameHeight() function (used to be SmallSquareSize internally)
|
2017-12-12 14:12:49 +01:00 |
|
omar
|
ee7f1921e8
|
Internals: Added GetSmallSquareSize()
|
2017-12-12 14:08:58 +01:00 |
|
omar
|
c65124f415
|
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
|
2017-12-12 12:50:43 +01:00 |
|
omar
|
f42d7b89e2
|
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
|
2017-12-12 12:50:42 +01:00 |
|
omar
|
4a555d35f0
|
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382)
|
2017-12-12 12:50:42 +01:00 |
|
omar
|
45f440bb7d
|
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
|
2017-12-11 22:39:10 +01:00 |
|
omar
|
2b9d8ab91d
|
Merge branch 'master' into drag_and_drop
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-11 16:39:27 +01:00 |
|
omar
|
e3e0326ea9
|
Exposed BeginCombo() publicly.
|
2017-12-10 18:08:59 +01:00 |
|
omar
|
eab6333a0b
|
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) (#1490)
|
2017-12-10 17:36:30 +01:00 |
|
omar
|
a5e9392140
|
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
|
2017-12-08 15:03:26 +01:00 |
|
omar
|
7bf85db6c4
|
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143)
|
2017-12-08 12:48:53 +01:00 |
|
omar
|
45466a8cf9
|
Internals: BeginCombo() added dummy ImGuiComboFlags.
|
2017-12-07 21:14:41 +01:00 |
|
omar
|
8959c64b33
|
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
|
2017-12-07 13:29:14 +01:00 |
|
omar
|
beda5fc5a0
|
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
e103fe8c1f
|
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822)
|
2017-12-06 15:13:45 +01:00 |
|
omar
|
16d9fa30b2
|
Merge branch 'master' into drag_and_drop
|
2017-12-05 09:21:07 +01:00 |
|
omar
|
c860a0a85c
|
Internals: ImRect: Added IsFinite() helper.
|
2017-12-01 17:39:13 +01:00 |
|
omar
|
52e475230f
|
Settings: Internals: Renaming.
|
2017-11-28 23:16:09 +01:00 |
|
omar
|
7ae71e4984
|
Settings: Internals: Added FindSettingsHandler()
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
35eb5c5c99
|
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
963259d128
|
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
|
2017-11-28 21:04:38 +01:00 |
|
omar
|
63712d5f5c
|
Merge branch 'master' into drag_and_drop
|
2017-11-28 17:28:45 +01:00 |
|
omar
|
f3ec608c19
|
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
|
2017-11-28 10:49:43 +01:00 |
|
omar
|
7e2d0d734c
|
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
|
2017-11-27 23:57:11 +01:00 |
|
omar
|
d552cabd15
|
Settings: Internal renaming of structure and fields names.
|
2017-11-27 23:57:10 +01:00 |
|
omar
|
7763ab3fcc
|
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
|
2017-11-22 15:58:20 +01:00 |
|
omar
|
302757447a
|
Internals: Added SplitterBehavior(). (#319)
|
2017-11-20 19:41:17 +01:00 |
|
omar
|
3f5b2a3fe3
|
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
|
2017-11-20 13:53:16 +01:00 |
|
thedmd
|
8b2d449b16
|
Add ShadeVertsLinearUV()
|
2017-11-19 21:56:36 +01:00 |
|
omar
|
92212b17aa
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 16:23:37 +01:00 |
|
omar
|
9a44d447cd
|
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. (#1423 etc.)
|
2017-11-19 12:06:45 +01:00 |
|
omar
|
4022ada843
|
Merge branch 'master' into drag_and_drop
|
2017-11-19 00:36:32 +01:00 |
|
omar
|
6f7b1bf2e1
|
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
|
2017-11-19 00:29:29 +01:00 |
|
omar
|
29e0078b66
|
Internals: Window minor internal renaming + added WindowRounding latch.
|
2017-11-18 19:06:11 +01:00 |
|
omar
|
834fa52c8e
|
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. (#1444, #125)
|
2017-11-16 17:34:34 +01:00 |
|
omar
|
7746dd104c
|
Merge branch 'master' into drag_and_drop
|
2017-11-16 13:28:22 +01:00 |
|
omar
|
4ad414c8d4
|
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
|
2017-11-16 13:23:50 +01:00 |
|
omar
|
7c4be0a000
|
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
|
2017-11-16 13:11:49 +01:00 |
|
omar
|
5027311e7f
|
Drag and drop: Standardizing payload types as defines. (#143)
|
2017-11-15 22:23:21 +01:00 |
|
omar
|
ae060b1d67
|
Merge branch 'master' into drag_and_drop
|
2017-11-15 10:24:54 +01:00 |
|
omar
|
3e06450d27
|
Internals: Added ArrowButton() helper.
|
2017-11-13 15:18:31 +01:00 |
|
omar
|
7908cce25f
|
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. (#143)
|
2017-11-13 15:17:41 +01:00 |
|
omar
|
b6504b8eee
|
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
|
2017-11-08 15:47:52 +01:00 |
|
omar
|
aae52522c3
|
Internals: Remove requirement to define IMGUI_DEFINE_PLACEMENT_NEW (#1103)
|
2017-11-07 14:06:02 +01:00 |
|
omar
|
571b08f315
|
Internal: FindWindowByName() faster and doesn't touch every windows
|
2017-11-07 13:59:55 +01:00 |
|
omar
|
de1e7dc088
|
Drag and Drop: Moved internal fields out of public sight. (#143)
|
2017-11-06 20:04:10 +01:00 |
|
omar
|
66f42324ad
|
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
|
2017-11-01 17:25:42 +01:00 |
|
omar
|
a810619555
|
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
|
2017-10-30 00:03:04 +01:00 |
|
omar
|
1d7d8f8574
|
Merge branch 'master' into drag_and_drop
|
2017-10-29 23:49:24 +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
|
0e775807b4
|
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
|
2017-10-29 23:10:44 +01:00 |
|
omar
|
acf78da742
|
Drag and drop: moved to imgui.h
|
2017-10-29 21:37:14 +01:00 |
|
omar
|
b5f714e9f9
|
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
|
2017-10-29 21:31:49 +01:00 |
|
omar
|
c5536e49ef
|
Drag and drop API experiment
|
2017-10-29 21:15:02 +01:00 |
|
omar
|
77df1ba9e0
|
Version 1.53 WIP
|
2017-10-27 19:54:56 +02:00 |
|
omar
|
9f200d10d5
|
Version 1.52
|
2017-10-27 17:10:41 +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
|
6243252d5a
|
Internal: BeginTooltipEx() in imgui_internal.h
|
2017-10-27 16:21:12 +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
|
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
|
de72e9cc87
|
Internals: ImLerp() helper for ImVec4
|
2017-10-23 17:22:00 +02:00 |
|
omar
|
d29a6a5a5a
|
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
|
2017-10-20 17:29:52 +02:00 |
|
omar
|
5b699517d4
|
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
|
2017-10-19 19:42:19 +02:00 |
|
omar
|
d3c2e904d8
|
Internals: Added ImLinearSweep() helper.
|
2017-10-19 19:29:59 +02:00 |
|
omar
|
370a48c10b
|
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
|
2017-10-18 23:46:16 +02:00 |
|
omar
|
a03093b2d4
|
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. (#600, #787)
|
2017-10-18 19:55:08 +02:00 |
|
omar
|
ef3f87eec5
|
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
|
2017-10-18 13:08:25 +02:00 |
|
omar
|
1c4af303bf
|
Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy().
|
2017-10-18 13:08:14 +02:00 |
|
omar
|
bf778ebb7e
|
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
|
2017-10-18 13:06:49 +02:00 |
|
omar
|
78a85ba3fe
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
|
2017-10-17 16:15:46 +02:00 |
|
omar
|
2739b6ebcd
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
|
2017-10-17 16:14:20 +02:00 |
|
omar
|
4aa9d2089d
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
|
2017-10-17 15:51:20 +02:00 |
|
omar
|
55d873875e
|
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
|
2017-10-17 15:47:55 +02:00 |
|
omar
|
4be967823f
|
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
|
2017-10-13 13:30:28 +02:00 |
|
omar
|
042153d254
|
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
|
2017-10-06 14:23:18 -07:00 |
|
omar
|
164f22d5b7
|
Comments
|
2017-09-28 22:00:49 +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
|
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
|
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
|
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
|
8374a454da
|
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
|
2017-09-27 11:39:13 +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
|
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
|
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 |
|
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
|
cb2775ae54
|
Internals: ImGuiItemFlags comments
|
2017-09-06 20:36:36 +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
|
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 |
|