6d0c720451
Internals: Removed unused internal variant of ArrowButton().
7 years ago
82b7a39f31
Fixed a few zealous warnings.
7 years ago
c712f7275d
Fixed unused variable warning.
7 years ago
c2fc978983
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) ( #707 )
7 years ago
0734a12d25
IO: ImGuiConfigFlags_NoMouse disable hovering so it is not destructive. Amend 2464e62a1a
7 years ago
e88fb10d7c
NewFrame: Extract some code into a NewFrameUpdateHoveredWindowAndCaptureFlags() which can be of use with touch-based inputs systems.
7 years ago
c1bdab6d5b
Comments about io.WantCapture flags + todo entries.
7 years ago
ac2027c415
NewFrame: Extract some code into a NewFrameUpdateMouseInputs function. Moved settings saving higher up in the function so it is next to its peers.
7 years ago
2464e62a1a
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
7 years ago
18a243bef0
Columns: Fixed calling Columns() again with the same number of columns. ( #125 )
7 years ago
fc30462f18
Hide new windows for one frame until they calculate their size. Also fixes SetNextWindowPos() given a non-zero pivot. ( #1694 )
7 years ago
5aa3f99b4c
Internal: using more consistent comparaison with HiddenFrames to not imply it could be -1. Tweaked comments.
7 years ago
4649967112
Added extra comments and assertions to avoid user combining ImGuiCond flags. ( #1694 )
7 years ago
cd1e6e384f
Tooltip windows uses PopupBorderSize ( #1697 ) + commented out debug stuff.
7 years ago
1e116e6c17
Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.
7 years ago
84fbc49403
BeginChild: named child don't include the full id inside their name ( #1698 )
7 years ago
78610a54d2
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
7 years ago
77e234d9df
Comments
7 years ago
c461401b21
Comments, FAQ
7 years ago
cc96477b1c
Comments ( #1695 )
7 years ago
b69dc45f6e
Internals: Removed ImGuiDataType_Float2.
7 years ago
c19b27813d
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. ( #1011 ) May transition the other InputXXX function to use format strings as well.
7 years ago
c796960ff9
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011 )
7 years ago
21ac470a8a
Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.
7 years ago
75c3793db5
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. ( #787 , #1495 , #1202 )
7 years ago
dcf7c3d188
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. ( #787 , #1542 )
7 years ago
170f44e6f0
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming ( #787 )
7 years ago
d1c45db9e8
Fixed enum typo.
7 years ago
62e94717eb
Nav: InputText: Allow editing text input fields with NavActivate (space). Not sure about that, on one hand it feels more consistent but you can't finish the editing with space to double space (activate + input space) could feel inconsistent. ( #787 )
7 years ago
33ad8b2f0c
Nav: Track nav input source more generally (gamepad vs keyboard) ( #787 ) + update todos and demo tweaks
7 years ago
e7670c0bcc
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. ( #707 )
7 years ago
b9ac127b0b
Internals: Columns renaming fields
7 years ago
351b3fa7b0
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
7 years ago
a3d5f92214
Merge branch 'master' into font_offset
7 years ago
642c6748ac
Comments, Changelog
7 years ago
cea7492bab
Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done).
7 years ago
51afaf7117
Fixed type cast warning.
7 years ago
0ec356eb6e
Comments, FAQ update.
7 years ago
5ed45d0aec
Columns: Fixed destructive small resize. ( #1656 ). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0).
7 years ago
bf7481eba0
Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. ( #125 ). +9 Internal: Store InnerClipRect.
7 years ago
968a8d2a3f
Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. ( #125 )
7 years ago
ee770af72c
Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. ( #125 , #1499 , #1656 )
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
7 years ago
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
7 years ago
ad7ff7504e
Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1
7 years ago
839cdd37a3
Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding.
7 years ago
11f13ab24f
Internal: renamed RenderTriangle() to RenderArrow().
7 years ago
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
7 years ago
c994796e26
Internal: Moved IM_NEWLINE helper to imgui_internal.h
7 years ago
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
c7835dd189
ImRect: Removed misleading IsFinite() function used by some Nav code.
7 years ago
5427eca960
Compacted some old Breaking Changes notes (Pre July 2015 stuff)
7 years ago
bd267ad739
Changelog: Added all change infos since 1.53 up to the current version.
7 years ago
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
7 years ago
8040cf1425
Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master
7 years ago
94466745bb
A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call.
...
ab_lenSqr -> ab_len_sqr
Moved line where ab_len_sqr is computed after the first return
7 years ago
b28995b667
Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h ( #1640 )
7 years ago
2c3c5125b3
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. ( #143 , #1637 )
7 years ago
7cbcccd96b
Update Breaking Change section with moved misc/fonts/ ( #1631 )
7 years ago
7ee2bc8f5e
FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. ( #1397 )
7 years ago
b33f0e215f
Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization.
7 years ago
1399c9c8a9
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
7 years ago
bdb27366e7
Nav: Tweak windowing highlighting for full viewport windows.
7 years ago
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
7 years ago
20c14f9589
Fixed GCC zealous warnings ( #1623 )
7 years ago
1cbfe0700c
Plot: plot a flat line if scale_min==scale_max ( #1621 )
7 years ago
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
7 years ago
eb1d481915
Comments ( #1230 , #1611 )
7 years ago
d8d1da27fd
Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master
7 years ago
2c4a761982
__cdecl markup for non-standard calling conventions via MSVC
7 years ago
64e0666803
Internals: Moved some of NewFrame() into UpdateMovingWindow().
7 years ago
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
7 years ago
3b163ac35b
Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.)
7 years ago
d17d21da1b
Warning fix. ( #1565 )
7 years ago
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
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
4e5b7612ae
Nav: Documentation tweaks. ( #787 )
7 years ago
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
7 years ago
ed4bbc4fd4
Nav: Comments, guides.
7 years ago
cea8017e0b
Merge branch 'master' into context
7 years ago
db071184a0
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
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
c6ba7c8231
Internals: TreeNode: Renaming local to be more consistent with other widgets.
7 years ago
e6926d9f7c
Internals: Refactored bool LastItemRectHovered into flags. ( #1597 )
7 years ago
ce2b8d3255
Nav: Comments, removed extraneous parameter.
7 years ago
0c0d811859
Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. ( #787 )
7 years ago
fb9fecea5e
Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. ( #787 )
7 years ago
4932303e62
Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
7 years ago
e5e3cc617e
Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
7 years ago
fb7cf4a475
Nav: Removed old unnecessary ifdefs.
7 years ago
f35734c925
Nav: Debugging code. ( #787 )
7 years ago
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
348c46d21e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
11d0fc8220
Tooltip: BeginTooltip() sets NoInputs flag.
7 years ago
1dedbf8091
Style: Fixed missing style.MouseCursorScale initialization ( #939 ), messed up original commit badly.
7 years ago
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
8ad88f725c
Nav: Minor tidying up. ( #787 )
7 years ago
3f297e74e4
Merging the minor/shallow changes from Navigation branch.
7 years ago
2081fc15b5
Added assert in BeginChild(ImGuiId id).
7 years ago
223be68d77
Nav: Debugging stuff.
7 years ago
66ff820eaa
Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. ( #787 )
7 years ago
0bd15b52a6
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
147ec8d1e2
Style Added style.MouseCursorScale, may remove ( #939 ).
7 years ago
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
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
9120938200
Nav: Revert 5c9ea4d53a with comments. ( #787 )
7 years ago
96ddfbc973
Nav: Modal windows can't be closed with Nav PadCancel. ( #787 )
7 years ago
efbd8cebe7
Nav: Comments ( #787 )
7 years ago
c4fc879508
CloseButton: Fixed cross positioning.
7 years ago
942c140710
CloseButton: Fixed cross positioning.
7 years ago
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
950f260a32
Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. ( #787 )
7 years ago
c7b7b181b5
Nav: CloseButton reacts when clipped. ( #787 )
7 years ago
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
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
95f9c74b9a
Metrics: Displaying some of the important internal window flags.
7 years ago
79ff3c2d49
Merge branch 'master' into navigation
7 years ago
07163804df
Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h
7 years ago
5812d0b751
Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. ( #787 )
7 years ago
fd6d8863f7
Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). ( #787 )
7 years ago
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
8cc2dbc3bd
Internals: Nav: Extracted code into IsWindowNavFocusable(). ( #787 )
7 years ago
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
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
eaa6f490a2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
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
76d8af4036
Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. ( #787 )
7 years ago
aa2dda7610
Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.
7 years ago
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
9c8fb804ed
Log: Comments and extraneous assets to clarify intent. ( #1584 )
7 years ago
27980d9688
Merge branch 'master' into context
7 years ago
47e81a6194
Merge branch 'master' into navigation
7 years ago
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
7 years ago
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
596b6d6de2
Style: Enable window border by default. ( #707 )
7 years ago
bebe03db05
Metrics: Minor formatting tweaks
7 years ago
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
7 years ago
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
1ed7bce3ed
Nav: Removed old unused code. ( #787 )
7 years ago
a8763d14c5
Internals: Renaming.
7 years ago
38197a236d
Internals: Renaming.
7 years ago
a7ad5134e5
Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. ( #787 )
7 years ago
acf21ee429
Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. ( #787 )
7 years ago
bed6ef03f5
Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. ( #787 )
7 years ago
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
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
020b153d35
Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. ( #787 )
7 years ago
c8d8dc7f0a
Nav: Internals: Renamed RootNavWindow to NavRootWindow ( #787 )
7 years ago
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
1cf38d0334
Internals: Nav: Renamed ImGuiNavForward enum ( #787 )
7 years ago
4654040bcb
Nav: Comments, added enum to clarify NavForward code. ( #787 )
7 years ago
c8b9b2c6bd
Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. ( #787 )
7 years ago
21771adb94
Nav: Debug overlay uses default font. ( #787 )
7 years ago
3ded262776
Merge branch 'master' into navigation
7 years ago
2d9d7a10ca
Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. ( #1574 ) Looks like a bug introduced in c36e586cce.
7 years ago
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
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
04d5783ffd
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. ( #787 )
7 years ago
d088bd86ad
Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. ( #787 )
7 years ago
486f0a8ba0
Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)
7 years ago
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
7 years ago
ed088b00be
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). ( #787 , #707 )
7 years ago
e9070e768e
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ( #787 )
7 years ago
5d31e1696f
Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. ( #1363 )
7 years ago
5f7f27c8de
Nav: Comments. ( #787 )
7 years ago
d404b93b6b
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. ( #787 ) + comments
7 years ago
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
f3776055d6
Merge branch 'master' into context
7 years ago
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
7 years ago
28671aa821
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. ( #787 )
7 years ago
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
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
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ( #787 )
7 years ago
680162eb32
Merge branch 'master' into navigation
7 years ago
5148937d4d
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. ( #1567 , #1568 )
7 years ago
37ee99983f
Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd ( #1567 )
7 years ago
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
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
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
7 years ago
f6ee8d30fb
Comments ( #1567 )
7 years ago
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
7 years ago
13c407591e
Nav: Comments, tweaks
7 years ago
db2ba13154
Internals: Exposed SetCurrentFont() in imgui_internal.h
7 years ago
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
7 years ago
1acb155419
Internals: Moved unnecessary MovingWindowMoveId field.
7 years ago
5097368bd5
Tweaked FAQ.
7 years ago
2026e792cd
Context: NewFrame() asserts ( #1565 )
7 years ago
9edf211c0e
Merge branch 'master' into navigation
7 years ago
3ed2ddbfbe
Metrics: Removed context size display.
7 years ago
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
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
e45d7a7060
Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
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
ac5b7a1bdf
Comments
7 years ago
7c8a19978d
Simplified return of ImGui::IsKeyReleased()
7 years ago
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
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
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
d4bf9b4686
Renaming for consistency.
7 years ago
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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
42a612d7c9
Begin: Removed asserts that got in the way of some flags combination. ( #1345 )
7 years ago
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
74dc70c543
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. ( #1559 )
7 years ago
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
7 years ago
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
7 years ago
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
2f15cc0855
Nav: Fixed popup wrap-around logic for windows with scrolling. ( #787 )
7 years ago
05885b2e6d
Merge fix.
7 years ago
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
28a76af185
Internal: DrawData: Tidying, renaming.
7 years ago
a77913054f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
1182174d81
Internals: DrawData: We don't need an intermediate layer for popups.
7 years ago
0c06b43e6b
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
7 years ago
038453258e
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
7 years ago
06eef2ce6f
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
7 years ago
6eff21ee5e
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )"
...
This reverts commit 03f5cd6ca1
7 years ago
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
daa38f2ad0
Fix cross compilers
7 years ago
db63e71f13
Internals: Exposed SetCurrentFont() in imgui_internal.h
7 years ago
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
7 years ago
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
c9be7d7254
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
0a98202714
Nav: Standardized FIXME-NAV marker.
7 years ago
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
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
f7b10fc954
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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
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
1c95dea88c
Merge branch 'master' into navigation
7 years ago
7d2a068dea
Begin: Shuffling bits of code around.
7 years ago
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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
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
67671c0ab5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
1eee10778b
Internals: Begin: Refactor some code into an UpdateManualResize() function.
7 years ago
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
03f5cd6ca1
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )
7 years ago
919fc548ad
Merge branch 'master' into navigation
7 years ago
6c583315e6
Begin: Moving some code around for the benefits of the wip viewport branch.
7 years ago
f610e25682
Internals: Using ImFloor().when appropriate.
7 years ago
fe919995da
Merge branch 'master' into navigation
7 years ago
933ee6cd5d
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). ( #1541 )
7 years ago
fd4d63a0c5
InputText: Moved code for checking clipboard shortcut so we can expand on it. ( #1541 )
7 years ago
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
7 years ago
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
7 years ago
3f4eccf154
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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
deab2ab015
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). ( #1497 )
7 years ago
69ff65f054
Internals: Popup: Renaming fields.
7 years ago
3678307cd9
Popup, Menus: Tweaks and comments.
7 years ago
369189b675
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
7 years ago
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
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
c337cdcfd3
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
7 years ago
7ad169fa09
Merge branch 'master' into navigation + fix previous merge
...
# Conflicts:
# imgui.cpp
7 years ago
d730a763f6
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
7 years ago
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
7 years ago
5fd19f037f
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
7 years ago
2874aabb93
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
7 years ago
95b773370f
Revert "Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )" Will come up with a better design later.
...
This reverts commit 007f4034c9
7 years ago
007f4034c9
Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )
7 years ago
29c194b2a4
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
4fc9f44073
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
7 years ago
4b1240b2e1
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
7 years ago
b2ec0741f1
Internals: Settings api tweaks
7 years ago
2b8224692e
Merge branch 'master' into navigation
7 years ago
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.
7 years ago
33f7769d85
Columns: Clear offsets data when columns count changed. ( #1525 )
7 years ago
f9b2058d5a
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
7 years ago
05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
7 years ago
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
7 years ago
7fcbd45500
Internals: NextWindow: Renamed, moved functions to member.
7 years ago
e339949de1
Internals: NextWindow: Using ImGuiCond for consistency.
7 years ago
04b44398eb
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
7 years ago
7e03ee8d85
Merge branch 'master' into navigation
7 years ago
561e9f286e
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
7 years ago
170bcb2d7c
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
7 years ago
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
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
7 years ago
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
4fbdb50dca
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
7 years ago
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
7 years ago
90ff4ae5d1
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
7 years ago
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)
7 years ago
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
7 years ago
563d04fdb1
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. ( #143 , #581 )
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
7 years ago
e916310b2e
Version 1.53
7 years ago
ed2105d4a2
Merge branch 'master' into navigation
7 years ago
3849bb4470
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
cead207535
Comments
7 years ago
6c63c7a8b1
Various zealous warning fixes (thanks Clang). (Navigation branch)
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
7 years ago
983d8f5f8e
Various zealous warning fixes (Clang).
7 years ago
53b24ff79a
Removed reliance on ImU64 type for the ImDrawList assert. ( #1184 )
7 years ago
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
1c1e490316
Merge branch 'master' into navigation
7 years ago
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ( #125 )
7 years ago
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. ( #125 )
7 years ago
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 )
7 years ago
8d21ee56d2
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ( #1519 )
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
c8c872c753
Internals: String functions uses size_t in their signature
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
d139bd088d
Begin: Moved modal darkening draw block
7 years ago
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.
7 years ago
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.
7 years ago
230f826ef5
ImDrawList: Comments
7 years ago
4c2514dc29
Merge branch 'master' into navigation
7 years ago
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag ( #744 )
7 years ago
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
7 years ago
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
7 years ago
abaf347deb
Added a flag for text input to disable undo / redo
7 years ago
b1d90b565d
Columns: Fixed previous commit (wrong chunk commited) ( #125 )
7 years ago
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ( #125 )
7 years ago
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
7 years ago
6effcf21d6
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. ( #143 )
7 years ago
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
7 years ago
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 )
7 years ago
ac8e708c3e
Fixed unused variable warning.
7 years ago
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
7 years ago
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
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
7 years ago
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
7 years ago
ba71e1c0e4
Columns: Minor stylistic fixes. ( #125 )
7 years ago
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 )
7 years ago
e8e84a6ad6
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ( #125 )
7 years ago
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 )
7 years ago
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. ( #125 , #1499 )
7 years ago
3a31a75e3b
Columns: Refactor: Renamed all members. ( #125 , #1499 )
7 years ago
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. ( #125 , #1499 )
7 years ago
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).
7 years ago
16fb58984f
Merge branch 'master' into navigation
7 years ago
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
7 years ago
8b59ed0708
Drag and Drop: Exposed some internals.
7 years ago
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
7 years ago
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
d0a1be0de0
Merge branch 'drag_and_drop'
7 years ago
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
7 years ago
7faa5b16bb
Tweak
7 years ago
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
02e0a078f4
Begin: Tidying up code to make it more readable.
7 years ago
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
7 years ago
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 )
7 years ago
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
7ec934f439
Drag and Drop: Comments
7 years ago
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
ee7f1921e8
Internals: Added GetSmallSquareSize()
7 years ago
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).
7 years ago
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
7 years ago
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
7 years ago
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
7 years ago
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
7 years ago
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
7 years ago
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
7 years ago
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
e3e0326ea9
Exposed BeginCombo() publicly.
7 years ago
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 )
7 years ago
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
7 years ago
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
7 years ago
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
7 years ago
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
7 years ago
e23083a080
Fixed warning: logical ‘and’ of equal expressions
7 years ago
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
7 years ago
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
7 years ago
871a5cecc1
Merge branch 'master' into navigation
7 years ago
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
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.
7 years ago
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.
7 years ago
9ce51ad9f6
Fix bad merge
7 years ago
a6f37287d8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
7 years ago
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
7 years ago
e998c7d3e3
Combo: Moved functions (untouched).
7 years ago
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.
7 years ago
d9d231dc6b
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
7 years ago
74f42baf3e
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
7 years ago
541dfd7901
Combo: Comments + fixed missing lower window padding.
7 years ago
9872297a84
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
7 years ago
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
7 years ago
b6b940c8ee
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
...
# Conflicts:
# imgui.cpp
7 years ago
e118239f69
IsItemHovered() comments ( #1382 )
7 years ago
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
ca0bb000ad
Begin: Factored out a bit of code to CalcSizeContents()
7 years ago
f658edc72a
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
7 years ago
45466a8cf9
Internals: BeginCombo() added dummy ImGuiComboFlags.
7 years ago
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
7 years ago
7f2b9ea4c0
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
7 years ago
8dcc1a8a20
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
7 years ago
e045eddd77
Minor tweaks. Using ImGuiAxis defines.
7 years ago
92f7bd3605
Fixed 64-bit warnings.
7 years ago
cc2c023880
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
7 years ago
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
7 years ago
3c9f9a455e
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
7 years ago
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
7 years ago
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
7 years ago
6deb865f78
Nav: Merge fix.
7 years ago
2fc6a82665
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
7 years ago
2fc9a2e6e7
Fixed nav branch merge issue.
7 years ago
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
7 years ago
ecacaf7f2d
Lower-right resize grip only appears when hovered. ( #822 )
7 years ago
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
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).
7 years ago
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
7 years ago
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
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).
7 years ago
b9dc0caee3
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
7 years ago
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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.
7 years ago
16d9fa30b2
Merge branch 'master' into drag_and_drop
7 years ago
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. ( #319 )
7 years ago
be6384eb2a
Style: Tweaked default WindowRounding value from 9 to 7 ( #707 )
7 years ago
6ea744d8f4
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. ( #143 )
7 years ago
81cbaef806
Merge branch 'master' into navigation
7 years ago
b513fdce48
Scrolling: SetScrollFromPosY() tweak to match change in a0d53fee81084a547bf21f46e736ea89f79fffb5 with similar desirable jump/discontinuity at each limit to skip the (ItemSpacing>WindowPadding) difference (followup to 0e5b64ecd2, #150 )
7 years ago
c36e586cce
Style, Scrolling: Fixed padding and scrolling asymetry where lower/right sides of a window wouldn't use WindowPadding properly + causing minor scrolling glitches.
7 years ago
25c159fac8
Internals: Removed unnecessary duplicate scrolling code + added extra infos to Metrics window.
7 years ago
52e475230f
Settings: Internals: Renaming.
7 years ago
2e1013a0c6
Settings: Internals: Simplifying code a bit. Creating Settings structure during first save. Windows where ImGuiWindowFlags_NoSavedSettings was late toggled will save settings correctly. ( #1000 )
7 years ago
7ae71e4984
Settings: Internals: Added FindSettingsHandler()
7 years ago
35eb5c5c99
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
7 years ago
963259d128
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
7 years ago
63712d5f5c
Merge branch 'master' into drag_and_drop
7 years ago
9191b17218
Merge branch 'master' into navigation
7 years ago
4a43632163
Build fix
7 years ago
1a8a7c9d17
Settings: Import old style .ini file
7 years ago
e5ebe42207
Settings: Make ImGuiWindow settings always first in the list.
7 years ago
f3ec608c19
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
7 years ago
7e2d0d734c
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
7 years ago
d552cabd15
Settings: Internal renaming of structure and fields names.
7 years ago
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
ade09b9e3c
Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
7 years ago
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
7 years ago
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
7 years ago
46e994de4e
Nav: Do not clear last navigation id stored in a hidden child window. ( #787 )
7 years ago
4e3c7f1557
Nav: Exposed NavInitWindow() in imgui_internal ( #787 )
7 years ago
f5c47faee8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
7 years ago
6d3cfba834
Add Slider hover color just like Drag
...
I feel like there should be hover color options for each different control instead of the grouped frame color to make it usable for everyone. This also would not reduce performance as all controls already check for hover state as required by the ImGUI::IsHoveredItem() API.
7 years ago
7763ab3fcc
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
7 years ago
b618629d99
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
7d09a0ae99
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
7 years ago
aafa6cece5
Tweak expression to be less weird (how did that ever happen?)
7 years ago
21b456e567
Update imgui.cpp
7 years ago
68b26b4867
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
176d8fbe74
Fixed unreferenced variable warnings.
7 years ago
302757447a
Internals: Added SplitterBehavior(). ( #319 )
7 years ago
195abc3d17
Begin: Fix border size latch when rounding uses Child or Popup value. ( #707 )
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
7 years ago
7f447c8270
Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. ( #346 )
7 years ago
dc2768503f
Fix for drag and drop branch.
7 years ago
92212b17aa
Merge branch 'master' into drag_and_drop
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
7 years ago
c433bc971f
Reorder fields for consistency.
7 years ago
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
7 years ago
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
7 years ago
538a704143
NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
4022ada843
Merge branch 'master' into drag_and_drop
7 years ago
8a7f03cbf9
Combo: Offset popup position by border size so that a double border isn't so visible. ( #707 )
7 years ago
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
7 years ago
067605052d
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. ( #823 )
7 years ago
6f7b1bf2e1
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
7 years ago
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
7 years ago
29e0078b66
Internals: Window minor internal renaming + added WindowRounding latch.
7 years ago
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
7 years ago
da2be7bbdc
Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
7 years ago
834fa52c8e
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. ( #1444 , #125 )
7 years ago
7746dd104c
Merge branch 'master' into drag_and_drop
7 years ago
44c590393c
Merge branch 'master' into navigation
7 years ago
29d962069d
Internals: Updating condition/allow flags with a function.
7 years ago
4ad414c8d4
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
7 years ago
7c4be0a000
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
7 years ago
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
e9a7e73bba
Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
7 years ago
omar
Podgorskiy
Randy Gaul
Panos Karabelas
Crunkle
Cory McWilliams
ibachar
Branimir Karadžić
Emmanuel Benoît
stfx
Giuseppe Barbieri