omar
af38749ea1
Nav: Fixed ButtonBehavior mistakenly setting active id when the Activate button is held and we have a new NavId, which affected browsing some popups ( #787 )
7 years ago
omar
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
e8f7c83138
Begin: Shallow tweak to minimize diff with nav branch
7 years ago
omar
926c1cf9a4
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
7 years ago
omar
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
7 years ago
omar
9142002121
Separator(): Tweak Logging so that the separator text is aligned according to tree padding.
7 years ago
omar
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
7 years ago
omar
2a8eb618dc
Nav: Fixed NavDown to open menu from a menu bar ( #787 )
7 years ago
omar
35f65e05ed
Merge branch 'master' into navigation
7 years ago
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.
7 years ago
omar
2159629e9e
Removed another msileading difference between the hovered functions (IsWindowContentHoverable() uses the root window already). Sorry for the commit spam! (making small commit to easily be able to Bisect those in case I make a mistake)
7 years ago
omar
eca74d55c7
IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.
7 years ago
omar
2b7d4c713e
Internals: Moved IsWindowContentHoverable() in the file
7 years ago
omar
c5a79deb38
IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.
7 years ago
omar
7bcb1d3816
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
7 years ago
omar
79ef64430c
Nav: Fixed merge cc26db8ec7
7 years ago
omar
cc26db8ec7
Merge branch 'master' into navigation
7 years ago
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.
7 years ago
omar
19e22baa06
ItemAdd(): more re-ordering of tests to match IsHovered() + comments
7 years ago
omar
344d48be31
IsItemHovered(), ItemAdd(): Fixed seemingly unnecessary comparaison of root windows, makes IsItemHovered() more consistent with internal IsHovered().
...
Original test was added in 6e99688fa7
should not have been using RootWindow in the first place.
The difference between public-facing and internal versions would only be noticeable with overlapped child windows, which doesn't really happen anyway
7 years ago
omar
c075786d8b
ItemAdd(): re-ordering the tests, submission should now be faster.
7 years ago
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().
7 years ago
omar
e87ad328e4
Moved implementation of Hovered-related functions next to each others + comments, before I attempt to work on them. No functional change here.
7 years ago
omar
842e88a8e3
Examples: Avoid using ImColor() to not tempt newcomers into looking at it
7 years ago
omar
869732c456
Nav: Removed unnecessary combo code (that kept the combo arrow highlighted after reverting to mouse controls). ( #787 )
7 years ago
omar
a2b2e56e8e
Merge branch 'master' into navigation
7 years ago
omar
e56eba44fe
Fixed not being able to move a window by clicking on one of its child window ( #1337 , #635 ), broken by 313d388bba
7 years ago
omar
8374a454da
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
7 years ago
omar
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c
) thanks @pdoane @mikesart
7 years ago
omar
bbd6d5d5b5
Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!).
7 years ago
omar
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
omar
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
7 years ago
omar
501e73feed
Minor comments
7 years ago
omar
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
7 years ago
omar
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
7 years ago
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)
7 years ago
omar
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
7 years ago
omar
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
7 years ago
omar
f1a20ec66d
Merge branch 'master' into navigation
7 years ago
omar
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
7 years ago
omar
c7a606ab7e
Horizontal layout does the minimum job to be usable internally - not exposed ( #97 )
7 years ago
omar
728deff56c
Comments, debug code (commented), todo list
7 years ago
omar
99b9f1c93c
Fix static misusage error with decent compilers. Error introduced in 4b82759598
7 years ago
omar
82748df71a
WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. ( #621 )
7 years ago
omar
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
7 years ago
omar
9577ebf008
Merge branch 'master' into navigation
7 years ago
omar
24f21bd4d4
Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem
...
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
7 years ago
omar
7e8069dd23
Merge branch 'master' into navigation
7 years ago
omar
c0547d358d
Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix.
7 years ago