2017-08-22 |
Merge branch 'master' into navigation
omar
committed
on 22 Aug 2017
|
---|---|
|
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
omar
committed
on 22 Aug 2017
|
|
|
|
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit
6be7d49 merged from Nav.
omar
committed
on 22 Aug 2017
|
|
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref
648f75b )
omar
committed
on 22 Aug 2017
|
|
Merge part of
88c1966 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
omar
committed
on 22 Aug 2017
|
|
Undo reordering of ImGuiKey in Nav branch
omar
committed
on 22 Aug 2017
|
|
|
|
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
omar
committed
on 22 Aug 2017
|
|
Merge branch 'master' into navigation
omar
committed
on 22 Aug 2017
|
|
Merge
20a0fde Tidying up default clipboard handler for non Windows-OS (from Nav branch)
ocornut
authored
on 30 Jul 2016
omar
committed
on 22 Aug 2017
|
|
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (#787). Thanks @Grouflon
omar
committed
on 22 Aug 2017
|
|
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291)
omar
committed
on 22 Aug 2017
|
|
Merge branch 'master' into navigation
omar
committed
on 22 Aug 2017
|
|
Merge fixes from ,master branch
omar
committed
on 22 Aug 2017
|
|
Merge
2545d75 from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
ocornut
authored
on 31 Jul 2016
omar
committed
on 22 Aug 2017
|
|
|
|
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
omar
committed
on 22 Aug 2017
|
|
|
|
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
omar
committed
on 22 Aug 2017
|
|
Navigation branch fix (we changed Clip)
omar
committed
on 22 Aug 2017
|
|
2017-08-21 |
Fixed an assert when calling CloseCurrentPopup() twice in a row.
omar
committed
on 21 Aug 2017
|
2017-08-20 |
|
Removed tabs that slipped through the cracks
omar
committed
on 20 Aug 2017
|
|
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
omar
committed
on 20 Aug 2017
|
|
Columns: Caching columns clipping rectangles (#125)
omar
committed
on 20 Aug 2017
|
|
Columns: Moved PushColumnClipRect() to imgui_internal.h
omar
committed
on 20 Aug 2017
|
|
Columns: Fix for explicit content width and scrollbar. (#519, #125)
omar
committed
on 20 Aug 2017
|
|
Merge branch 'ggtucker-master'
omar
committed
on 20 Aug 2017
|