f1a20ec66d
Merge branch 'master' into navigation
7 years ago
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
7 years ago
c7a606ab7e
Horizontal layout does the minimum job to be usable internally - not exposed ( #97 )
7 years ago
728deff56c
Comments, debug code (commented), todo list
7 years ago
82748df71a
WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. ( #621 )
7 years ago
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
7 years ago
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
7e8069dd23
Merge branch 'master' into navigation
7 years ago
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
4b2781fe87
Begin: Moving some code into a CalcSizeAutoFit() function.
7 years ago
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.
7 years ago
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.
7 years ago
0a55573288
Begin(): Minor tidying up of flow
7 years ago
9f34925b2a
Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect
7 years ago
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
7 years ago
b9c185402e
Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows.
7 years ago
113b2467cd
Minor bits. Reduce usage of GImGui multiple times in same function.
7 years ago
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
7 years ago
f24b5f71ca
Merge branch 'master' into navigation
7 years ago
79ce9b74d5
BeginTooltipEx() internal tweaks
7 years ago
44e8d94aba
Merge branch 'master' into navigation
7 years ago
105f3b14e4
Merge branch 'master' into styles
7 years ago
9693fd5351
PushStyleVar/PopStyleVar: internal tweaks
7 years ago
7c9e38f60a
Style: Moving code in a function to make incoming diff easier to parse.
7 years ago
709653c330
Merge branch 'master' into styles
7 years ago
6c91a1ef7f
Minor comments
7 years ago
052999a6ab
More consistently uses "Dear ImGui"
7 years ago
54d30d758f
Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags
7 years ago
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
7 years ago
51fcef0c21
BeginCombo() tweaks, merged from Navigation branch.
7 years ago
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
7 years ago
790605e359
Minor comments + renaming internal fields
7 years ago
e1a7aa41cb
Improved ColorPicker hue wheel color interpolation
7 years ago
2600b28f5d
Begin(): fixed calling Begin() more than once per frame setting `window_just_activated_by_user` which in turn would set Appearing to true for that frame.
7 years ago
6400f2900a
Begin(): renamed locals.
7 years ago
a9c6a0f6ec
Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)
7 years ago
89cae37b49
Begin(): Tidying up some code, should be a no-op.
7 years ago
8fbe8709f9
TODO, minor tweak
7 years ago
e8dbf1c795
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
7 years ago
5658675e9d
Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)
7 years ago
804ee78731
Added IsWindowAppearing().
7 years ago
670d40642f
Fixed C4267 conversion from size_t to int.
7 years ago
6a1ba317c7
Demo: Minor coding style tweaks so bgfx copy needs less patching.
7 years ago
97a40e74fb
Nav: Fixed bad merge of 6def01be5d so the bug fixed in #840 wasn't fully fixed in Nav branch.
7 years ago
96d2942373
InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).
7 years ago
9a0171b803
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
35e4fa7b85
Merged from Navigation branch (DragBehavior)
7 years ago
6cca4025ee
Merge from Navigation branch: 6aa8019763
7 years ago
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
7 years ago
550dc09998
Merged from Navigation branch (misc)
7 years ago
aef041f948
Merged from Navigation branch
7 years ago
c9298c2657
Merged from Navigation branch:
...
f71cdd13b7c816e6c742#323 , #246 )
7 years ago
287a4b6b38
Merged from Navigation branch: 5cac4926c8 fix title bar color of window under a modal window.
7 years ago
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
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
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
6752cba4bc
Removed duplicate comments
7 years ago
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
f8eef49575
ProgressBar() fixed rendering when straddling rounded area. ( #1296 )
7 years ago
7a9ea281be
ImSwap() helper.
7 years ago
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
7a7327adde
ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
b295e185ff
Updated copyright date for 2017, updated Gallery link
7 years ago
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
7 years ago
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
7 years ago
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
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
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. ( #1294 , #787 )
7 years ago
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) ( #707 )
7 years ago
b0fc30bd19
Merge branch 'master' into navigation
7 years ago
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
7 years ago
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
7 years ago
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
7 years ago
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
7 years ago
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon
7 years ago
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
7 years ago
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
7 years ago
6c82af2b96
Navigation branch fix (we changed Clip)
7 years ago
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
8 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
530baee1a7
Removed tabs that slipped through the cracks
8 years ago
067127f113
Columns: Caching columns clipping rectangles ( #125 )
8 years ago
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
8 years ago
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
8 years ago
83e8d10fab
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. ( #125 , #913 , #893 , #1138 )
8 years ago
1ebd7ec049
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. ( #519 , #125 , #913 )
8 years ago
7ff1c149b5
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. ( #913 , #125 )
8 years ago
omar
omar
Václav Patejdl
Branimir Karadžić