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
f36037b384
Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
7 years ago
9b82d9fbef
Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
7 years ago
f5bdf443c9
Minor comments, tweaks
7 years ago
5ea6e80da1
Make it possible to use SetNextWindowPos() on a child window. Useful internally.
7 years ago
44b761b308
Merge branch 'master' into drag_and_drop
7 years ago
27fd1b913b
Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ( #823 )
7 years ago
ae060b1d67
Merge branch 'master' into drag_and_drop
7 years ago
64031852de
Merge branch 'master' into navigation
7 years ago
64e79035d5
Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
7 years ago
6001d9c7a4
Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ( #125 )
...
Demo: Columns: Adding a billion of extra lines and using clipper.
7 years ago
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
7 years ago
852ece3a0e
Fixed build ( 3e06450d27 not meant for master branch, but ok)
7 years ago
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
3e06450d27
Internals: Added ArrowButton() helper.
7 years ago
7908cce25f
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. ( #143 )
7 years ago
4d00dd8326
Fixed scrollbar flickering on/off when uncollapsing a window (fixes 2df8fa95df)
7 years ago
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
7 years ago
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
7 years ago
9daac64ff8
Clean g.WindowsById storage on shutdown.
7 years ago
06075f20ba
Merge branch 'master' into navigation
7 years ago
ba09de3a39
Begin: Fixed appending into a child window with a second Begin() from a different window stack querying the wrong window for the window->Collapsed test.
7 years ago
8451855a30
ButtonBehavior: Fixed ImGuiButtonFlags_AllowOverlapMode to avoid temporarily activating widgets on click before they have been correctly double-hovered. ( #319 , #600 )
7 years ago
4b94738c7e
Drag and Drop: Drop target rectangle goes out of clipping range ( #143 )
7 years ago
b1653cd361
Drag and Drop: Allow NULL payload (since type only can be useful). ( #143 )
7 years ago
a297cbafdb
Merge branch 'master' into navigation
7 years ago
2df8fa95df
Fixed vertical scrollbar flickering/appearing, typically when manually resizing and using a pattern of filling available height (e.g. full sized BeginChild). THIS IS A GREAT FIX, this glitch was nasty and annoying (and yet somehow nobody reported it?). Hopefully haven't broken anything else...
7 years ago
a4cc3d4637
Minor tweaks/comments. Note that the reordering the one subtraction caused subtle havoc before the patch in 9ac8820ee2.
7 years ago
9ac8820ee2
Fixed non-pixel aligned bounding box of window resize grip, / which triumphally led to any re-arrangement of operations inside the resize grip code outputting non-exact size_target values which led to unstable window position because clamping code uses size in a subtraction, etc etc. Lovely how a whole system can be made to act weird with a single bad input.
7 years ago
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
7 years ago
2ab27be3de
Child window with MenuBar use regular WindowPadding.y so layout look consistent in child or in a regular window.
7 years ago
41862b8c0e
ButtonBehavior: Fixed ImGuiButtonFlags_NoHoldingActiveID from incorrectly setting ActiveIdClickOffset, which probably have no known effect, but it is more correct this way. ( #1418 )
7 years ago
1870738880
LowerBound() minor tweaks
7 years ago
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
7 years ago
2c7ba21417
Fixed auto-resize allocating too much space for scrollbar when SizeContents is bigger than maximum window size (fixes c0547d358d) ( #1417 )
7 years ago
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
f0b4097c54
Begin: Simplified code and fixed a bug where appending into a window a second time (from a remote window) would incorrectly overwrite RootWindow with the current window in the stack. Our docking code uses this pattern.
7 years ago
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
7 years ago
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
7 years ago
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
7 years ago
553bdeedf7
Drag and Drop: Made it legal to not call SetDragDropPayload() between BeginDragDropSource() and EndDragDropSource(). ( #143 )
7 years ago
3461a2f296
Merge branch 'master' into drag_and_drop
7 years ago
982ce50b37
IsWindowHovered() returns true when moving window ( #1382 , #1404 )
7 years ago
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
7 years ago
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() ( #1382 , #1404 )
7 years ago
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
6ab20ff9bf
Minor tweaks to the user guide.
7 years ago
e55caf0b95
Merge pull request #1402 from elect86/patch-1
...
Minor fix typo
7 years ago
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
7 years ago
9e3f9fc2dd
Update imgui.cpp
7 years ago
5956fff7e2
Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
7 years ago
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
7 years ago
1d7d8f8574
Merge branch 'master' into drag_and_drop
7 years ago
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
7 years ago
d46772b429
Comments
7 years ago
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
7 years ago
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
7 years ago
c5536e49ef
Drag and drop API experiment
7 years ago
17dd8e7c30
Merge branch 'master' into navigation
7 years ago
b9ebb34a04
Nav: ColorButton: Fixed a case of not using local 'hovered' flag directly, messes with some of my drag and drop work, and I can't find/understand the reason why this was left as is (there _was_ a reason at the time but it appears to be obsolete now?)
7 years ago
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline ( 0260fdd1c6)
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
7 years ago
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9f200d10d5
Version 1.52
7 years ago
cc78e9a213
Merge branch 'master' into navigation
7 years ago
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
7 years ago
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
7 years ago
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
7 years ago
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
7 years ago
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
7 years ago
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
7 years ago
c432fcf2bb
Minor renaming.
7 years ago
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
daef33e268
Comments about mouse setup and clearing HoveredWindow when mouse down isn't owned by imgui (will affect some future hovered test and drag'n drop patterns) ( #143 , #1382 , #1392 )
7 years ago
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
7 years ago
fc25881207
Merge branch 'master' into navigation
7 years ago
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp ( #1038 )
...
(NB: imgui_demo stills uses it)
7 years ago
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
7 years ago
8fd5620277
Renamed IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS to IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS for consistency. (ref #238 , #520 , #738 )
7 years ago
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
7 years ago
70cb427469
Add missing CloseClipboard call
7 years ago
d513546325
Merge branch 'master' into navigation
7 years ago
5b062c4c29
Fixed typos
7 years ago
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
7 years ago
e9ff7162bc
ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
7 years ago
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
7 years ago
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
7 years ago
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
7 years ago
2ef2c104a1
Begin: Minor tweaks
7 years ago
be12f8c55d
Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ( #787 )
7 years ago
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
7 years ago
d769e2515a
Merge branch 'master' into navigation
7 years ago
1bc1751670
MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ( #1387 )
7 years ago
b177f2432d
MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ( #1387 )
7 years ago
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
7 years ago
1c5b3fb1d2
Merge branch 'master' into navigation
7 years ago
f7259e60ee
Comments
7 years ago
23b9060468
Nav: Honoring ImGuiItemFlags_NoNav which is used by color picker ( #787 )
7 years ago
e4bb9102f9
Merge branch 'master' into navigation
7 years ago
6ab737a4bb
Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
7 years ago
aca23fd3f0
Popups: similarly to previous commit, we fix reopening a popup within a popup stack from truncating the whole stack. This is done by properly refocusing the lower level popup. (~#439)
7 years ago
59a89774d7
Popups: fixed CloseInactivePopups() so that right-clicking to close one level of popups in a popups stack won't close the whole stack. This is done by properly refocusing the lower level popup. Fixes 87ae40843c (~#439)
7 years ago
43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
7 years ago
0ea66dc260
Fixed bad merge from Master
7 years ago
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
3cc10d25a9
BeginPopupContextItem(), BeginPopupContextWindow(): Using newly introduced IsItemHovered() flags to allow reopening another context menu (over same or not same item) with right-click. ( #439 ) (+1 squashed commits)
7 years ago
695ea45fca
IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143 )
7 years ago
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
7 years ago
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
7 years ago
e6f06627e9
Made the ImGuiWindowFlags_NoMove flag inherited from parent to child, so in a setup with RootWindow (no flag) -> Child (NoMove flag) -> SubChild (no flag) user won't be able to move the root window by clicking on SubChild. ( #1381 )
7 years ago
3b485cda51
Fixed a bug allowing to move a _NoMove window from a child that doesn't have the flag. ( #1381 )
...
broken by e56eba44fe#1337 )
7 years ago
87ae40843c
Popups: popups can be closed with a right-click anywhere, without altering focus under the popup.(~#439)
7 years ago
853018dd4d
Popups: Fixed a bug introduced in 1a35766356 which made the BeginPopupContextXXX functions create popups without border. (nb: all that border mess is going away in styling clean up)
7 years ago
5f7299e15a
Refactor EndFrame() code that process focusing window with left mouse button. This commit should be no-op.
7 years ago
51eed2f257
Merge branch 'master' into navigation
7 years ago
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
7 years ago
22977ffedb
Documentation: Extra comments + tweaks to make usage of long-line more bearable.
7 years ago
938f1b720f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
370a48c10b
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
7 years ago
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
a126c702d9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
ef3f87eec5
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
7 years ago
bf778ebb7e
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
7 years ago
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
7 years ago
78a85ba3fe
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
7 years ago
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
7 years ago
4aa9d2089d
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
7 years ago
55d873875e
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
7 years ago
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
7 years ago
c76f014292
Fix IsItemHovered() issue on child by temporarily reverting 344d48be31. This is not the ideal solution. ( Fix #1370 )
7 years ago
af565ea828
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
7 years ago
7ea52ac1e4
Nav: InputTextMultiline: Fixed navigation/selection. Disabled selecting all when activating a multi-line text editor. ( #787 )
7 years ago
82a27fd3aa
Nav: InputText: Fixed using Up/Down history callback feature when Nav is enabled ( #787 )
7 years ago
b70c2fa887
Nav: Internals: Moved some internal code to namespace, comments
7 years ago
ae1866c424
Nav: NavProcessItem() updates current NavLayer. Basically we're hearing toward rebuilidng nav info from an id. ( #787 ).
7 years ago
97851f7376
Nav: NavProcessItem() computes window-relative rectangle using own Window rather than NavWindow. Not sure what it may mean for child-flattened-nav (disabled). ( #787 )
7 years ago
7d14262202
Nav: SetFocusID() update NavWindow and NavRectRel just as we get them. Needed by upcoming commit, committing separately as I'm curious if it has any side-effect. ( #787 )
7 years ago
83416fa5da
Merge branch 'master' into navigation
7 years ago
d761825cfb
Nav: Renaming a field + Comments.
7 years ago
ce7b04e8b9
Removed apparently unncessary code in InputFloatN() and InputInt().
7 years ago
db5f1b79cd
Nav: ButtonBehavior() keep _displaying_ NavId item as howered when refocusing or moving window, which is consistent with IsItemHovered() and reduce noise/flicker ( #787 )
7 years ago
c42baf392a
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
7 years ago
53780a4fcc
Nav: Shallow tweaks.
7 years ago
f852b9a52a
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
b667d5a9e7
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )
7 years ago
0371219222
Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )
...
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
7 years ago
8b095e483b
Internals: Moved SetNavID() and renamed casing to be consistent with stuff exposed in imgui_internal.h
7 years ago
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
48498b337d
Internals: SetActiveID window cannot be NULL
7 years ago
4548bcb5c9
Nav: commiting shallow bits to reduce noise from working copy/upcoming commit.
7 years ago
17519c313a
Nav: Extract part of NavUpdate() into a saner NavUpdateWindowingTarget() ( #787 )
7 years ago
b05b31e690
Nav: Made NavWindow always refresh from NavId so we can lazily retrieve the window for user functions that don't have it. This is not required by current commit but I'd rather test it earlier. Idea: eventually if we switch to 64-bit identifiers we could reserve e.g. 20 bits to store a simplified window identifier so we can always retrieve a window from an id. ( #787 )
7 years ago
f0d437dd9c
Nav: SetActiveId() uses SetActiveIDNoNav() to avoid duplicating logic. ( #787 )
7 years ago
2047c58efb
Nav: Extract part of NavUpdate() into a saner NavScrollToBringItemIntoView() ( #787 )
7 years ago
7a14d7dfdc
Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. ( #787 )
7 years ago
3833f1f7a2
Merge branch 'master' into navigation
7 years ago
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
7 years ago
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
7 years ago
69dd895358
Nav: Renaming NavInitDefaultRequest -> NavInitRequest
7 years ago
4d83078885
Nav: Moving code next to its peers
7 years ago
d2975115cd
Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)
7 years ago
d91b093be6
Nav: Minor tweaks in NavProcessItem() used by ItemAdd()
7 years ago
c3105919ba
Nav: Minor tweaks also toward removing processing from ItemAdd()
7 years ago
d16309ca77
Internal: ItemAdd() minor shallow tweaks
7 years ago
64ce83b9ed
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
042153d254
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
7 years ago
acb6f12d2c
Removed extraneous calls to GetCurrentWindowRead() when we already have a ImGuiContext. Internal RenderXXX functions also don't need to write into the Accessed field at all.
7 years ago
6e1199c603
Merge branch 'master' into navigation
7 years ago
f451785c9e
Nav: Shuffled code in ItemAdd() so that NavProcessItem() may have access to LastItemId (will be required by tabbing)
7 years ago
e12cfa9dfd
Nav: Minor midying up and comments,
7 years ago
40df7a5155
Nav: Removed possibly redundant test prior to calling NavProcessItem() from ItemAdd()
7 years ago
a77dd02e8a
Nav: Moving code next to its peers
7 years ago
f5bd4663dd
Nav: Moving the big chunk of code from ItemAdd() to NavProcessItem()
7 years ago
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
80c4e2fe7b
Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.
7 years ago
d851775c80
ColorButton: Reduced bordering artefact that would be particularly visible with opaque Col_FrameBg and FrameRounding enabled.
7 years ago
726dcf0dd2
TextUnformatted(): minor tweak
7 years ago
a0d724b450
Made AlignFirstTextHeightToWidgets() saner and faster (still disliking its name very much!)
7 years ago
a3d0755181
Merge branch 'master' into navigation
7 years ago
f326fac64a
Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). ( #787 )
7 years ago
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
7 years ago
63cd2bf9b1
Removed obsolete comment.
7 years ago
3ddcdcf6e7
Merge branch 'master' into navigation
7 years ago
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
7 years ago
a56b71e866
Nav: Added code to render thin highlight type. ( #787 )
7 years ago
b36a043bbf
typo
7 years ago
6ea90af6b7
Nav: Highlight clipped within host window then extruded out. ( #787 )
7 years ago
cb4e6c8212
Nav: Selectable(): activating selectable also sets NavId + removed the MouseDelta test (added in 43ee5d73e9, #323 ) as I don't think it is needed. ( #787 )
7 years ago
64a51327d3
Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
74da533c93
Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
7f58bb03c1
Changed the internal name formatting of child windows to use slashes as separator, more readable.
7 years ago
cbc9730798
Metrics: Draw window bounding boxes when hovering Pos/Size. List all draw layers, trimming empty commands like Render() does.
7 years ago
491edfd8d8
Nav: Fixed a crash introduced yesterday.
7 years ago
0046c618b0
Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 , #1079 )
7 years ago
ecd72cc0c7
Nav: Disabled the final axial check when considering candidates in most situations except menubars.
...
It's definitively undesirable inside Menu as we want to catch nav request failures reliably.
I think it may be considered as an option if we find this desirable i some circumstances. Right now ideally I'd remove it totally but with current scoring setup, without it we can't easily reach the Window Close button. (#787 )
7 years ago
88a354585a
Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. ( #787 , #126 )
...
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
7 years ago
f4e4c38705
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
7 years ago
9912f7eef8
BeginMenu(): fixed logic to distinguish vertical menu from one layed out in a menu bar. Makes MenuItem() in a regular window behave more consistently, and this will be also needed by upcoming menu-navigation changes in the nav branch. ( #126 , #787 )
7 years ago
cf3b21179b
Nav: Comments
7 years ago
5a9ebeca9e
Nav: Fix typo from 9712a81f85
7 years ago
bfaa426f7f
Nav: Minor tidying up (adding local variables to be a little more sane).
7 years ago
8a5a29f0be
Nav: Renamed internal field.
7 years ago
9712a81f85
Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.
7 years ago
54eb4c485e
Nav: Marked misleading/broken code that will never execute.
7 years ago
e3c89aeb10
Nav: Fixed menuitems/selectable on menu layer (layer 1) from storing themselves in wrong layer of LastNavIds when hovered.causing inconsistencies and bugs when hovering menu with mouse then pressing ALT to return to layer 0).
...
NB: this is not a new bug introduced by the previous commit (which is related to nav layers), bug has been there for a while. (#787 )
7 years ago
9737efb2f1
Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. ( #787 )
7 years ago
8a814487fe
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
fba9353c60
BeginMenu: Shuffling braces around to clarify flow
7 years ago
cf308f4039
Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ( #787 )
7 years ago
f4398226cc
Nav: Support for fallback horizontal scrolling with PadLeft/PadRight (nb: fallback scrolling is only used to navigate windows that have no interactive items). ( #787 )
7 years ago
30b1d85962
Nav: Commiting some better organized Debug helper because this going to stay for a bit.
7 years ago
1f7f54e196
Removed extraneous test.
7 years ago
df366b230e
ColorPicker4: Use nav flag to provide a slighly better experience when using navigation ( #787 , #346 )
7 years ago
2d859dee4e
Nav: Added ImGuiItemFlags_NoNav item flag
7 years ago
878fa96896
Nav: Re-arranged ItemAdd() to maximize early out ( #787 )
7 years ago
dd0855de5c
ButtonBehavior: Tidying up.
7 years ago
4b4e455c40
Nav: Internal nenaming
7 years ago
e0a2a832cd
Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent ( #787 )
7 years ago
af38749ea1
Nav: Fixed ButtonBehavior mistakenly setting active id when the Activate button is held and we have a new NavId, which affected browsing some popups ( #787 )
7 years ago
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
e8f7c83138
Begin: Shallow tweak to minimize diff with nav branch
7 years ago
926c1cf9a4
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
7 years ago
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
7 years ago
9142002121
Separator(): Tweak Logging so that the separator text is aligned according to tree padding.
7 years ago
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
7 years ago
2a8eb618dc
Nav: Fixed NavDown to open menu from a menu bar ( #787 )
7 years ago
35f65e05ed
Merge branch 'master' into navigation
7 years ago
fafe65a8fc
Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.
7 years ago
2159629e9e
Removed another msileading difference between the hovered functions (IsWindowContentHoverable() uses the root window already). Sorry for the commit spam! (making small commit to easily be able to Bisect those in case I make a mistake)
7 years ago
eca74d55c7
IsItemHovered(), IsHovered(): Shallow tweaks, eventually removed all the braces.
7 years ago
2b7d4c713e
Internals: Moved IsWindowContentHoverable() in the file
7 years ago
c5a79deb38
IsItemHovered(), IsHovered(): Shallow tweaks to make them more symetrical. Removed one set of braces.
7 years ago
7bcb1d3816
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
7 years ago
79ef64430c
Nav: Fixed merge cc26db8ec7
7 years ago
cc26db8ec7
Merge branch 'master' into navigation
7 years ago
0adcddac39
IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.
7 years ago
19e22baa06
ItemAdd(): more re-ordering of tests to match IsHovered() + comments
7 years ago
344d48be31
IsItemHovered(), ItemAdd(): Fixed seemingly unnecessary comparaison of root windows, makes IsItemHovered() more consistent with internal IsHovered().
...
Original test was added in 6e99688fa7
7 years ago
c075786d8b
ItemAdd(): re-ordering the tests, submission should now be faster.
7 years ago
99c7622a1b
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
7 years ago
e87ad328e4
Moved implementation of Hovered-related functions next to each others + comments, before I attempt to work on them. No functional change here.
7 years ago
869732c456
Nav: Removed unnecessary combo code (that kept the combo arrow highlighted after reverting to mouse controls). ( #787 )
7 years ago
a2b2e56e8e
Merge branch 'master' into navigation
7 years ago
e56eba44fe
Fixed not being able to move a window by clicking on one of its child window ( #1337 , #635 ), broken by 313d388bba
7 years ago
8374a454da
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
7 years ago
bbd6d5d5b5
Combo: Cleaned up, removed unnecessary code (looks like this part went untouched for a long time!).
7 years ago
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
7 years ago
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
7 years ago
f1a20ec66d
Merge branch 'master' into navigation
7 years ago
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
7 years ago
c7a606ab7e
Horizontal layout does the minimum job to be usable internally - not exposed ( #97 )
7 years ago
728deff56c
Comments, debug code (commented), todo list
7 years ago
82748df71a
WantCaptureMouse: Tweaked logic so WantCaptureMouse can stay false when e.g. hovering over void while an InputText() is active. ( #621 )
7 years ago
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
7 years ago
24f21bd4d4
Merge pull request #1113 from Urmeli0815/ImGuiSelectableFlags_MenuItem
...
MenuItem: only activate on Release, not on Click (nb: and not on ClickRelease to allow opening menu and selecting something with a single click. Windows seems to behave the same, allowing to click and hold to e.g. Open then move cursor, release on Save and save gets activated)
7 years ago
7e8069dd23
Merge branch 'master' into navigation
7 years ago
c0547d358d
Begin: Fixed auto-fit calculation code that predict the presence of ascrollbar so it works in the case size constraints are used. I actually don't need this fix now, but earlier experiment with BeginCombo() required this fix.
7 years ago
4b2781fe87
Begin: Moving some code into a CalcSizeAutoFit() function.
7 years ago
0d56140b4a
BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
...
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
7 years ago
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
7 years ago
0a55573288
Begin(): Minor tidying up of flow
7 years ago
9f34925b2a
Window: Tweaked ApplySizeFullWithConstraint() -> CalcSizeFullWithConstraint() so it can be used without side-effect
7 years ago
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
7 years ago
b9c185402e
Nav: minor tidying up NavUpdate() to use a local variables, easier to test replacing g.NavWindow with g NavMoveResultWindow for navigation accross flattened child windows.
7 years ago
113b2467cd
Minor bits. Reduce usage of GImGui multiple times in same function.
7 years ago
479e532f18
ColorEdit: fixed weird ternary pattern that makes some compiler warning (fair)
7 years ago
f24b5f71ca
Merge branch 'master' into navigation
7 years ago
79ce9b74d5
BeginTooltipEx() internal tweaks
7 years ago
44e8d94aba
Merge branch 'master' into navigation
7 years ago
105f3b14e4
Merge branch 'master' into styles
7 years ago
9693fd5351
PushStyleVar/PopStyleVar: internal tweaks
7 years ago
7c9e38f60a
Style: Moving code in a function to make incoming diff easier to parse.
7 years ago
709653c330
Merge branch 'master' into styles
7 years ago
6c91a1ef7f
Minor comments
7 years ago
052999a6ab
More consistently uses "Dear ImGui"
7 years ago
54d30d758f
Implicit "Debug" window uses a "Debug##Default" identifier to allow the user creating such window with custom flags
7 years ago
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
7 years ago
51fcef0c21
BeginCombo() tweaks, merged from Navigation branch.
7 years ago
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
7 years ago
790605e359
Minor comments + renaming internal fields
7 years ago
e1a7aa41cb
Improved ColorPicker hue wheel color interpolation
7 years ago
2600b28f5d
Begin(): fixed calling Begin() more than once per frame setting `window_just_activated_by_user` which in turn would set Appearing to true for that frame.
7 years ago
6400f2900a
Begin(): renamed locals.
7 years ago
a9c6a0f6ec
Begin(): Removed unnecessary code (at the time of 1.18 commit e9e0e36f98, CursorPos was used to compute SizeContentsFit and this was necessary)
7 years ago
89cae37b49
Begin(): Tidying up some code, should be a no-op.
7 years ago
8fbe8709f9
TODO, minor tweak
7 years ago
e8dbf1c795
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
7 years ago
5658675e9d
Combo: Removed unnecessary ClearActiveId() call (from era where active combo stored an id, now we just use popup functionality)
7 years ago
804ee78731
Added IsWindowAppearing().
7 years ago
670d40642f
Fixed C4267 conversion from size_t to int.
7 years ago
6a1ba317c7
Demo: Minor coding style tweaks so bgfx copy needs less patching.
7 years ago
97a40e74fb
Nav: Fixed bad merge of 6def01be5d so the bug fixed in #840 wasn't fully fixed in Nav branch.
7 years ago
96d2942373
InputText: Merged bits from Navigation branch (inc. g.ActiveIdIsJustActivated is only set on the toggle).
7 years ago
9a0171b803
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
35e4fa7b85
Merged from Navigation branch (DragBehavior)
7 years ago
6cca4025ee
Merge from Navigation branch: 6aa8019763
7 years ago
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
7 years ago
550dc09998
Merged from Navigation branch (misc)
7 years ago
aef041f948
Merged from Navigation branch
7 years ago
c9298c2657
Merged from Navigation branch:
...
f71cdd13b7c816e6c742#323 , #246 )
7 years ago
287a4b6b38
Merged from Navigation branch: 5cac4926c8 fix title bar color of window under a modal window.
7 years ago
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
1f1e63f705
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. Some code in NewFrame() has been moved around. ( #787 )
7 years ago
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
6752cba4bc
Removed duplicate comments
7 years ago
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
f8eef49575
ProgressBar() fixed rendering when straddling rounded area. ( #1296 )
7 years ago
7a9ea281be
ImSwap() helper.
7 years ago
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
7a7327adde
ParseFormatPrecision() returns -1 for scientific noation 'e'/'E', RoundScalar() doesn't alter those.
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
b295e185ff
Updated copyright date for 2017, updated Gallery link
7 years ago
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
7 years ago
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
a02210a455
Fixed compilation with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
7 years ago
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
7 years ago
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
e6ed2f9939
Nav: Tooltip do not appear in navigation focus list. ( #1294 , #787 )
7 years ago
d213c0eb7e
Style: Tweaked default border (undo half-way from original c1e1e015c4) ( #707 )
7 years ago
b0fc30bd19
Merge branch 'master' into navigation
7 years ago
92efa00bc9
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
7 years ago
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
7 years ago
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
7 years ago
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
7 years ago
f3ab5e6252
Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) ( #787 ). Thanks @Grouflon
7 years ago
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
7 years ago
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
7 years ago
6c82af2b96
Navigation branch fix (we changed Clip)
7 years ago
543dc2817f
Fixed an assert when calling CloseCurrentPopup() twice in a row.
8 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
530baee1a7
Removed tabs that slipped through the cracks
8 years ago
067127f113
Columns: Caching columns clipping rectangles ( #125 )
8 years ago
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
8 years ago
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
8 years ago
83e8d10fab
Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. ( #125 , #913 , #893 , #1138 )
8 years ago
1ebd7ec049
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. ( #519 , #125 , #913 )
8 years ago
7ff1c149b5
Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. ( #913 , #125 )
8 years ago
1c83b073c6
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. ( #519 , #125 , #913 )
8 years ago
7f0063f858
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). ( #913 , #125 )
8 years ago
e70d49ba1f
Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). ( #913 , #125 )
8 years ago
9307631c90
Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. ( #913 , #125 ). End() calls EndColumns() directly.
8 years ago
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. ( #913 , #125 )
8 years ago
3bf2af23e6
Columns: Fixed EndColumns() not repositioning the cursor. ( #913 )
8 years ago
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
8 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
8 years ago
af2db53780
Added GetStyleColorVec4()
8 years ago
cf84650ee8
GCC warnings fixes
8 years ago
fd394e1e95
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
8 years ago
91d841dd5f
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
8 years ago
bf0d9c123e
Merge branch 'master' into navigation
8 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
8 years ago
68bf5ecbc1
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
8 years ago
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
8 years ago
a9915681eb
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) ( #747 )
8 years ago
5ea1865fdb
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
8 years ago
d2259f65e5
Undo part of 32dbe836d0 to keep the same name for both overloads ( #891 , #799 )
8 years ago
f98376d02b
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
...
# Conflicts:
# imgui.cpp
8 years ago
a83f7083ed
BeginPopupEx() uses ImGuiID internally
8 years ago
1e162dfc74
PushStyleVar/PopStyleVar: internal tweaks
8 years ago
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
8 years ago
5429bd892e
ColorEdit4: Added "Copy as..." option in context menu ( #346 )
8 years ago
0f935248e3
Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square
8 years ago
032c222d57
Merge branch 'master' into styles
8 years ago
9bf5028fd3
Merge branch 'master' into navigation
8 years ago
a6d69f04c0
PlotHistogram: bars are drawn based on the position of zero ( #828 )
8 years ago
3d6e037c23
Comments ( #1034 )
8 years ago
bd3dfc0eba
Moved TODO list to TODO.txt
8 years ago
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
8 years ago
2b7fe73a08
Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set ( #1048 , #1056 )
8 years ago
c1e1e015c4
Style: Tweaked default border (which is off by default) to be less noticeable ( #707 , #1019 )
8 years ago
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
8 years ago
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
8 years ago
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
8 years ago
8352d43a0c
Fix broken ImGuiColorEditFlags_NoAlpha flag check
...
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
8 years ago
908b025c3c
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation ( #1000 ) + minor FAQ tweaks
8 years ago
08265bfbd9
RenderArrow(): fix warning. re-orderer lines to match enum order.
8 years ago
e3fae56089
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
8 years ago
d7cad903aa
Documentation tweaks
8 years ago
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
8 years ago
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
8 years ago
53d1b1e929
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. ( #346 )
8 years ago
fed18d3203
Removed old ValueColor() helpers. ( #346 )
8 years ago
fc5ab0cb8d
RenderCheckMark() tidying up
8 years ago
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
8 years ago
43e2abbee3
Comments, FAQ entry ( #586 , #1105 )
8 years ago
55b99d753c
Minor string typo
8 years ago
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
8 years ago
a78ef7a369
Comments
8 years ago
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
8 years ago
a4012fd5b2
Merge branch 'master' into 2016-02-colorpicker
8 years ago
b5ad88627d
Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
8 years ago
a1bcc8392e
Fixed GetScrollMaxX() debug left-over from 7096fd8500 ( #1271 )
8 years ago
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
1c991b525a
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
8 years ago
0ab722c3c5
Columns: First first column appearing wider than others ( #1266 )
8 years ago
d43c25d8f4
SetScrollHere() tweak to make the code a little less confusing
8 years ago
e36b41cbd0
Fixed Y scroll aiming when Horizontal Scrollbar is enabled ( #665 ). Tweak log demo.
8 years ago
7096fd8500
Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. ( #1271 , #246 )
8 years ago
233a6efeba
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). ( #1271 )
8 years ago
46c73cccff
Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) ( #1252 )
8 years ago
d762f1dbfb
Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). ( #1262 )
8 years ago
95f2706d1c
Clipboard: [windows] Fixed not closing win32 clipboard on early return. ( #1264 )
8 years ago
40ac84d701
DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. ( #671 )
8 years ago
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
8 years ago
fb54dce71c
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
8 years ago
72da4081f8
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
8 years ago
2f508c7073
ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). ( #346 )
8 years ago
10ef5a63f0
ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. ( #346 )
8 years ago
cc3cce7567
Comments, minor tidying up.
8 years ago
70ee41b8b3
ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. ( #346 )
8 years ago
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
8 years ago
efbb1ae04e
ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. ( #346 )
8 years ago
3ee969c3e3
ColorPicker: Alpha bar using a checkerboard. ( #346 )
8 years ago
3075d8bcd4
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ( #346 )
8 years ago
f6a89779c8
ColorEdit4: Hex input clamps integer components to 0..255 range during printout ( #346 )
8 years ago
e1a00c3d26
ColorButton: Added frame border when style border are off. ( #346 ) @jdumas
8 years ago
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
8 years ago
3fe7739b5d
ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. ( #346 )
8 years ago
3ffcc72f98
ColorPicker: Better cursor/color preview over the color matrix. ( #346 )
8 years ago
fef8aac523
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. ( #346 )
8 years ago
3926bd08e1
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. ( #346 )
8 years ago
e84224bcd5
ColorEdit4: Can open context menu from inputs/drags as well ( #346 )
8 years ago
6c82572a35
ColorEdit4: Fixed not returning true when clicking on the Original/Ref color in Picker spawned from ColorEdit4 + shallow tidying up ( #346 )
8 years ago
7537dff806
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code ( #346 )
8 years ago
6bc1572d31
ColorPicker: Comments. Single input value mode allow access to context-menu options. ( #346 )
8 years ago
973d4a361b
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. ( #346 )
8 years ago
cdcda9ff68
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. ( #346 )
8 years ago
c36d59a42a
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. ( #346 )
8 years ago
b1cbd87a94
ColorEdit4: Minor tidying up. ( #346 )
8 years ago
bfec9c657e
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. ( #346 )
8 years ago
a9df6bfe86
ColorButton: Fixed rounding corners artefact when there is a single cell.
8 years ago
b7a563276d
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. ( #346 )
8 years ago
c1c2b2400a
ColorButton: Undo ce203f99f5
8 years ago
2e37db9002
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 ( #346 )
8 years ago
27e5b09af1
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview ( #346 )
8 years ago
69dd1ed583
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). ( #346 )
8 years ago
76bae2f015
ColorEdit, ColorPicker: Fixed broken build due to commiting an undesirable change in 78a8f798c5 ( #346 )
8 years ago
19c6a9c0e0
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( ( #346 ) + comments
8 years ago
6796e771fd
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag ( #346 ). Reorder flags again.
8 years ago
ce203f99f5
ColorButton: Push a text baseline offset if higher than g.FontSize. ( #346 )
8 years ago
78a8f798c5
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) ( #346 )
8 years ago
9d0e5beaa7
GetColorU32(ImGuiCol): avoid using GImGui twice since some implementation make it a TLS-ish variable with non-trivial accessors.
8 years ago
95fe11b5bf
Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions.
8 years ago
4f1f251bd2
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. ( #346 )
8 years ago
8d32e8dae6
ColorPicker: Handle out of 0..1 range colors when displaying the cross hair. ( #346 )
8 years ago
7b2d79cffd
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. ( #346 )
8 years ago
a8b202782f
ColorPicker,ColorButton: Honor Border/Shadow style settings ( #346 )
8 years ago
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
8 years ago
4355b2e422
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments ( #346 )
8 years ago
15be7e1a71
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h ( #346 )
8 years ago
dd9c2f97a8
ColorPicker: Renamed _NoSliders to _NoInputs ( #346 )
8 years ago
eba33deaf3
ColorPicker: Longer white line for hue/alpha selection, scale down according to ItemInnerSpacing. ( #346 )
8 years ago
1edeea2f5a
ColorPicker: Removed extraneous ImGui:: prefixes + minor comments ( #346 )
8 years ago
e79d7553b0
ColorPicker: Don't use Alpha setting when enabling all 3 sliders ( #346 )
8 years ago
97bedd704c
Better, unified color tooltip ( #346 )
8 years ago
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
8 years ago
138a9dbaeb
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) ( #862 )
8 years ago
e4007f7145
Internals: Move GetVisibleRect() a few functions above so it gets to hang out with its peers.
8 years ago
85d9c8fb46
Internals: renaming IndexWithinParent to OrderWithinParent
8 years ago
25f3717a1c
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. ( #1237 )
8 years ago
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
8 years ago
41f944238b
Comments about GlyphExtraSpacing ( #1192 )
8 years ago
be7fa76fdd
Fixed Clang unknown-warning-ignored warning by ignoring it..... we are truly living in a special time ( #1090 )
8 years ago
cb6d893a13
Comments ( #383 , #1224 )
8 years ago
d3f4309491
Comments about ImGuiStyleVar enum ( #1198 )
8 years ago
a5e0210902
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. ( #1184 )
8 years ago
e47cf79773
Comments tweaks, typos ( #1188 )
8 years ago
4c8d87d3fb
Comments ( #1188 )
8 years ago
978c84d2e9
Removed dependency on int64_t type (unvailable in VS2008) by rewording an assert ( #1184 )
8 years ago
12d265fa31
Version 1.51 WIP tag
8 years ago
5e1caaaef3
Version 1.50
8 years ago
7ad84b22f8
Comments
8 years ago
62c4698a73
Further clarifications of the key indices passed to IsKeyXXX functions ( #1159 )
8 years ago
8228dc20df
Merge branch 'master' into 2016-07-navigation
8 years ago
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
8 years ago
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
8 years ago
bd9868f447
Scrollbar: Avoid rendering when sizes are negative to reduce glitches (not sure how this ever slipped through - perhaps because of WindowMinSize settings).
8 years ago
dbfd5d6e9a
Ignoring unreasonnable Clang -wformat-pedantic warning ( #1090 )
...
See e.g.
http://clang-developers.42468.n3.nabble.com/The-p-conversion-and-cast-to-void-td4044226.html
8 years ago
27b83a2cac
Merge branch 'master' into 2016-07-navigation
8 years ago
89b1497843
Merge branch 'master' into 2016-02-colorpicker
8 years ago
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
8 years ago
d878462866
End() avoid calling Columns() if no columns set is open, not sure what it wasn't the case.
...
Pros: Faster. Avoid early crashes StackId underflow that are meant to be more gracefully caught by CheckStacksSize() (with more explicit assert). Cons: Excercise less code.
8 years ago
bbd44b4edd
Clarified asserts in CheckStacksSize() when there is a stack mismatch
8 years ago
8df58e2cfd
MenuItem should only be selected on release
8 years ago
0e1950f7d6
Comments about child menu positioning ( #1086 )
8 years ago
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
8 years ago
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
8 years ago
fdd11658eb
Fix ColorButton showing wrong hex value for alpha
8 years ago
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
8 years ago
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
8 years ago
c76be71acf
Merge branch 'master' into 2016-07-navigation
8 years ago
6257b5814a
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
8 years ago
a60b2cc645
Merge branch 'master' into 2016-02-colorpicker
8 years ago
bb4d19ff7c
Merge branch 'master' - merge fix
8 years ago
fdc70456f4
Merge branch 'master' into 2016-07-navigation
8 years ago
081aec482b
Merge pull request #931 from nlguillemot/master
...
Combo, ListBox: Extra const correctness.
8 years ago
baa2e3b451
Minor documentation tweaks
8 years ago
36d78e0565
const correctness for Combo and ListBox
...
Since Combo and ListBox only read and display the list of items, they
should not modify the pointers inside the array of pointers passed in.
Adding "const" here makes it possible to call these functions with such
an array of const pointers. Previously, a cast to "const char**" was
required as a workaround, otherwise there was a compile error.
8 years ago
55d651812d
Renaming and massaging internal Settings/Ini functions ( #923 )
8 years ago
0b6211f907
Fixed clicking on a window's void while staying still overzealously marking .ini settings as dirty ( #923 )
8 years ago
9235e0da46
SliderInt, SliderFloat(): Fixed edge case where style.GrabMinSize being bigger than slider width can lead to a division by zero ( #919 )
8 years ago
ca9a918535
SliderInt(): Fixed reverse direction mode when (v_max-v_min)==-1 ( #854 ) (+ ref #919 )
8 years ago
bbd0a37bd2
ImFileOpen: MinGW uses _wfopen() codepath to support UTF-8 filenames ( #917 )
8 years ago
449c47c789
SliderInt, SliderFloat() interacting enforce modifying to the value to be consistent with other widget behaviors ( #919 )
8 years ago
94c77edfa5
SliderInt, SliderFloat() Better display support for v_min==v_max range. ( #919 )
8 years ago
0a483379af
Split SliderBehaviorCalcRatioFromValue() out of SliderBehavior(), fix + Not using fabsf() anymore
8 years ago
004e863727
Split SliderBehaviorCalcRatioFromValue() out from SliderBehavior()
8 years ago
67c6d6026a
Nav: SliderFloat() Fixed non-linear sliders in Nav branch ( #787 , #323 )
8 years ago
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
f4cf972ea9
Merge branch 'master' into 2016-02-colorpicker
8 years ago
219e4fb8fb
SliderInt, SliderFloat: Passing v_min==v_max disable setting value from clicking/dragging ( #919 )
8 years ago
a868c32ed1
SliderInt, SliderFloat: Renaming
8 years ago
61d5b46307
SliderInt, SliderFloat(): support reverse direction ( #854 )
8 years ago
104b381023
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ( #917 )
8 years ago
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
8 years ago
98e1d500d4
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ( #586 )
8 years ago
8553bab241
Ignoring overzealous GCC warnings ( #883 )
8 years ago
941cf1b436
Merge branch 'master' into 2016-07-navigation
8 years ago
ccb3db94da
Merge branch 'master' into 2016-02-colorpicker
8 years ago
3689efb726
Font: Readme about icons
8 years ago
da9feba539
Fixed missing frame padding on title bar text when Collapse triangle is disabled
8 years ago
b376b68326
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
8 years ago
ddf08ec2e8
BeginChild(const char*) applies stack id to provided label ( #894 , #713 )
8 years ago
32dbe836d0
Add user-facing IsPopupOpen function
8 years ago
dd6163241c
Merge branch 'master' into 2016-02-colorpicker
8 years ago
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
8 years ago
7252d93dcd
stb_textedit.h Merged from master 1.9 (merged bits from #473 )
8 years ago
0d3f8807c7
Added a void* user_data parameter to Clipboard function handlers. ( #875 )
8 years ago
cb7e1c18b5
Separator: Fixed zero-height bounding box resulting in clipping when at top of clipping rectangle ( #860 )
8 years ago
4de35b4f30
Removed left-over empty op
8 years ago
1810b3ff38
Added ImGuiCorner enum to clarify some internal code
8 years ago
abaada4224
Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
8 years ago
5957af8a80
Fixed not using IM_ARRAYSIZE() where appropriate
8 years ago
fa73e5aa0e
Plot: Fixed calling with values_count == 0
8 years ago
51111b0ed5
FAQ clarified the ClipRect entry a little
8 years ago
e4deb7a190
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
404979e48d
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
8 years ago
a2487bc143
Minor tweaks
8 years ago
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
8 years ago
eb0382a1c1
Merge branch '2016-08-use_bgra_colors' of https://github.com/thedmd/imgui into thedmd-2016-08-use_bgra_colors
8 years ago
dfe4683c17
EndGroup(): Made IsItemHovered() work when an item was activated within the group ( #849 ) (loosely follows #840 )
8 years ago
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
8 years ago
d75d2b1871
Introduce IMGUI_USE_BGRA_PACKED_COLOR in imconfig.h.
...
When IMGUI_USE_BGRA_PACKED_COLOR is defined packed color hold in ImU32 use BGRA format instead RGBA.
8 years ago
fea0fcb7c3
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
6def01be5d
Fixed IsItemActive() lagging by one frame on initial widget activation ( #840 )
8 years ago
f2699de242
Fix using IsItemActive() after EndGroup() or any widget using groups ( #840 , #479 )
8 years ago
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
1b5bbf725b
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
8 years ago
56cdbe434d
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ( #842 )
8 years ago
0f303d363a
Refactor text alignment options to use ImVec2, removed ImGuiAlign ( #842 , #222 )
8 years ago
de9f8944ea
Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
8 years ago
02cea0c3c3
Comment
8 years ago
281898e82e
Tidying up PushStyleVar/PopStyleVar() a little more ( #842 )
8 years ago
c5b8c6303a
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ( #842 )
8 years ago
6e87f071b8
Shutdown() clear out some remaining pointers ( #836 )
8 years ago
0420ab027e
Metrics: Displaying window position + moving extraneous line in IsPopupOpen().
8 years ago
b397fb507e
Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ( #829 )
8 years ago
612b17ef57
Fixing minor english typos ( #827 )
8 years ago
f6d4ca6473
TODO list
8 years ago
c0fcf223be
Fixed assert triggering when a window has zero rendering but has a callback ( #810 )
8 years ago
3c384c2f10
Examples: Renaming opengl_example/ to opengl2_example/ for clarity (1/2 because git)
9 years ago
ef10b984fe
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
9 years ago
f39513ac47
Merge remote-tracking branch 'origin' into 2016-07-navigation
9 years ago
63d47bc5a4
ImFormatString() Fixed an overflow handling bug with implementation of vsnprintf() that do not return -1 ( #793 )
9 years ago
e8e5c6d788
Nav: Comments. Fixed two -Wall warnings. Removed unused function. ( #787 )
9 years ago
3883a2027f
Nav: Fixed Selectable() crash introduced earlier today in 43ee5d73 + added comments/assert ( #323 )
9 years ago
df9bdf38f9
Nav: NavActivateId, NavInputId are no repeat actions. Repeat buttons handle it themselves already anyway. ( #323 )
9 years ago
c6c7371a4c
Nav: Removed unnecessary test following 49ca1c2b88 ( #323 )
9 years ago
49ca1c2b88
Nav: InitDefaultRequest saves a fallback item so PadMenu on a collapsed window gets us to the collapse button ( #323 )
9 years ago
2303b67c40
Close button submitted after collapse button. Should have no effect. Consistent with expectation & will be used as fallback for nav ( #323 )
9 years ago
252f094101
Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() ( #323 )
9 years ago
fddf9ca10e
Nav: Fixed nav highlight clipping (affected non non-menu items within menubar) ( #323 )
9 years ago
78b7e2dfb3
Nav: Process and apply mouse move request immediately after move request result comes ( #323 )
9 years ago
f71cdd13b7
Internal tidying up, moved code to CalcNextScrollFromScrollTargetAndClamp() so it can be reused by upcoming nav code.
9 years ago
ac7826c8a5
ImRect: Added Translate() helper, removed redundant and misleading Reduce()
9 years ago
87eb749cbc
Added IsItemHoveredOrFocused() (provisional name), better handling of popup/tooltip positioning when using mouse+nav ( #323 )
9 years ago
ea2425ad9a
Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav ( #323 )
9 years ago
43ee5d73e9
Nav: Hovering MenuItem/Selectable with mouse makes NavId, matching what seems to be Windows beahvior at least for menus ( #323 )
9 years ago
30c04d0dbe
Nav: Mouse pos passed to backend always rounded, so that lossy application of non-integer mouse pos doesn't lead to undesirable movement ( #3
9 years ago
bf42657850
Nav: Clearing mouse hover flag using MouseClicked[] test instead of MouseDown[] so that invalid mouse button won't keep breaking nav ( #323 )
9 years ago
695ca7bb45
Nav: Tidying up. Comments. ( #323 )
9 years ago
4f7c63a7af
Nav: Fixed a bug where mouse positioning requests would be sent while opening submenus with mouse ( #323 )
9 years ago
e4c099d67c
Nav: Comments + fixed handling of PadLeft in menus (fix e55882f) ( #323 )
9 years ago
e3fec8c0aa
Renamed function ( #323 )
9 years ago
ead79dcdac
Metrics: 64-bit display fix
9 years ago
3ab0d5cdfd
Nav: NavHighlight gets its own color (default to Header color), made rectangle thicker ( #323 )
9 years ago
cf16ba6572
Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent ( #323 )
9 years ago
6c19d7b13c
Nav: Fixed clipping rect of navigation highlight, notably for collapsing arrow ( #323 )
9 years ago
9501cd9991
InputText: Fixed calling callback on frame of losing active id, fix part of 848e62bfe0 (nav branch only)
...
#323 #701
9 years ago
cff815fd2d
Merge branch 'master' into 2016-02-colorpicker
9 years ago
a83f9b7885
Merge branch 'master' into 2016-07-navigation
9 years ago
0f9addb002
Minor shuffle to ease merging branches. (tentative. fugly but those fields will be removed anyway)
9 years ago
bfe1e163b8
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
9 years ago
4bc3f9d1f7
Minor shuffle to ease merging branches.
9 years ago
996eb080fa
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
9 years ago
df1d1b5b25
Nav: DragBehavior: Adjust minimum step to displayed precision when using navigation ( #323 , #180 )
9 years ago
09cba02d3f
Nav: DragBehavior: Fix for fast speed ( #323 #180 )
9 years ago
761a74c62b
Selectable/MenuItem: Not activated on Click but only on Release is more standard ( #126 , #245 , #323 )
...
Apparently menu items started with OnClick (vs OnClickHoldRelease) when
doing #126 . Hope to not break anything.
Also allows using xxx_DontClosePopup flags.
9 years ago
8828889d5e
Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup ( #323 )
9 years ago
525ef5b357
Nav: Tweaked default highlight clipping (clipped by scrollbar) and removed subtle background ( #323 )
9 years ago
a68132948b
Nav: Added ImGuiCol_NavWindowingHighlight into style ( #323 )
9 years ago
6aa8019763
Nav: Fixed bug where pressing NavInput(Triangle) to turn slider/drag into text input would then change subsequent NavActivate as well ( #323 )
9 years ago
e55882f74b
Nav: Allow PadLeft to close a menu ( #323 )
9 years ago
c203be94c6
Merge remote-tracking branch 'origin' into 2016-07-navigation
9 years ago
6eb35b8a04
BulletText(): doesn't stop displaying at the ## mark
9 years ago
8a6d209f68
Nav: Failed movement request with no current NavId fallback to an InitDefaultRequest so that we always land somewhere on first move ( #323 )
9 years ago
5ef8452509
Nav: Comments ( #323 )
9 years ago
cbf24c13ca
Merge remote-tracking branch 'origin' into 2016-07-navigation
9 years ago
5d1a0a6f77
Removed a handful of obsolete (trivial) function redirection from 1.34 and 1.38 (march-april 2015)
...
OpenNextNode() -> SetNextTreeNodeOpen()
GetWindowIsFocused() -> IsWindowFocused()
GetItemBoxMin() -> GetItemRectMin()
GetItemBoxMax() -> GetItemRectMax()
IsMouseHoveringBox() -> IsMouseHoveringRect()
IsClipped() -> !IsRectVisible()
9 years ago
b8397c2933
Tweak comments ( #768 )
9 years ago
a1521534ba
Merge branch '2016-08-generalized_visibility_test' of https://github.com/thedmd/imgui into thedmd-2016-08-generalized_visibility_test
9 years ago
af33efb146
Using IM_COL32() for colors in a few spots ( #767 )
9 years ago
a7f6ea592f
Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ( #759 )
9 years ago
7588dfb67e
Add ability to test arbitrary rectangle for visibility without need of moving cursor.
9 years ago
omar
Emmanuel Benoît
stfx
Giuseppe Barbieri
Branimir Karadžić
omar
Patrick Doane
matiTechno
Václav Patejdl
LuK1337
Michael Link
Codecat
Nicolas Guillemot
Geoffrey Tucker
Matt Keeter
Michał Cichoń