omar
|
0095b7a0ea
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-07-26 23:55:23 +02:00 |
|
omar
|
28c1a9857e
|
Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. (#319).
|
2018-07-26 23:50:05 +02:00 |
|
omar
|
63df9d6311
|
Internals: Extracted part of Begin into UpdateWindowParentAndRootLinks(). Useful to call to keep state updated immediately (namely useful for docking) + small tidying up of imgui_internal.h
|
2018-07-26 23:49:36 +02:00 |
|
omar
|
6b4f6cd2c5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-26 19:25:55 +02:00 |
|
omar
|
dd0d5debef
|
Internals: Child windows that are clipped or part of a collapsed parent are not marked as collapsed anymore, but just a separate hidden marker set. We distinguish hiding for size measurement vs hiding for other reasons. Cleaned a little the end of Begin.
|
2018-07-26 19:24:27 +02:00 |
|
omar
|
0b045d8de5
|
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
|
2018-07-26 19:03:02 +02:00 |
|
omar
|
1b646a4440
|
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
|
2018-07-26 19:01:51 +02:00 |
|
omar
|
0c88fad6c2
|
Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. (#319)
|
2018-07-25 16:07:05 +02:00 |
|
omar
|
f22024cb19
|
Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h
|
2018-07-24 16:54:29 +02:00 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
357534e588
|
Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.
|
2018-07-24 16:45:11 +02:00 |
|
omar
|
3a522b2400
|
Internals: Renamed one of the arrow functions so their name don't collide.
|
2018-07-24 16:41:17 +02:00 |
|
omar
|
e07f5d4c78
|
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
|
2018-07-22 18:46:41 +02:00 |
|
omar
|
7b4fbf4301
|
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)
|
2018-07-17 16:37:10 +02:00 |
|
omar
|
b8b74970d7
|
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)
|
2018-07-17 16:04:47 +02:00 |
|
omar
|
b30b82835a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2018-07-12 11:48:49 +02:00 |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
2018-07-12 11:08:24 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
2018-07-10 19:16:57 +02:00 |
|
omar
|
4dfb9ef751
|
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
|
2018-07-10 11:16:40 +02:00 |
|
omar
|
140ece0aeb
|
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
|
2018-07-09 21:18:10 +02:00 |
|
omar
|
574185426c
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:06:46 +02:00 |
|
omar
|
7033b2043b
|
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
|
2018-07-09 20:34:12 +02:00 |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:22:49 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
0708f91617
|
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
|
2018-07-09 16:20:14 +02:00 |
|
omar
|
bd6097ac6f
|
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
64938178b7
|
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
|
2018-07-08 18:23:12 +02:00 |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-08 13:08:16 +02:00 |
|
omar
|
93950b8c32
|
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
|
2018-07-06 15:50:07 +02:00 |
|
omar
|
770cba0bd0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
|
2018-07-02 20:13:16 +02:00 |
|
omar
|
004fe8916a
|
Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)
|
2018-06-28 18:42:38 +02:00 |
|
omar
|
7adae3299e
|
Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments
|
2018-06-27 17:29:31 +02:00 |
|
omar
|
c38fe6b0e1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-06-26 12:41:36 +02:00 |
|
omar
|
79153cf19f
|
Internals: Various renaming. e.g. NewFrameUpdateHoveredWindowAndCaptureFlags() to UpdateHoveredWindowAndCaptureFlags() + exposed UpdateMovingWindow() in imgui_internal.h.
|
2018-06-26 12:40:37 +02:00 |
|
omar
|
14ceaaf460
|
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
|
2018-06-26 12:37:20 +02:00 |
|
omar
|
c1d8dee6c5
|
Version 1.63 WIP
|
2018-06-25 09:40:09 +02:00 |
|
omar
|
ce500f8727
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
|
2018-06-22 12:01:42 +02:00 |
|
omar
|
1b74e3be02
|
Version 1.62
|
2018-06-22 09:41:25 +02:00 |
|
omar
|
70b0bd13aa
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
|
2018-06-14 15:30:15 +02:00 |
|
omar
|
d57fc7fb97
|
Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. (#820, #956, #1875)
|
2018-06-13 00:10:33 +02:00 |
|
omar
|
be4b8b5615
|
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
|
2018-06-13 00:02:19 +02:00 |
|
omar
|
cd455a4600
|
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. (#820, #956, #1875)
|
2018-06-12 18:44:33 +02:00 |
|
omar
|
c725710c6d
|
Comments
|
2018-06-12 18:25:04 +02:00 |
|
omar
|
93b032ea92
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
|
2018-06-05 15:51:52 +02:00 |
|
omar
|
6d98c0323b
|
Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). (#787)
|
2018-06-05 15:49:33 +02:00 |
|
omar
|
5a7e98c7cf
|
Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix.
|
2018-06-04 15:43:33 +02:00 |
|
omar
|
08e20ae465
|
Internals: Reintroducing LastActiveIdTimer because it is useful and to reduce merge conflicts. (#1537)
|
2018-05-28 21:48:25 +02:00 |
|
omar
|
d4b151076c
|
Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9. (#1739, #143).
|
2018-05-28 21:40:09 +02:00 |
|
omar
|
92b7d6bc4f
|
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)
|
2018-05-28 20:57:41 +02:00 |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-17 15:03:56 +02:00 |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
2018-05-17 14:12:37 +02:00 |
|
omar
|
ede5059e69
|
Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose
|
2018-05-17 10:48:15 +02:00 |
|
omar
|
86f8cdbd98
|
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
|
2018-05-16 18:03:37 +02:00 |
|
omar
|
99ff6fc7e4
|
Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). (#787)
|
2018-05-14 23:07:35 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-05-14 13:15:21 +02:00 |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
2018-05-14 12:34:47 +02:00 |
|
omar
|
725c13ca68
|
Fix for atof with glibc.
|
2018-05-13 22:43:43 +02:00 |
|
omar
|
2a2bb8970d
|
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
|
2018-05-13 22:31:29 +02:00 |
|
omar
|
ff033f431b
|
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
|
2018-05-13 21:04:07 +02:00 |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-11 22:22:41 +02:00 |
|
omar
|
fc7fc83f9e
|
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
|
2018-05-11 19:27:27 +02:00 |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
2018-05-11 16:48:50 +02:00 |
|
omar
|
773d484009
|
Internals: Made ContentsRegionRect absolute to reduce confusion. Renamed InnerRect to InnerMainRect, renamed WindowRectClipper to OuterRectClipped.
|
2018-05-09 23:12:34 +02:00 |
|
omar
|
f83f566530
|
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
|
2018-05-09 21:48:03 +02:00 |
|
omar
|
5f464877ed
|
Internals: Declaring DragBehavior, SliderBehavior in there (no warantee given) as they may be useful to custom widgets.
|
2018-05-08 19:52:56 +02:00 |
|
omar
|
8da0d42ef2
|
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType (#320, #643, #708, #1011)
|
2018-05-08 19:52:55 +02:00 |
|
omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2018-05-07 22:23:58 +02:00 |
|
omar
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
2018-05-07 22:18:45 +02:00 |
|
omar
|
023cc25c7c
|
Internals: Removed unnecessary allocation indirection for g.LogClipboard (this only made sense when there was a global context instance)
|
2018-05-07 22:15:25 +02:00 |
|
omar
|
3e8087458d
|
SliderScalar, VSliderScalar(): Support for any data types. Tested with various ranges/limits. Note that Drag/Slider/Input currently fail if the format string doesn't preview the actual value. Will fix next. (#320, #643, #708, #1011)
|
2018-05-04 20:55:51 +02:00 |
|
omar
|
944f414cc6
|
Internals: A few selected math helpers are now using template to handle all supported types. Added ImPow() to wrap float/double in a standard manner without calling pow(double) when not needed in Drag code.
|
2018-05-04 18:14:59 +02:00 |
|
omar
|
f4c16fbb99
|
Internals: Data types: Made format string optional. DragBehavior: Moved a bit of code outside of the template. Slider tidying up. Removed unnecessary call to fabsf().
|
2018-05-04 17:57:47 +02:00 |
|
omar
|
f47c756755
|
Internals: Missing const, some renaming. Tweak legacy fast path.
|
2018-05-03 22:12:55 +02:00 |
|
omar
|
069b284f17
|
Internals: Tidying up internal helpers. Fixed a case ImParseFormatTrimDecorations() can return an off by one (out of bound) pointer if the format string is invalid. Extracted ImParseFormatFindEnd() out of TrimDecorations so we can use it to find the format type and replace the %f in old Int apis.
|
2018-05-03 20:22:29 +02:00 |
|
omar
|
086c3925c4
|
Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. (#320, #643, #708, #1011)
|
2018-05-03 19:42:35 +02:00 |
|
omar
|
6c932479f2
|
Internal: DragScalar(), InputScalar() now support signed/unsigned, 32/64 bits, float/double data types. (#320, #643, #708, #1011)
|
2018-05-03 17:34:38 +02:00 |
|
omar
|
93b8580a8d
|
Internals: DragFloat: Fixed power handling. Use an temporary accumulator and no absolute values so we will be able to manipulate double as well as 64-bit integers. (#1011, #708, #320)
|
2018-05-03 17:34:33 +02:00 |
|
omar
|
3f04fd0644
|
Internals: DragFloat: Removed DragSpeedScaleFast/DragSpeedScaleSlow since it's not yet usable and Nav version doesn't have an equivalent.
|
2018-05-03 17:34:29 +02:00 |
|
omar
|
4780ac1ca4
|
Internals: Data types: Added s64, u64 data types. Added support in InputScalar(). Removed internal.h InputScalarEx() to InputScalar(). Removed cheap-relative-operators support in recently added U32 data path, since this is heading toward being legacy code. + Fixed InputDouble parsing code. (#1011, #320, #708)
|
2018-05-03 17:34:22 +02:00 |
|
omar
|
10e3f17235
|
DragFloat/SliderFloat internal InputScalar trim leading/trailing spaces emitted from the format string when presenting an edit box to the user. (#648)
Follow up to 6881d065b8
|
2018-05-03 17:34:02 +02:00 |
|
omar
|
a62f195e83
|
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
|
2018-05-03 17:33:55 +02:00 |
|
omar
|
ed756d474e
|
Internals: Added ImGuiDataType_Uint32 data type which is usable with InputScalarEx().
|
2018-04-30 20:02:33 +02:00 |
|
omar
|
92f0165f85
|
DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. (#648)
|
2018-04-30 16:44:57 +02:00 |
|
omar
|
6881d065b8
|
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. (#648)
|
2018-04-30 15:59:59 +02:00 |
|
omar
|
d7e24416dd
|
DragFloat/SliderFloat internal InputScalar relies on the user supplied format string to format and parse value. (#648)
The trailing text after the format will be displayed in the InputText but not affect back parsing. Ideally we can try to strip it later.
|
2018-04-30 15:21:51 +02:00 |
|
omar
|
f80314754c
|
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. (#648)
|
2018-04-28 00:11:40 +02:00 |
|
omar
|
c47d34cf70
|
Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.
|
2018-04-27 15:13:22 +02:00 |
|
omar
|
cd51f37fc0
|
Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. (#1542)
|
2018-04-26 16:18:47 +02:00 |
|
omar
|
da70c837da
|
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. (#1542)
|
2018-04-26 15:30:19 +02:00 |
|
omar
|
f1ae07e532
|
Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. (#1542)
|
2018-04-26 11:52:38 +02:00 |
|
omar
|
5979233a3c
|
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
|
2018-04-25 18:23:39 +02:00 |
|
omar
|
0b1d6a0d52
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2018-04-25 18:13:23 +02:00 |
|
omar
|
e3453d0dc4
|
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
|
2018-04-25 17:58:53 +02:00 |
|
omar
|
3b9b1956cd
|
Merge branch 'master' into viewport
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
|
2018-04-25 15:32:04 +02:00 |
|
omar
|
01fa934222
|
Internals: Removed unecessary Pos/PosFloat separation, only reason appears to be mostly pre-1.0. The only piece of code that I expected sub-pixel window position to matter actually already round its delta (wrongly so, will fix later/separately if we want).
|
2018-04-25 15:24:26 +02:00 |
|
omar
|
cc882b0723
|
Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). (#1542)
|
2018-04-25 15:14:51 +02:00 |
|
omar
|
7684f53328
|
Viewport: Fixed issues with popups drifting in particular when reference mouse position become invalid (e.g. changing app focus while viewported-menu is open). Storing monitor index in viewport at beginning of the frame. (#1542)
|
2018-04-25 11:23:58 +02:00 |
|