Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,406 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2ae19801a9'
${ noResults }
Commit Graph

2867 Commits (2ae19801a920b70b2923be88dbf2bca11f4a1c5f)

Author SHA1 Message Date
omar eb1d481915 Comments (#1230, #1611) 7 years ago
omar d8d1da27fd Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master 7 years ago
Randy Gaul 2c4a761982 __cdecl markup for non-standard calling conventions via MSVC 7 years ago
omar 64e0666803 Internals: Moved some of NewFrame() into UpdateMovingWindow(). 7 years ago
omar 7cc1bc7635 Added IsAnyMouseDown() helper. 
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
 7 years ago
omar 3b163ac35b Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.) 7 years ago
omar d17d21da1b Warning fix. (#1565) 7 years ago
omar 7c16d52f72 Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787) 7 years ago
omar f0364aa359 Merge branch 'context' 
# Conflicts:
#	examples/allegro5_example/main.cpp
#	examples/directx10_example/main.cpp
#	examples/directx11_example/main.cpp
#	examples/directx9_example/main.cpp
#	examples/marmalade_example/main.cpp
#	examples/opengl2_example/main.cpp
#	examples/opengl3_example/main.cpp
#	examples/sdl_opengl2_example/main.cpp
#	examples/sdl_opengl3_example/main.cpp
#	examples/vulkan_example/main.cpp
 7 years ago
