omar
1f26652944
Various zealous warning fixes (thanks Clang).
2017-12-23 14:07:03 +01:00
omar
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ( #125 )
2017-12-22 20:21:35 +01:00
omar
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. ( #125 )
2017-12-22 20:21:02 +01:00
omar
e1a103b251
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ( #143 )
2017-12-22 20:20:52 +01:00
omar
8d21ee56d2
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ( #1519 )
2017-12-22 20:19:48 +01:00
omar
c8c872c753
Internals: String functions uses size_t in their signature
2017-12-21 19:49:54 +01:00
omar
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
2017-12-21 19:49:54 +01:00
omar
d139bd088d
Begin: Moved modal darkening draw block
2017-12-21 19:49:54 +01:00
omar
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
2017-12-21 19:01:53 +01:00
omar
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
2017-12-21 18:52:34 +01:00
omar
230f826ef5
ImDrawList: Comments
2017-12-21 18:48:09 +01:00
omar
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag ( #744 )
2017-12-21 11:18:30 +01:00
omar
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
2017-12-20 17:40:58 +01:00
omar
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
2017-12-20 16:25:03 +01:00
ibachar
abaf347deb
Added a flag for text input to disable undo / redo
2017-12-17 15:27:56 +02:00
omar
b1d90b565d
Columns: Fixed previous commit (wrong chunk commited) ( #125 )
2017-12-15 17:09:41 +01:00
omar
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ( #125 )
2017-12-15 17:06:47 +01:00
omar
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
2017-12-15 11:17:21 +01:00
omar
6effcf21d6
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. ( #143 )
2017-12-15 11:17:21 +01:00
omar
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
2017-12-15 10:15:51 +01:00
omar
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
Branimir Karadžić
ac8e708c3e
Fixed unused variable warning.
2017-12-14 18:14:43 +01:00
omar
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
2017-12-13 22:30:16 +01:00
omar
f265e16b84
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
...
This reverts commit 7ac1583411
2017-12-13 22:07:18 +01:00
omar
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
2017-12-13 21:51:23 +01:00
omar
ba71e1c0e4
Columns: Minor stylistic fixes. ( #125 )
2017-12-13 21:48:56 +01:00
omar
f7c5f420e7
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. ( #1500 )
2017-12-13 19:45:03 +01:00
omar
e8e84a6ad6
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ( #125 )
2017-12-13 19:26:04 +01:00
omar
4ae5c7e227
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. ( #125 , #1499 )
2017-12-13 19:21:21 +01:00
omar
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. ( #125 , #1499 )
2017-12-13 19:07:09 +01:00
omar
3a31a75e3b
Columns: Refactor: Renamed all members. ( #125 , #1499 )
2017-12-13 18:42:06 +01:00
omar
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. ( #125 , #1499 )
2017-12-13 18:41:51 +01:00
omar
027ffd91ea
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
2017-12-12 23:49:04 +01:00
omar
8b59ed0708
Drag and Drop: Exposed some internals.
2017-12-12 23:37:27 +01:00
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
2017-12-12 23:36:25 +01:00
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
2017-12-12 23:35:04 +01:00
omar
d0a1be0de0
Merge branch 'drag_and_drop'
2017-12-12 20:39:52 +01:00
omar
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-12-12 20:34:16 +01:00
omar
7faa5b16bb
Tweak
2017-12-12 19:15:00 +01:00
omar
02e0a078f4
Begin: Tidying up code to make it more readable.
2017-12-12 18:46:42 +01:00
omar
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
2017-12-12 18:45:57 +01:00
omar
d561a43a4d
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. ( #143 )
2017-12-12 18:17:37 +01:00
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
2017-12-12 15:44:22 +01:00
omar
7ec934f439
Drag and Drop: Comments
2017-12-12 15:33:26 +01:00
omar
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-12-12 15:02:05 +01:00
omar
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +01:00
omar
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
2017-12-12 14:12:49 +01:00
omar
ee7f1921e8
Internals: Added GetSmallSquareSize()
2017-12-12 14:08:58 +01:00
omar
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
omar
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
2017-12-12 12:50:43 +01:00
omar
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
2017-12-12 12:50:42 +01:00
omar
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
omar
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
2017-12-11 22:42:12 +01:00
omar
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
2017-12-11 22:39:10 +01:00
omar
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:39:27 +01:00
omar
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
omar
e3e0326ea9
Exposed BeginCombo() publicly.
2017-12-10 18:08:59 +01:00
omar
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
omar
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
2017-12-10 17:27:37 +01:00
omar
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
2017-12-10 17:24:10 +01:00
omar
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
2017-12-10 16:48:18 +01:00
omar
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
2017-12-10 16:05:47 +01:00
Branimir Karadžić
e23083a080
Fixed warning: logical ‘and’ of equal expressions
2017-12-10 12:15:29 +01:00
omar
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
2017-12-09 21:25:20 +01:00
omar
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
2017-12-09 21:17:27 +01:00
omar
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
2017-12-08 18:32:12 +01:00
omar
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.
2017-12-08 18:28:17 +01:00
omar
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.
2017-12-08 17:21:45 +01:00
omar
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
2017-12-08 15:04:06 +01:00
omar
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
2017-12-08 15:03:37 +01:00
omar
e998c7d3e3
Combo: Moved functions (untouched).
2017-12-08 15:03:32 +01:00
omar
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.
2017-12-08 15:03:26 +01:00
omar
d9d231dc6b
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
2017-12-08 15:02:17 +01:00
omar
74f42baf3e
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
2017-12-08 15:00:56 +01:00
omar
541dfd7901
Combo: Comments + fixed missing lower window padding.
2017-12-08 15:00:02 +01:00
omar
9872297a84
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
2017-12-08 14:59:49 +01:00
omar
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
omar
e118239f69
IsItemHovered() comments ( #1382 )
2017-12-08 09:34:05 +01:00
omar
ca0bb000ad
Begin: Factored out a bit of code to CalcSizeContents()
2017-12-07 21:14:54 +01:00
omar
f658edc72a
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
2017-12-07 21:14:49 +01:00
omar
45466a8cf9
Internals: BeginCombo() added dummy ImGuiComboFlags.
2017-12-07 21:14:41 +01:00
omar
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
2017-12-07 21:14:25 +01:00
omar
7f2b9ea4c0
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
2017-12-07 21:14:13 +01:00
omar
8dcc1a8a20
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
2017-12-07 21:14:00 +01:00
omar
e045eddd77
Minor tweaks. Using ImGuiAxis defines.
2017-12-07 21:13:23 +01:00
omar
92f7bd3605
Fixed 64-bit warnings.
2017-12-07 21:06:15 +01:00
omar
cc2c023880
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
2017-12-07 17:04:53 +01:00
omar
3c9f9a455e
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
2017-12-07 16:36:07 +01:00
omar
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
2017-12-07 13:29:14 +01:00
omar
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
2017-12-07 12:49:52 +01:00
omar
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
2017-12-06 17:42:28 +01:00
omar
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
2017-12-06 15:13:45 +01:00
omar
ecacaf7f2d
Lower-right resize grip only appears when hovered. ( #822 )
2017-12-06 15:13:45 +01:00
omar
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-06 15:13:45 +01:00
omar
531e559e49
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. ( #822 ) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
2017-12-06 15:13:45 +01:00
omar
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-06 15:13:45 +01:00
omar
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
omar
77d1a4b636
Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
2017-12-05 16:12:45 +01:00
omar
16d9fa30b2
Merge branch 'master' into drag_and_drop
2017-12-05 09:21:07 +01:00
omar
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. ( #319 )
2017-12-01 17:39:50 +01:00
