omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-12-18 15:02:35 +01:00 |
|
omar
|
ae76a1fda7
|
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
|
2018-12-18 15:01:15 +01:00 |
|
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
2018-12-14 18:44:17 +01:00 |
|
omar
|
f6f5c51106
|
Internals: Popups: EndMenu() calls ClosePopupToLevel(g.CurrentPopupStack.Size) which is more correct.
|
2018-12-14 18:42:28 +01:00 |
|
omar
|
587506dd57
|
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
|
2018-12-14 11:27:02 +01:00 |
|
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-12-13 19:20:34 +01:00 |
|
omar
|
1b263f6ab0
|
Tabs: Fixed support for drag and drop ImGuiButtonFlags_PressedOnDragDropHold. (#261) incorrectly missing from the merge from Docking branch.
|
2018-12-11 19:37:22 +01:00 |
|
omar
|
5a6b8e00db
|
BeginTabBar: Fix to push the expected ID into the ID stack (instead of a hash's hash). (#261)
|
2018-12-11 15:22:10 +01:00 |
|
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-11 12:41:40 +01:00 |
|
omar
|
54a60aaa40
|
Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
|
2018-12-11 12:36:47 +01:00 |
|
omar
|
15447f5b7b
|
Using named flags instead of 0 + shallow formatting tweaks from other branches.
|
2018-12-11 12:14:27 +01:00 |
|
omar
|
26b9e2d0a5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-12-10 16:14:31 +01:00 |
|
omar
|
d20e3ee710
|
Tests: Adding imgui-test engine hooks (experimental) to provide missing widget state to the testing system.
|
2018-12-10 14:30:41 +01:00 |
|
omar
|
a03846bd9e
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-06 16:33:39 +01:00 |
|
omar
|
125e62491e
|
Internals: Nav: Added ImGuiNavLayer_ to clarify semantic of previously integer NavLayer values, and not pretend that increment/decrement operators on them super flexible. + Storage tweaks.
|
2018-12-04 14:34:49 +01:00 |
|
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
2018-12-04 00:05:45 +01:00 |
|
omar
|
10e13dd6bb
|
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
|
2018-12-03 12:19:23 +01:00 |
|
omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-03 11:41:53 +01:00 |
|
omar
|
801645d350
|
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
|
2018-12-03 10:17:17 +01:00 |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
2018-11-30 18:24:43 +01:00 |
|
omar
|
1bfcf8f339
|
Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file.
|
2018-11-30 16:42:32 +01:00 |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-11-26 14:53:51 +01:00 |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-11-22 15:28:27 +01:00 |
|
omar
|
da3c4330c1
|
Version 1.66
|
2018-11-22 15:11:52 +01:00 |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-11-15 13:58:46 +01:00 |
|
omar
|
f2d577c33f
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
2018-11-13 22:14:40 +01:00 |
|
omar
|
6c1ae6cc71
|
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
|
2018-11-09 14:41:40 +01:00 |
|
omar
|
6d7677534f
|
Internals: SliderBehavior: Using axis indexing.
|
2018-11-09 14:31:14 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
eb592bf7d3
|
ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. (#2173). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.
|
2018-11-05 14:49:17 +01:00 |
|
omar
|
7fa3e71abb
|
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155)
|
2018-10-30 10:48:21 +01:00 |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-25 23:41:13 +02:00 |
|
Konstantin Podsvirov
|
faecf90383
|
SliderAngle: Added optional format argument to allow users customize precision and make localization. (#2150)
|
2018-10-25 22:29:29 +02:00 |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:56:26 +02:00 |
|
omar
|
31fd6c585a
|
Removed unnecessary ImGui:: qualifiers in internal code.
|
2018-10-17 10:47:27 +02:00 |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-10-12 15:50:48 +02:00 |
|
omar
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
2018-10-12 15:48:38 +02:00 |
|
omar
|
ede3a3b92d
|
Fixes crash introduced in previous commit 9cf94d5.
|
2018-10-12 13:29:13 +02:00 |
|
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
2018-10-12 12:34:47 +02:00 |
|
omar
|
0fe48cbb61
|
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035, #2096)
Added misc/README file.
|
2018-10-12 11:16:51 +02:00 |
|
omar
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
2018-10-11 12:53:10 +02:00 |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
3d318a6577
|
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
|
2018-09-20 10:24:29 +02:00 |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
c12da2a607
|
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
|
2018-09-14 11:28:08 +02:00 |
|
omar
|
ca5dc0c019
|
ColorPicker: Replaced the Separator with a Spacing call. (#2068)
|
2018-09-14 10:05:53 +02:00 |
|
Elias Daler
|
ec04e8bb05
|
Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton (#2080)
|
2018-09-12 22:58:45 +02:00 |
|
omar
|
9cc63ba279
|
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. (#2078)
|
2018-09-11 22:00:57 +02:00 |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|