Commit Graph

  • c9be7d7254 Merge branch 'master' into navigation omar 2018-01-12 19:21:12 +0100
  • 0a98202714 Nav: Standardized FIXME-NAV marker. omar 2018-01-12 19:13:15 +0100
  • 16285603f2 Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless) omar 2018-01-12 19:11:11 +0100
  • cc173d7619 Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542) omar 2018-01-11 23:21:24 +0100
  • 5e9ae92ae9 Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542) omar 2018-01-11 23:17:34 +0100
  • 01d899d59d Merge 7411207205 into 6a1011cf53 Nick Dandoulakis 2018-01-11 20:20:07 +0000
  • 7411207205
    FindRenderedTextEnd: fixed null text issue Nick Dandoulakis 2018-01-11 22:12:25 +0200
  • f7b10fc954 Merge branch 'master' into navigation omar 2018-01-11 18:18:44 +0100
  • 6a1011cf53 MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337) omar 2018-01-11 18:16:16 +0100
  • b74f24c3e5 Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)" omar 2018-01-11 18:08:14 +0100
  • 1c95dea88c Merge branch 'master' into navigation omar 2018-01-11 17:37:02 +0100
  • 7d2a068dea Begin: Shuffling bits of code around. omar 2018-01-11 17:33:37 +0100
  • cd7e178eac Merge branch 'master' into navigation omar 2018-01-11 16:49:59 +0100
  • 651538e13b Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337) omar 2018-01-11 16:43:03 +0100
  • a8bbb0b7dd Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts. omar 2018-01-11 15:47:07 +0100
  • 12aa3cb09e Demo: Tweaks format. omar 2018-01-11 15:22:33 +0100
  • 398a4e1865 Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382) omar 2018-01-11 13:58:25 +0100
  • a63fbbca8b Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382) omar 2018-01-11 13:49:32 +0100
  • 67671c0ab5 Merge branch 'master' into navigation omar 2018-01-10 23:11:26 +0100
  • 1eee10778b Internals: Begin: Refactor some code into an UpdateManualResize() function. omar 2018-01-10 23:06:51 +0100
  • 483f9b0d07 Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible. omar 2018-01-10 22:55:29 +0100
  • bc90a3eeae Tabs: Fixes for the old Tabs branch, for good measure. omar 2018-01-10 19:10:42 +0100
  • dd071e14a2 Merge branch 'master' into tabs omar 2018-01-10 19:09:00 +0100
  • 03f5cd6ca1 Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787) omar 2018-01-09 00:05:04 +0100
  • 919fc548ad Merge branch 'master' into navigation omar 2018-01-10 18:58:26 +0100
  • 6c583315e6 Begin: Moving some code around for the benefits of the wip viewport branch. omar 2018-01-10 18:56:51 +0100
  • f610e25682 Internals: Using ImFloor().when appropriate. omar 2018-01-10 16:11:29 +0100
  • 0cabd81071 Internals: Rect: Added ClipWillFull helper + comments on variations. omar 2018-01-08 23:59:51 +0100
  • 92d75c44bc Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience. omar 2018-01-08 23:59:12 +0100
  • fe919995da Merge branch 'master' into navigation omar 2018-01-08 16:35:12 +0100
  • 933ee6cd5d InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541) omar 2018-01-08 16:01:02 +0100
  • fd4d63a0c5 InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541) omar 2018-01-08 15:54:41 +0100
  • ce95b84825 Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541) omar 2018-01-08 15:30:39 +0100
  • 945b89693f Merge 65afff864f into 39cb56c39e Jiří Šebele 2018-01-07 18:09:57 +0000
  • 39cb56c39e Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466) omar 2018-01-07 19:06:20 +0100
  • 7484c63449 Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504) omar 2018-01-07 19:05:42 +0100
  • 168200f915 Popups: Comments, reorganize bits of the header section, renamed parameters. omar 2018-01-07 18:15:43 +0100
  • a8e5542d78 BeginPopup: Exposed extra_flags publicly. (#1533) omar 2018-01-07 18:13:01 +0100
  • 3f4eccf154 Merge branch 'master' into navigation omar 2018-01-07 16:22:09 +0100
  • 3fc7cf190d OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533) omar 2018-01-07 16:20:02 +0100
  • deab2ab015 Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497) omar 2018-01-07 16:15:54 +0100
  • 69ff65f054 Internals: Popup: Renaming fields. omar 2018-01-07 16:11:25 +0100
  • 3678307cd9 Popup, Menus: Tweaks and comments. omar 2018-01-07 15:56:14 +0100
  • 369189b675 Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion. omar 2018-01-07 15:40:46 +0100
  • e09852fc49 Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439) omar 2018-01-07 15:34:15 +0100
  • 63e4677b81 Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439) omar 2018-01-07 15:22:54 +0100
  • c337cdcfd3 Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently omar 2018-01-07 15:02:09 +0100
  • 7ad169fa09 Merge branch 'master' into navigation + fix previous merge omar 2018-01-07 14:33:44 +0100
  • d730a763f6 Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well. omar 2018-01-07 14:32:42 +0100
  • 66b2ee6ea2 Merge branch 'master' into navigation omar 2018-01-07 14:25:05 +0100
  • a34490239c Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch. omar 2018-01-07 13:51:36 +0100
  • 5fd19f037f Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow() omar 2018-01-07 12:34:52 +0100
  • 2874aabb93 Internals: BringWindowToFront() iterate front to back, faster in majority of use cases. omar 2018-01-07 12:29:54 +0100
  • 3d24a9eb40 Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538) omar 2018-01-05 22:32:27 +0100
  • 65dd55cb2b
    Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch omar 2018-01-05 22:27:40 +0100
  • 407955d9fb Examples: Using IM_OFFSETOF macro. + Comments omar 2018-01-05 22:05:02 +0100
  • bfc25bc8a3
    CS_DBLCLKS support for DirectX 11 Nick Dandoulakis 2018-01-05 22:28:27 +0200
  • 583e97b297
    CS_DBLCLKS support for DirectX 10 Nick Dandoulakis 2018-01-05 22:25:30 +0200
  • 20ae6439ea
    CS_DBLCLKS support for Directx9 Nick Dandoulakis 2018-01-05 22:16:35 +0200
  • 95b773370f Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later. This reverts commit 007f4034c9. omar 2018-01-05 17:39:53 +0100
  • 007f4034c9 Internals: Added LastActiveId, LastActiveIdTimer. (#1537) omar 2018-01-05 15:33:24 +0100
  • 5869316cb1 Merge 2f2e138932 into 4c90529c62 amc522 2018-01-05 02:32:30 +0000
  • 4c90529c62 Examples: Visual Studio projects: Disabled extraneous function-level check in Release build. omar 2018-01-04 11:42:05 +0100
  • ecbfdd3143 Added extraneous initialization to NULL. (#1527). omar 2018-01-04 11:06:12 +0100
  • 29c194b2a4 Merge branch 'master' into navigation omar 2018-01-03 20:47:42 +0100
  • 4fc9f44073 Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op. omar 2018-01-03 20:45:06 +0100
  • 4b1240b2e1 Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this. omar 2017-11-23 18:18:56 +0100
  • b2ec0741f1 Internals: Settings api tweaks omar 2017-12-15 20:59:00 +0100
  • 2b8224692e Merge branch 'master' into navigation omar 2018-01-03 20:26:24 +0100
  • 0a0b252bb6 DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need. omar 2018-01-03 16:56:41 +0100
  • a7deb3a394 Demo: Minor tweaks. omar 2018-01-03 15:36:51 +0100
  • 9fbecac87e Demo: Improved Selectable() examples. (#1528) omar 2018-01-03 15:11:14 +0100
  • 33f7769d85 Columns: Clear offsets data when columns count changed. (#1525) omar 2018-01-03 14:38:01 +0100
  • f9b2058d5a Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots). omar 2018-01-03 14:35:11 +0100
  • 79d38e5ade Updated copyright date for 2018 omar 2018-01-03 14:31:13 +0100
  • 05ec0b0736 Casing tweaks + clarify license copyright (simpler/safer?) (#1346) omar 2018-01-03 14:30:40 +0100
  • 96ccc484f9 Merge branch 'master' into navigation omar 2018-01-03 12:33:27 +0100
  • 3c6fbe0849 Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData. omar 2018-01-03 12:31:56 +0100
  • 7fcbd45500 Internals: NextWindow: Renamed, moved functions to member. omar 2018-01-03 12:28:16 +0100
  • e339949de1 Internals: NextWindow: Using ImGuiCond for consistency. omar 2018-01-03 12:22:02 +0100
  • 04b44398eb Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied) omar 2018-01-03 12:12:41 +0100
  • 856ee17ed8 Fixed Android clang warning. Branimir Karadžić 2018-01-02 16:20:51 -0800
  • 7e03ee8d85 Merge branch 'master' into navigation omar 2018-01-02 17:21:49 +0100
  • bfc9c5216a
    Merge pull request #1529 from unprompted/master omar 2018-01-02 17:21:17 +0100
  • 561e9f286e Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors. Cory McWilliams 2018-01-02 10:46:20 -0500
  • 170bcb2d7c Internals: NewFrame: Shuffled some code around (to minimize upcoming patches) omar 2017-12-29 20:56:52 +0100
  • 4af84ac781 ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527) omar 2017-12-30 23:10:11 +0100
  • d1e9cde30d Fix issue with color edit label not rendering. Cameron Hart 2017-12-30 13:12:59 +1100
  • 7a15fc8de5 Merge branch 'master' into navigation omar 2017-12-29 18:28:23 +0100
  • 6ec00a366a Internals: ImRect: Minor formatting tweaks. omar 2017-12-29 18:28:04 +0100
  • fbf2435f38 Exposed IM_OFFSETOF() helper in imgui.h omar 2017-12-29 17:18:31 +0100
  • eef9120e07 Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0). omar 2017-12-29 18:14:36 +0100
  • 2dd2ca0096 Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side. Removed internal corresponding ImRect::GetClosestPoint() for now. Essentially revert dcaafffe0e. omar 2017-12-29 17:59:13 +0100
  • 9f8632b131 Examples: Comments about invalid mouse pos. omar 2017-12-29 15:03:36 +0100
  • c4e6d622c1 Merge branch 'master' into navigation omar 2017-12-29 13:39:07 +0100
  • 4fbdb50dca MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable). omar 2017-12-28 23:51:58 +0100
  • 4ba2e85744 Demo: Tweak. Comments. Metrics: Added some Drag and Drop info. omar 2017-12-28 23:50:37 +0100
  • 90ff4ae5d1 BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time. omar 2017-12-28 23:08:48 +0100
  • e985baa35d Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later) omar 2017-12-28 17:05:52 +0100
  • 06bea369c0 DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs. omar 2017-12-28 16:54:16 +0100