omar
|
84f3ecc231
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-05-30 18:52:24 +02:00 |
|
omar
|
21ebdcafc9
|
Internals: Window rectangles: Renaming of all rectangles toward their final form. Should be a no-op. Renamed GetWorkRectMax() to GetContentRegionMaxAbs(). Metrics shows SizeContents.
|
2019-05-30 18:04:21 +02:00 |
|
omar
|
c72040a715
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2019-05-29 16:20:26 +02:00 |
|
omar
|
cb7ba60d3f
|
CollapsingHeader: When a close button is enabled, better clip the label to avoid overlap. (#600)
|
2019-05-28 21:25:28 +02:00 |
|
omar
|
70d9f79312
|
Internal: Renamed InnerMainRect to InnerVisibleRect. Printing coordinates in Metrics window.
|
2019-05-28 11:23:04 +02:00 |
|
omar
|
70a4be07df
|
ColorEdit: Fixed the color picker popup only displaying inputs as HSV instead of showing multiple options. (#2587, broken in 1.69 by #2384).
|
2019-05-27 14:57:39 +02:00 |
|
omar
|
e5dfa0855f
|
Docking: Honor style.WindowMenuButtonPosition setting in docking node.
|
2019-05-24 21:59:44 +02:00 |
|
omar
|
afad952450
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2019-05-24 21:58:17 +02:00 |
|
omar
|
958d75c00a
|
Style: Added style.WindowMenuButtonPosition (left/right, defaults to ImGuiDir_Left) to move the collapsing/docking button to the other side of the title bar.
|
2019-05-24 21:54:52 +02:00 |
|
omar
|
6c3697f6f1
|
Internal: CloseButton takes an upper-left corner + a size to be consistent with similar widgets.
|
2019-05-24 17:58:21 +02:00 |
|
omar
|
ec3ec24157
|
Internals: Extracted some of the tab bar shrinking code into a ShrinkWidths() function so columns/table can use it.
|
2019-05-24 14:32:33 +02:00 |
|
omar
|
3fda90d6a7
|
Fixed InputScalar, InputScalarN, SliderScalarN, DragScalarN with non-visible label from inserting style.ItemInnerSpacing.x worth of trailing spacing.
|
2019-05-24 14:32:28 +02:00 |
|
omar
|
fda1365c15
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-05-23 00:04:25 +02:00 |
|
omar
|
7bc03f7155
|
Internals: Added InnerWorkRect equal to old InnerClipRect, added InnerWorkRectClipped actually clipped.
|
2019-05-22 23:56:31 +02:00 |
|
omar
|
04022114d9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-05-21 14:47:29 +02:00 |
|
omar
|
882d2c3aea
|
Fixed crash when appending with BeginMainMenuBar() more than once and no other window are showing. (#2567) + comments
|
2019-05-21 12:18:34 +02:00 |
|
omar
|
f242cd4d8a
|
Fixed GCC mem-access warnings (#2565)
+ using "if defined" more consistently for Clang.
|
2019-05-19 17:15:14 +02:00 |
|
omar
|
e6109a9145
|
Fixed ColorEdit breakage introduced by d3a387c (#2557, #1875, #2034)
|
2019-05-18 11:18:31 +02:00 |
|
omar
|
4158cba1ff
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
2019-05-13 19:23:18 +02:00 |
|
omar
|
d3a387cc18
|
Fixed InputFloatX, SliderFloatX, DragFloatX functions erroneously reporting IsItemEdited() multiple times when the text input doesn't match the formatted output value (e.g. input "1" shows "1.000"). It wasn't much of a problem because we typically use the return value instead of IsItemEdited() here. (#1875, #2034)
|
2019-05-13 19:04:57 +02:00 |
|
omar
|
99a845053a
|
Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)
|
2019-05-13 18:26:28 +02:00 |
|
omar
|
64dbd932d2
|
Internal: Removed GetNextItemWidth(), relying on ItemAdd or NextItemData.ClearFlags() to clear the width data. Amend 5078fa20 and undo some of its effects of imgui_widgets.cpp
|
2019-05-13 15:29:00 +02:00 |
|
omar
|
632469d2e5
|
Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.
|
2019-05-13 15:11:25 +02:00 |
|
omar
|
36e714a459
|
Internal: Storing flags for NextWindowData so that we can clear everything with a single write and remove dummy condition fields.
|
2019-05-13 14:57:30 +02:00 |
|
omar
|
0b485f12d7
|
Internal: Minor tidying/reordering of sections within ImGuiContext / window DC.
|
2019-05-13 14:02:03 +02:00 |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
omar
|
39eeda0227
|
Internal: Scrollbar: Further sane simplification (using InnerMainRect instead of duplicating calculations).
|
2019-05-10 18:52:29 +02:00 |
|
omar
|
37174c85e2
|
Internal: Scrollbar: Extracted scrollbar code for other uses (eg. table v2 scrolling without using a child window).
|
2019-05-10 18:52:23 +02:00 |
|
omar
|
9534ef9b26
|
Separator: Revert 1.70 "Declare its thickness (1.0f) to the layout" change (c5d83d8a). It's not incorrect but it breaks existing some layout patterns. Will return back to it when we expose Separator flags.
|
2019-05-09 17:52:56 +02:00 |
|
omar
|
a4d0b0efa4
|
Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759) + misc comments
|
2019-05-09 12:55:01 +02:00 |
|
omar
|
b7c2759f95
|
Columns: Fixed Separator from creating an extraneous draw command. Fixed Selectable with SpanAllColumns flag from creating an extraneous draw command. (#125)
|
2019-05-09 12:10:36 +02:00 |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
2019-05-07 16:36:08 +02:00 |
|
omar
|
d1d5075b66
|
Version 1.70
|
2019-05-06 14:17:39 +02:00 |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2019-05-06 10:16:43 +02:00 |
|
omar
|
2dc81057ec
|
Selectable: With ImGuiSelectableFlags_AllowDoubleClick doesn't return true on the mouse button releas efollowing the double-click. Only first mouse release + second mouse down (double-click) returns true. Likewise for internal ButtonBehavior() with both _PressedOnClickRelease | _PressedOnDoubleClick. (#2503)
|
2019-05-03 14:31:12 +02:00 |
|
omar
|
ce19cb465f
|
Internals: Rename GetContentRegionMaxScreen() -> GetWorkRectMax(). At this point this is mostly useful to facilitate merge of other branches.
|
2019-05-02 16:29:40 +02:00 |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-29 13:06:55 +02:00 |
|
omar
|
4dec744795
|
Tidying up BeginMenu() code + comments.
|
2019-04-29 00:02:02 +02:00 |
|
omar
|
bda2cde68e
|
Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517)
Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.
|
2019-04-28 22:18:51 +02:00 |
|
omar
|
3276b12765
|
Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h
|
2019-04-28 20:55:51 +02:00 |
|
omar
|
4e81b2d093
|
Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.
|
2019-04-28 17:15:08 +02:00 |
|
omar
|
3d363c91fd
|
Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.
|
2019-04-28 15:27:18 +02:00 |
|
omar
|
c5d83d8af2
|
Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.
|
2019-04-26 23:31:31 +02:00 |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
2019-04-25 17:53:11 +02:00 |
|
omar
|
56c3aaf6bd
|
Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
|
2019-04-25 17:50:40 +02:00 |
|
omar
|
dd15b44230
|
Internals: TempInputText: Tidying up DragScalar / SliderScalar / TempInputTextScalar.
|
2019-04-25 17:50:40 +02:00 |
|
omar
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
2019-04-25 16:03:47 +02:00 |
|
omar
|
59a3f0476d
|
Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.
|
2019-04-25 15:21:22 +02:00 |
|
omar
|
16b18b265e
|
MenuItem, BeginMenu: Fix undesirable tall frames in horizontal layout context, which would be visible when trying to use rounded selectable/menus.
PushStyleVar: Added comments in the assert message.
Minor tweaks.
|
2019-04-25 11:34:07 +02:00 |
|
omar
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
2019-04-24 17:40:07 +02:00 |
|