3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
02e0a078f4
Begin: Tidying up code to make it more readable.
7 years ago
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
7 years ago
ef1a683ebe
Removed use of obsolete ImGui API.
7 years ago
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
ee7f1921e8
Internals: Added GetSmallSquareSize()
7 years ago
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
7 years ago
8d8f4934fb
Demo: mouse dragging demo tweaks
7 years ago
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
7 years ago
de4a851f95
Font documentation update ( #1498 )
7 years ago
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
7 years ago
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
7 years ago
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
7 years ago
185c1eaaf3
Alignment + removed comments
7 years ago
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
7 years ago
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
7 years ago
6b168b43ff
Comments ( #822 )
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
7 years ago
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
7 years ago
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
7 years ago
e67f3809ed
Replaced obsolete function with new one.
7 years ago
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
71296910a0
Demo: Tweaks and spacing. Stopped using rand() function in demo code.
7 years ago
4b8857d536
Demo: About box tweaks.
7 years ago
1096e14356
ImFont: Added GetDebugName() helper.
7 years ago
e3e0326ea9
Exposed BeginCombo() publicly.
7 years ago
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
7 years ago
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 )
7 years ago
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
7 years ago
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
7 years ago
20ba79aa56
Demo: Added "No close" option.
7 years ago
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
7 years ago
0872020c5c
Comments
7 years ago
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
7 years ago
e23083a080
Fixed warning: logical ‘and’ of equal expressions
7 years ago
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
7 years ago
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
7 years ago
871a5cecc1
Merge branch 'master' into navigation
7 years ago
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
457011660e
Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
7 years ago
a263dce2f2
Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
7 years ago
9ce51ad9f6
Fix bad merge
7 years ago
a6f37287d8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
7 years ago
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
7 years ago
e998c7d3e3
Combo: Moved functions (untouched).
7 years ago
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.
7 years ago
omar
Branimir Karadžić