Commit Graph

  • ef1a683ebe Removed use of obsolete ImGui API. Branimir Karadžić 2017-12-12 08:54:51 -0800
  • e98df91dc4 Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707) omar 2017-12-12 15:44:22 +0100
  • 7ec934f439 Drag and Drop: Comments omar 2017-12-12 15:33:26 +0100
  • 052b6021dd Merge branch 'master' into drag_and_drop omar 2017-12-12 15:02:05 +0100
  • 0a3db267c3 Merge branch 'master' into navigation omar 2017-12-12 14:58:53 +0100
  • 6190ab0084 Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing() omar 2017-12-12 14:14:58 +0100
  • c22657985a Added GetFrameHeight() function (used to be SmallSquareSize internally) omar 2017-12-12 14:12:49 +0100
  • ee7f1921e8 Internals: Added GetSmallSquareSize() omar 2017-12-12 00:57:45 +0100
  • 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). omar 2017-12-12 14:06:24 +0100
  • 8d8f4934fb Demo: mouse dragging demo tweaks omar 2017-12-12 13:11:40 +0100
  • fa179d0ad8 Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags (#1382) omar 2017-12-12 12:52:24 +0100
  • de4a851f95 Font documentation update (#1498) omar 2017-12-12 11:20:45 +0100
  • c65124f415 Internals: ParentWindow is now NULL for non-child windows and means what everyone expects. omar 2017-12-12 00:48:28 +0100
  • f42d7b89e2 Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing. omar 2017-12-12 00:18:31 +0100
  • 4a555d35f0 IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. (#1382) omar 2017-12-11 23:16:27 +0100
  • b443e81cb0 Merge branch 'imstr' of github.com:bitshifter/imgui into imstr Cameron Hart 2017-12-12 22:23:49 +1100
  • eddf6cda27 Merge tag 'v1.51' into imstr_151_merge Cameron Hart 2017-12-12 22:22:25 +1100
  • 2f2e138932 Figured out that LOWORD(lParam) resolves to hit test. There are a bunch of defines for this value all beginning with HT. Aaron 2017-12-11 16:17:32 -0800
  • fd11e5a588 Attempt at getting ImGui and Windows cursors to play well together. Aaron 2017-12-11 16:06:30 -0800
  • 7aa58bbf0e Updating imgui demo to show off ImGuiWindowFlags_ResizeFromAnySide. Added cursor support to several of the platform examples. Aaron 2017-12-11 14:25:07 -0800
  • 185c1eaaf3 Alignment + removed comments omar 2017-12-11 22:54:03 +0100
  • f93945540f Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. (#600, #1330) omar 2017-12-11 22:41:33 +0100
  • 45f440bb7d Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap omar 2017-12-11 22:39:10 +0100
  • 6b168b43ff Comments (#822) omar 2017-12-11 19:47:23 +0100
  • 2b9d8ab91d Merge branch 'master' into drag_and_drop omar 2017-12-11 16:39:27 +0100
  • 38bfdb357e Merge branch 'master' into navigation omar 2017-12-11 16:28:47 +0100
  • f06f68f3ce Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016) omar 2017-12-11 16:22:52 +0100
  • 9fd15defe4 Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. (#787) omar 2017-12-11 16:19:37 +0100
  • 6d93011fdf alloca fix to allow Clang with Microsoft CodeGen path omar 2017-12-11 10:25:44 +0100
  • e67f3809ed Replaced obsolete function with new one. Branimir Karadžić 2017-12-10 17:20:28 -0800
  • d1db229907 Merge branch 'master' into navigation omar 2017-12-10 19:01:59 +0100
  • 71296910a0 Demo: Tweaks and spacing. Stopped using rand() function in demo code. omar 2017-12-10 18:49:47 +0100
  • 4b8857d536 Demo: About box tweaks. omar 2017-12-10 18:45:05 +0100
  • 1096e14356 ImFont: Added GetDebugName() helper. omar 2017-12-10 18:34:32 +0100
  • e3e0326ea9 Exposed BeginCombo() publicly. omar 2017-12-10 18:08:59 +0100
  • 080f61858f Sorted typedefs/enumations forward declarations in imgui.h omar 2017-12-10 17:57:27 +0100
  • dbf5c422d9 Merge 4099aff8f2 into eab6333a0b Mikulas Florek 2017-12-10 16:52:32 +0000
  • 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) omar 2017-12-10 17:36:30 +0100
  • 7ac1583411 Scrollbar: Minor simplication of the code using InnerRect data. omar 2017-12-10 17:27:37 +0100
  • a9b01600ac Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations. omar 2017-12-10 17:24:10 +0100
  • 20ba79aa56 Demo: Added "No close" option. omar 2017-12-10 17:02:41 +0100
  • b75acc21b0 Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0 omar 2017-12-10 16:48:18 +0100
  • 0872020c5c Comments omar 2017-12-10 16:11:29 +0100
  • f72b002da8 Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). (#246, #519, #1444) omar 2017-12-10 16:05:47 +0100
  • e23083a080 Fixed warning: logical ‘and’ of equal expressions Branimir Karadžić 2017-12-09 13:47:54 -0800
  • 0365c524a2 ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. (#1489) omar 2017-12-09 21:25:20 +0100
  • a8c7b1a2a2 ColorEdit4: Made IsItemActive() return true when picker popup is active. (#1489) omar 2017-12-09 21:17:27 +0100
  • 871a5cecc1 Merge branch 'master' into navigation omar 2017-12-08 18:32:46 +0100
  • c9f0275e22 Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags. omar 2017-12-08 18:32:12 +0100
  • 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. omar 2017-12-08 18:28:17 +0100
  • 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. omar 2017-12-08 17:16:33 +0100
  • 9ce51ad9f6 Fix bad merge omar 2017-12-08 15:11:35 +0100
  • a6f37287d8 Merge branch 'master' into navigation omar 2017-12-08 15:06:37 +0100
  • 7ac5f11b29 Standardizing the casing/format of internal window names + Misc comments. omar 2017-12-08 14:52:33 +0100
  • befc58771c Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows. omar 2017-12-08 14:48:25 +0100
  • e998c7d3e3 Combo: Moved functions (untouched). omar 2017-12-08 14:45:43 +0100
  • 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. omar 2017-12-08 14:44:58 +0100
  • d9d231dc6b Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally. omar 2017-12-08 12:30:58 +0100
  • 74f42baf3e Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.) omar 2017-12-08 11:48:18 +0100
  • 541dfd7901 Combo: Comments + fixed missing lower window padding. omar 2017-12-07 22:23:27 +0100
  • 9872297a84 Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup() omar 2017-12-07 22:22:53 +0100
  • a4863e8084 Demo: Picker with palette demo supports drag and drop. (#143, #346) omar 2017-12-08 12:49:35 +0100
  • 7bf85db6c4 Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h (#143) omar 2017-12-08 12:48:53 +0100
  • b6b940c8ee Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered() omar 2017-12-08 09:35:23 +0100
  • e118239f69 IsItemHovered() comments (#1382) omar 2017-12-08 09:34:05 +0100
  • 553b0fcf8f Merge branch 'master' into navigation omar 2017-12-07 21:20:16 +0100
  • ca0bb000ad Begin: Factored out a bit of code to CalcSizeContents() omar 2017-12-07 20:47:57 +0100
  • f658edc72a Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation. omar 2017-12-07 20:47:00 +0100
  • 45466a8cf9 Internals: BeginCombo() added dummy ImGuiComboFlags. omar 2017-12-07 20:14:24 +0100
  • 97edd42fc0 Indent(), Unindent(): Allow passing negative values. omar 2017-12-07 18:51:48 +0100
  • 7f2b9ea4c0 Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one. omar 2017-12-07 18:10:37 +0100
  • 8dcc1a8a20 Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises. omar 2017-12-07 18:07:42 +0100
  • e045eddd77 Minor tweaks. Using ImGuiAxis defines. omar 2017-12-07 17:11:51 +0100
  • 92f7bd3605 Fixed 64-bit warnings. omar 2017-12-07 21:06:15 +0100
  • cc2c023880 Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df. omar 2017-12-07 17:04:39 +0100
  • e6215b6ca0 Merge branch 'master' into navigation + merge fix omar 2017-12-07 16:42:52 +0100
  • 3c9f9a455e Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO. omar 2017-12-07 16:36:07 +0100
  • 8959c64b33 Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended omar 2017-12-07 13:26:56 +0100
  • abe5ad3c7a Demo: Added display for IsMouseDragging() function. omar 2017-12-06 23:38:33 +0100
  • 94bf12f14b Demo: Display better mouse cursor info for debugging backends. omar 2017-12-06 22:20:08 +0100
  • 20c7aab60c Exposed GetOverlayDrawList(). (~#545, ~#530) omar 2017-12-07 12:49:52 +0100
  • 6deb865f78 Nav: Merge fix. omar 2017-12-06 17:48:28 +0100
  • 2fc6a82665 Merge branch 'master' into navigation omar 2017-12-06 17:44:40 +0100
  • 8f41508c52 Begin: Move the code that update the Appearing flag above the BeginDocked() branch. omar 2017-12-06 17:42:28 +0100
  • 2fc9a2e6e7 Fixed nav branch merge issue. omar 2017-12-06 15:20:36 +0100
  • beda5fc5a0 Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df. omar 2017-12-06 15:13:23 +0100
  • ecacaf7f2d Lower-right resize grip only appears when hovered. (#822) omar 2017-12-05 23:03:08 +0100
  • 3b7e4eaf38 Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822) omar 2017-12-05 22:53:58 +0100
  • 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). omar 2017-12-05 22:38:02 +0100
  • e103fe8c1f Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822) omar 2017-12-05 22:05:24 +0100
  • 90ae1c59c4 Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822) omar 2017-12-05 20:36:35 +0100
  • fe2cf231a8
    Update README.md omar 2017-12-06 11:18:17 +0100
  • 729333293c Merge branch 'master' into navigation omar 2017-12-05 22:56:35 +0100
  • 0f119865a6 Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. (#822) omar 2017-12-05 22:53:58 +0100
  • 5686c72bbd 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). omar 2017-12-05 22:38:02 +0100
  • b9dc0caee3 Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. (#822) omar 2017-12-05 22:05:24 +0100
  • 2ca4f9e862 Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). (#822) omar 2017-12-05 20:36:35 +0100
  • 364251146b Merge branch 'master' into navigation omar 2017-12-05 16:15:05 +0100
  • 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. omar 2017-12-05 16:12:45 +0100
  • 16d9fa30b2 Merge branch 'master' into drag_and_drop omar 2017-12-05 09:21:07 +0100