omar
9a0171b803
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
35e4fa7b85
Merged from Navigation branch (DragBehavior)
7 years ago
omar
6cca4025ee
Merge from Navigation branch: 6aa8019763
7 years ago
omar
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
7 years ago
omar
550dc09998
Merged from Navigation branch (misc)
7 years ago
omar
aef041f948
Merged from Navigation branch
7 years ago
omar
c9298c2657
Merged from Navigation branch:
...
f71cdd13b7
Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
c816e6c742
Fixed SetScrollX() handling of center ratio (which actually wasn't exposed publicly). (#323 , #246 )
7 years ago
omar
287a4b6b38
Merged from Navigation branch: 5cac4926c8
fix title bar color of window under a modal window.
7 years ago
omar
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
omar
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
omar
1f1e63f705
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ( #787 )
7 years ago
omar
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
omar
6752cba4bc
Removed duplicate comments
7 years ago
omar
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
omar
f8eef49575
ProgressBar() fixed rendering when straddling rounded area. ( #1296 )
7 years ago
omar
7a9ea281be
ImSwap() helper.
7 years ago
omar
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
omar
7a7327adde
ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
7 years ago
omar
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
b295e185ff
Updated copyright date for 2017, updated Gallery link
7 years ago
omar
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
7 years ago
omar
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
omar
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
7 years ago
omar
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
7 years ago
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.
7 years ago
omar
40f608ce9b
Version 1.52 WIP
7 years ago
omar
55a6209931
Version 1.51
7 years ago
omar
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. ( #1294 , #787 )
7 years ago
omar
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4
) ( #707 )
7 years ago
omar
b0fc30bd19
Merge branch 'master' into navigation
7 years ago
omar
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
omar
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e
merged from Nav.
7 years ago
omar
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245
)
7 years ago
omar
6be7d4904e
Merge part of 88c1966629
from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago
omar
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
7 years ago
ocornut
2ad2190d47
Merge 20a0fde012
Tidying up default clipboard handler for non Windows-OS (from Nav branch)
7 years ago
omar
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon
7 years ago
omar
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
7 years ago
ocornut
50b3a14d0a
Merge 2545d75c3b
from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
omar
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
omar
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
omar
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
7 years ago
omar
6c82af2b96
Navigation branch fix (we changed Clip)
7 years ago
omar
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
8 years ago
omar
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
omar
530baee1a7
Removed tabs that slipped through the cracks
8 years ago
omar
067127f113
Columns: Caching columns clipping rectangles ( #125 )
8 years ago
omar
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
8 years ago
omar
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
8 years ago