omar 4e5b7612ae Nav: Documentation tweaks. (#787) 7 years ago
omar 3171f90a1a Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787) 7 years ago
omar 7e32fc7109 Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787) 7 years ago
omar ed4bbc4fd4 Nav: Comments, guides. 7 years ago
omar cea8017e0b Merge branch 'master' into context 7 years ago
omar db071184a0 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar b50dce54ea Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. (#1597, #143) 7 years ago
omar c6ba7c8231 Internals: TreeNode: Renaming local to be more consistent with other widgets. 7 years ago
omar e6926d9f7c Internals: Refactored bool LastItemRectHovered into flags. (#1597) 7 years ago
omar ce2b8d3255 Nav: Comments, removed extraneous parameter. 7 years ago
omar 0c0d811859 Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787) 7 years ago
omar fb9fecea5e Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. (#787) 7 years ago
omar 4932303e62 Nav: DragBehavior: Tweaks (to take the noise out of the next commit). 7 years ago
omar e5e3cc617e Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId. 7 years ago
omar fb7cf4a475 Nav: Removed old unnecessary ifdefs. 7 years ago
omar f35734c925 Nav: Debugging code. (#787) 7 years ago
omar 92ee6b1185 Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787) 7 years ago
omar 348c46d21e Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 11d0fc8220 Tooltip: BeginTooltip() sets NoInputs flag. 7 years ago
omar 1dedbf8091 Style: Fixed missing style.MouseCursorScale initialization (#939), messed up original commit badly. 7 years ago
omar 533fe8cb55 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 8ad88f725c Nav: Minor tidying up. (#787) 7 years ago
omar 3f297e74e4 Merging the minor/shallow changes from Navigation branch. 7 years ago
omar 2081fc15b5 Added assert in BeginChild(ImGuiId id). 7 years ago
omar 223be68d77 Nav: Debugging stuff. 7 years ago
omar 66ff820eaa Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. (#787) 7 years ago
omar 0bd15b52a6 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 147ec8d1e2 Style Added style.MouseCursorScale, may remove (#939). 7 years ago
omar 648de2fc00 Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. (#787, #1079) 7 years ago
omar ce9d7baaba Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (#787, #1079) 7 years ago
omar 9120938200 Nav: Revert 5c9ea4d53a with comments. (#787) 7 years ago
omar 96ddfbc973 Nav: Modal windows can't be closed with Nav PadCancel. (#787) 7 years ago
omar efbd8cebe7 Nav: Comments (#787) 7 years ago
omar c4fc879508 CloseButton: Fixed cross positioning. 7 years ago
omar 942c140710 CloseButton: Fixed cross positioning. 7 years ago
omar 68d3e139a7 Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. (#787) 7 years ago
omar 950f260a32 Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. (#787) 7 years ago
omar c7b7b181b5 Nav: CloseButton reacts when clipped. (#787) 7 years ago
omar 5c9ea4d53a Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. (#787) 7 years ago
omar eb737e0a42 Nav: Child window is restored on focus follow up. Fix bdd868704f. (#787, ~#727) One visible issue was pressing Left to leave a child menu. 7 years ago
omar 95f9c74b9a Metrics: Displaying some of the important internal window flags. 7 years ago
omar 79ff3c2d49 Merge branch 'master' into navigation 7 years ago
omar 07163804df Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h 7 years ago
omar 5812d0b751 Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. (#787) 7 years ago
omar fd6d8863f7 Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). (#787) 7 years ago
omar ef2c3bcdee Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). (#787) 7 years ago
omar 8cc2dbc3bd Internals: Nav: Extracted code into IsWindowNavFocusable(). (#787) 7 years ago
omar bdd868704f Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. (#787, vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows. 7 years ago
omar 7b22a91578 Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. (#787) 7 years ago
omar eaa6f490a2 Merge branch 'master' into navigation 
# Conflicts:
#	imgui_demo.cpp
 7 years ago
omar 9bc5c089b6 Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point. 7 years ago
omar 76d8af4036 Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. (#787) 7 years ago
omar aa2dda7610 Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue. 7 years ago
omar e6c0b212e8 Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. (#787) 
NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928
 7 years ago
omar 9c8fb804ed Log: Comments and extraneous assets to clarify intent. (#1584) 7 years ago
omar 27980d9688 Merge branch 'master' into context 7 years ago
omar 47e81a6194 Merge branch 'master' into navigation 7 years ago
omar cd3dd886de Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569) 7 years ago
omar 23c11e9764 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 596b6d6de2 Style: Enable window border by default. (#707) 7 years ago
omar bebe03db05 Metrics: Minor formatting tweaks 7 years ago
omar bd579e5429 Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. (#787). NavActive takes account of NavFlags enable flags. 7 years ago
omar 9fc6f5907b Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. (#787) 7 years ago
omar 1ed7bce3ed Nav: Removed old unused code. (#787) 7 years ago
omar a8763d14c5 Internals: Renaming. 7 years ago
omar 38197a236d Internals: Renaming. 7 years ago
omar a7ad5134e5 Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. (#787) 7 years ago
omar acf21ee429 Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. (#787) 7 years ago
omar bed6ef03f5 Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. (#787) 7 years ago
omar c851b33352 Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. (#787) 7 years ago
omar b40dc5c4f2 Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. (#787) 7 years ago
omar 020b153d35 Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. (#787) 7 years ago
omar c8d8dc7f0a Nav: Internals: Renamed RootNavWindow to NavRootWindow (#787) 7 years ago
omar 72485a5d04 Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. (#787) (+1 squashed commits) 
+ store window inside result.
 7 years ago
omar 1cf38d0334 Internals: Nav: Renamed ImGuiNavForward enum (#787) 7 years ago
omar 4654040bcb Nav: Comments, added enum to clarify NavForward code. (#787) 7 years ago
omar c8b9b2c6bd Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. (#787) 7 years ago
omar 21771adb94 Nav: Debug overlay uses default font. (#787) 7 years ago
omar 3ded262776 Merge branch 'master' into navigation 7 years ago
omar 2d9d7a10ca Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. (#1574) Looks like a bug introduced in c36e586cce. 7 years ago
omar 1f3b66b10a Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 (#246) tho at the time it is possible that SizeContents wasn't calculated as evenly. 
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
 7 years ago
omar 10a4a77b27 Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. (#787) 7 years ago
omar 04d5783ffd Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. (#787) 7 years ago
omar d088bd86ad Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. (#787) 7 years ago
omar 486f0a8ba0 Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency) 7 years ago
omar f2d5300408 Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787) 7 years ago
omar ed088b00be Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707) 7 years ago
omar e9070e768e Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. (#787) 7 years ago
omar 5d31e1696f Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. (#1363) 7 years ago
omar 5f7f27c8de Nav: Comments. (#787) 7 years ago
omar d404b93b6b Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. (#787) + comments 7 years ago
omar 89b0ca1f8f Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. (#787) 7 years ago
omar f3776055d6 Merge branch 'master' into context 7 years ago
omar 455989b8b1 Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use (#787) 7 years ago
omar 28671aa821 Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. (#787) 7 years ago
omar 8227176c17 Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). (#787) 7 years ago
omar c09016b12a Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. (#787) 7 years ago
omar bd278e958e Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. (#787) 7 years ago
ocornut 680162eb32 Merge branch 'master' into navigation 7 years ago
omar 5148937d4d Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. (#1567, #1568) 7 years ago
omar 37ee99983f Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd (#1567) 7 years ago
omar 64b786c2aa Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) (#787) 
Note that this bit include badly hardcoded sizes, expecting an improvement later.
 7 years ago
omar cea78cc576 Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. (#787) 7 years ago
omar eb7ec781dc Nav: Tweak GetNavInputAmount(). Split debug defines. 7 years ago
omar f6ee8d30fb Comments (#1567) 7 years ago
omar d500113f1d Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 7 years ago
omar 9a76fd30fd Added SetNextWindowBgAlpha() helper. (#1567) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete. 7 years ago
omar 13c407591e Nav: Comments, tweaks 7 years ago
omar db2ba13154 Internals: Exposed SetCurrentFont() in imgui_internal.h 7 years ago
omar 9076366c17 Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. (#1181) 7 years ago
omar 1acb155419 Internals: Moved unnecessary MovingWindowMoveId field. 7 years ago
omar 5097368bd5 Tweaked FAQ. 7 years ago
omar 2026e792cd Context: NewFrame() asserts (#1565) 7 years ago
omar 9edf211c0e Merge branch 'master' into navigation 7 years ago
omar 3ed2ddbfbe Metrics: Removed context size display. 7 years ago
omar 5e2aa6185c Reorganized context handling to be more explicit, 
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565, #586, #992, #1007, #1558)
 7 years ago
omar 7e4d28a49d Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (#1565, #586, #992, #1007, #1558) 7 years ago
omar e45d7a7060 Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558) 7 years ago
omar 5a301c29dc Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558) 7 years ago
omar ac5b7a1bdf Comments 7 years ago
Panos Karabelas 7c8a19978d Simplified return of ImGui::IsKeyReleased() 7 years ago
omar cd1409f4bf ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939) 7 years ago
omar 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) 7 years ago
omar 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel 
# Conflicts:
#	examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
#	examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
 7 years ago
omar d4bf9b4686 Renaming for consistency. 7 years ago
omar 8877622fa8 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar e5a6e85f6d Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345) 7 years ago
omar 42a612d7c9 Begin: Removed asserts that got in the way of some flags combination. (#1345) 7 years ago
omar 0978f00911 MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now. 7 years ago
omar 74dc70c543 DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559) 7 years ago
omar 63d47e8328 Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143) 7 years ago
omar 932d3f0198 NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments. 7 years ago
omar 7ccbb765e2 InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554) 7 years ago
omar 2f15cc0855 Nav: Fixed popup wrap-around logic for windows with scrolling. (#787) 7 years ago
omar 05885b2e6d Merge fix. 7 years ago
omar 472ba1394c Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 28a76af185 Internal: DrawData: Tidying, renaming. 7 years ago
omar a77913054f Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar 1182174d81 Internals: DrawData: We don't need an intermediate layer for popups. 7 years ago
omar 0c06b43e6b Metrics: Tweaks to hover-window-drawlist to see window bounding box. 7 years ago
omar 038453258e Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse. 7 years ago
omar 06eef2ce6f Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy). 7 years ago
omar 6eff21ee5e Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)" 
This reverts commit 03f5cd6ca1.
 7 years ago
omar 514d30d8cd MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345. 7 years ago
Crunkle daa38f2ad0 Fix cross compilers 7 years ago
omar db63e71f13 Internals: Exposed SetCurrentFont() in imgui_internal.h 7 years ago
omar 1493de4f81 Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper. 7 years ago
omar c85d7d6e49 Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787) 7 years ago
omar c9be7d7254 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar 0a98202714 Nav: Standardized FIXME-NAV marker. 7 years ago
omar 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) 7 years ago
omar 5e9ae92ae9 Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542) 7 years ago
omar f7b10fc954 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 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) 7 years ago
omar b74f24c3e5 Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)" 
This reverts commit 651538e13b.
 7 years ago
omar 1c95dea88c Merge branch 'master' into navigation 7 years ago
omar 7d2a068dea Begin: Shuffling bits of code around. 7 years ago
omar cd7e178eac Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 651538e13b Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337) 7 years ago
omar a63fbbca8b Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382) 7 years ago
omar 67671c0ab5 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 1eee10778b Internals: Begin: Refactor some code into an UpdateManualResize() function. 7 years ago
omar 483f9b0d07 Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible. 7 years ago
omar 03f5cd6ca1 Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787) 7 years ago
omar 919fc548ad Merge branch 'master' into navigation 7 years ago
omar 6c583315e6 Begin: Moving some code around for the benefits of the wip viewport branch. 7 years ago
omar f610e25682 Internals: Using ImFloor().when appropriate. 7 years ago
omar fe919995da Merge branch 'master' into navigation 7 years ago
omar 933ee6cd5d InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541) 7 years ago
omar fd4d63a0c5 InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541) 7 years ago
omar 168200f915 Popups: Comments, reorganize bits of the header section, renamed parameters. 7 years ago
omar a8e5542d78 BeginPopup: Exposed extra_flags publicly. (#1533) 7 years ago
omar 3f4eccf154 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 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) 7 years ago
omar deab2ab015 Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497) 7 years ago
omar 69ff65f054 Internals: Popup: Renaming fields. 7 years ago
omar 3678307cd9 Popup, Menus: Tweaks and comments. 7 years ago
omar 369189b675 Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion. 7 years ago
omar 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) 7 years ago
omar 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) 7 years ago
omar c337cdcfd3 Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently 7 years ago
omar 7ad169fa09 Merge branch 'master' into navigation + fix previous merge 
# Conflicts:
#	imgui.cpp
 7 years ago
omar d730a763f6 Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well. 7 years ago
omar 66b2ee6ea2 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar a34490239c Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch. 7 years ago
omar 5fd19f037f Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow() 7 years ago
omar 2874aabb93 Internals: BringWindowToFront() iterate front to back, faster in majority of use cases. 7 years ago
omar 95b773370f Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later. 
This reverts commit 007f4034c9.
 7 years ago
omar 007f4034c9 Internals: Added LastActiveId, LastActiveIdTimer. (#1537) 7 years ago
omar 29c194b2a4 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 4fc9f44073 Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op. 7 years ago