Commit Graph

  • 46dcd9aa50 Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() (#125) omar 2017-12-22 19:45:15 +0100
  • 471bcf8b5e Columns: Fixed dragging when using a same of columns multiple times in the frame. (#125) omar 2017-12-22 19:35:58 +0100
  • 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) omar 2017-12-22 13:41:41 +0100
  • 8d21ee56d2 ImDrawList, Font: Fixed bug introduced in 531c11d5c7 (#1519) omar 2017-12-22 20:19:48 +0100
  • 287380261c Merge branch 'master' into navigation omar 2017-12-21 19:55:21 +0100
  • c8c872c753 Internals: String functions uses size_t in their signature omar 2017-12-21 13:43:09 +0100
  • 996dfb21cf ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore. omar 2017-12-21 19:48:51 +0100
  • d139bd088d Begin: Moved modal darkening draw block omar 2017-12-21 19:27:06 +0100
  • 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. omar 2017-12-21 19:01:53 +0100
  • 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. omar 2017-12-21 18:50:27 +0100
  • 230f826ef5 ImDrawList: Comments omar 2017-12-21 14:50:58 +0100
  • 4c2514dc29 Merge branch 'master' into navigation omar 2017-12-21 11:18:42 +0100
  • 6193f46af2 Active Modal window always set the WantCaptureKeyboard flag (#744) omar 2017-12-21 11:18:30 +0100
  • b366dd9322 BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize. omar 2017-12-20 17:40:58 +0100
  • 7fed4eb82d Merge branch 'ibachar-master' omar 2017-12-20 16:25:21 +0100
  • 55c0d2b9ab InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (#1506, #1508) omar 2017-12-20 16:25:03 +0100
  • abaf347deb Added a flag for text input to disable undo / redo ibachar 2017-12-17 15:27:56 +0200
  • b4d99fb14c A couple of small fixes. Cameron Hart 2017-12-17 12:06:43 +1100
  • fd0fb1d2ba Merge tag 'v1.52' of github.com:ocornut/imgui into imstr_152_merge Cameron Hart 2017-12-16 17:58:53 +1100
  • 65afff864f
    Tweak OpenGL versions Jiří Šebele 2017-12-15 18:12:28 +0100
  • b1d90b565d Columns: Fixed previous commit (wrong chunk commited) (#125) omar 2017-12-15 17:09:41 +0100
  • b9391d1692 Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125) omar 2017-12-15 15:44:27 +0100
  • 525fe6c3d8
    Bump OpenGL version to 3.3 for the SDL example Jiří Šebele 2017-12-15 16:58:20 +0100
  • 6497f5dc1b Merge branch 'master' into navigation omar 2017-12-15 11:59:50 +0100
  • 445e901a3a Tabs (old version): minor renaming/comments omar 2017-12-15 11:31:10 +0100
  • cd918e7715 Merge branch 'master' into tabs omar 2017-12-15 11:29:38 +0100
  • 0c6e260f73 Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143) omar 2017-12-15 11:16:10 +0100
  • 6effcf21d6 Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. (#143) omar 2017-12-15 11:09:18 +0100
  • 51433e26af Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143) omar 2017-12-15 10:15:51 +0100
  • 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) omar 2017-12-14 18:42:41 +0100
  • ac8e708c3e Fixed unused variable warning. Branimir Karadžić 2017-12-14 09:08:18 -0800
  • 07ed9f8451 TODO list update omar 2017-12-14 11:08:16 +0100
  • fa68cb5364 Demo: Console: Tweak. omar 2017-12-13 23:07:07 +0100
  • 45bca7851d Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382) omar 2017-12-13 22:30:16 +0100
  • 5f39758202 Minor tweaks, comments, spacing fixes omar 2017-12-13 22:21:49 +0100
  • cc3192f347 Merge branch 'master' into navigation omar 2017-12-13 22:09:08 +0100
  • 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. omar 2017-12-13 22:05:48 +0100
  • 3905816082 Added ShowFontSelector(), ShowStyleSelector(). (#707) omar 2017-12-13 21:59:16 +0100
  • ddbcda8c1b Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125) omar 2017-12-13 21:51:23 +0100
  • ba71e1c0e4 Columns: Minor stylistic fixes. (#125) omar 2017-12-13 21:48:56 +0100
  • 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) omar 2017-12-13 19:44:54 +0100
  • e8e84a6ad6 Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125) omar 2017-12-13 19:26:04 +0100
  • 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) omar 2017-12-13 19:21:21 +0100
  • b016215c80 Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499) omar 2017-12-13 19:07:09 +0100
  • 3a31a75e3b Columns: Refactor: Renamed all members. (#125, #1499) omar 2017-12-13 18:42:06 +0100
  • 78320aa633 Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499) omar 2017-12-13 18:37:58 +0100
  • f9b72ec92f Merge ef7540ddf9 into 027ffd91ea Geoffrey Tucker 2017-12-13 09:21:11 +0000
  • ef7540ddf9 Fixed an issue where dragging the columns to the edge of the window would collapse the columns, losing their width data. With this change, the old column widths are remembered until the columns are no longer being dragged. This means columns can be collapsed by dragging them all the way to the right side of the window, and then expanded again by dragging them back to the left, without losing their width data until the columns are actually deselected and no longer being dragged. Geoffrey Tucker 2017-12-13 01:14:23 -0800
  • 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). omar 2017-12-12 23:49:04 +0100
  • 16fb58984f Merge branch 'master' into navigation omar 2017-12-12 23:41:48 +0100
  • 90d0b8b58b Navigation: minor sync to reduce drifts between changes omar 2017-12-12 23:41:20 +0100
  • 8b59ed0708 Drag and Drop: Exposed some internals. omar 2017-12-12 23:37:27 +0100
  • 90788a1242 ImVector: Added ImVector::contains() helper omar 2017-12-12 23:36:42 +0100
  • 7c7a7baf76 Merged miscellaneous small stuff (from nav/dock branches). omar 2017-12-12 23:36:25 +0100
  • b174fcc9af Added IsAnyWindowFocused() (from Nav branch). omar 2017-12-12 23:35:04 +0100
  • fa9327ccf8 Merge branch 'master' into navigation omar 2017-12-12 20:44:12 +0100
  • d0a1be0de0 Merge branch 'drag_and_drop' omar 2017-12-12 20:39:52 +0100
  • ab049c6fc0 Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS omar 2017-12-12 20:34:16 +0100
  • 7faa5b16bb Tweak omar 2017-12-12 19:15:00 +0100
  • 3ea5e67ba2 Merge branch 'master' into navigation omar 2017-12-12 18:47:23 +0100
  • 02e0a078f4 Begin: Tidying up code to make it more readable. omar 2017-12-12 18:46:42 +0100
  • 28bbf1ade6 Fixed ParentWindow setup which broke Modal windows (fix c65124f415) omar 2017-12-12 18:45:57 +0100
  • 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) omar 2017-12-12 18:17:18 +0100
  • 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