eefea0588a
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. ( #1380 , #1502 )
2017-12-14 18:42:41 +01:00
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
2017-12-13 22:30:16 +01:00
5f39758202
Minor tweaks, comments, spacing fixes
2017-12-13 22:21:49 +01:00
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
2017-12-13 21:59:16 +01:00
90788a1242
ImVector: Added ImVector::contains() helper
2017-12-12 23:36:42 +01:00
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
2017-12-12 23:36:25 +01:00
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
2017-12-12 23:35:04 +01:00
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
2017-12-12 15:44:22 +01:00
7ec934f439
Drag and Drop: Comments
2017-12-12 15:33:26 +01:00
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-12-12 15:02:05 +01:00
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +01:00
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
2017-12-12 14:12:49 +01:00
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).
2017-12-12 14:07:12 +01:00
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
2017-12-12 12:52:24 +01:00
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
2017-12-12 12:50:42 +01:00
185c1eaaf3
Alignment + removed comments
2017-12-11 22:55:28 +01:00
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
2017-12-11 22:42:12 +01:00
6b168b43ff
Comments ( #822 )
2017-12-11 19:47:23 +01:00
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:39:27 +01:00
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
2017-12-11 16:22:52 +01:00
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
2017-12-11 16:19:37 +01:00
1096e14356
ImFont: Added GetDebugName() helper.
2017-12-10 18:34:32 +01:00
e3e0326ea9
Exposed BeginCombo() publicly.
2017-12-10 18:08:59 +01:00
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
2017-12-10 17:57:27 +01:00
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 )
2017-12-10 17:36:30 +01:00
0872020c5c
Comments
2017-12-10 16:11:29 +01:00
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
2017-12-10 16:05:47 +01:00
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
2017-12-08 18:32:12 +01:00
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
2017-12-08 12:48:53 +01:00
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
2017-12-07 21:14:25 +01:00
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
2017-12-07 13:27:49 +01:00
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
2017-12-07 12:49:52 +01:00
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-06 15:13:45 +01:00
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
2017-12-06 15:13:45 +01:00
63712d5f5c
Merge branch 'master' into drag_and_drop
2017-11-28 17:28:45 +01:00
4c4f1b0224
ImVector: Added ImVector::push_front helper.
2017-11-28 10:49:43 +01:00
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
2017-11-27 20:59:05 +01:00
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
2017-11-27 19:02:00 +01:00
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
2017-11-24 16:56:17 +01:00
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
2017-11-20 13:53:16 +01:00
31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
2017-11-20 13:31:40 +01:00
ba095f81a5
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
2017-11-20 13:07:14 +01:00
8c0f2e4946
Added comment to help people dealing with 58345b11e1 breakage ( #707 )
2017-11-20 13:05:50 +01:00
79f07f6ff0
Add AddImageRounded() to ImDrawList
2017-11-19 21:56:46 +01:00
92212b17aa
Merge branch 'master' into drag_and_drop
2017-11-19 16:23:37 +01:00
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
2017-11-19 15:56:51 +01:00
c433bc971f
Reorder fields for consistency.
2017-11-19 14:58:10 +01:00
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
2017-11-19 13:52:40 +01:00
9886b09a0a
Minor tweak, removed extraneous empty destructor.
2017-11-19 12:42:17 +01:00
e605f21797
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
2017-11-19 12:36:14 +01:00
