omar
|
0cad274b87
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
7 years ago |
|
omar
|
4649967112
|
Added extra comments and assertions to avoid user combining ImGuiCond flags. (#1694)
|
7 years ago |
|
omar
|
cd1e6e384f
|
Tooltip windows uses PopupBorderSize (#1697) + commented out debug stuff.
|
7 years ago |
|
omar
|
ac8931b2e9
|
Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. (#1542)
|
7 years ago |
|
omar
|
c19b27813d
|
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well.
|
7 years ago |
|
omar
|
c796960ff9
|
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011)
|
7 years ago |
|
omar
|
172570acae
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
|
7 years ago |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
7 years ago |
|
omar
|
dcf7c3d188
|
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542)
|
7 years ago |
|
omar
|
170f44e6f0
|
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming (#787)
|
7 years ago |
|
omar
|
c29971cf72
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
7 years ago |
|
omar
|
70d500502a
|
ImVector: Fixed insert() helper using the = operator (followup to be consistent with 4186c2c2b1)
|
7 years ago |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
7 years ago |
|
omar
|
33ad8b2f0c
|
Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks
|
7 years ago |
|
omar
|
46b61427e1
|
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. (#1542, #1042)
|
7 years ago |
|
omar
|
bcf4ed28a9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
d8d93f6360
|
imgui.h: Various comments and tweaks.
|
7 years ago |
|
omar
|
6fe22e6297
|
imgui.h: Moved columns lower in the file. Various spacing changes and minor comments.
|
7 years ago |
|
omar
|
6cfc9e6256
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
6bda816ffe
|
ImVector: Added copy/assign operators as helpers to ease cloning of data.
|
7 years ago |
|
omar
|
1e296453ef
|
ImDrawList: Added Clone() helper function.
|
7 years ago |
|
omar
|
4186c2c2b1
|
ImVector: resize() / push_back() use memcpy() as we are not supposed to be constructor/destructor/operator aware at all. (If we do need to rework ImVector). In turn this will allow us to define assign/copy operators.
|
7 years ago |
|
omar
|
d68be086b2
|
ImVector: Using value_type consistently. Spacing.
|
7 years ago |
|
omar
|
533c86a7a3
|
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
|
7 years ago |
|
omar
|
d0e0b106f0
|
Examples: SDL,GLFW,Vulkan: The Platform<>Renderer link is handled by SDL/GLFW platforms, both can compile without Vulkan headers, SDL+Vulkan is now on part with GLFW+Vulkan (aka broken the same way!). (#1542)
|
7 years ago |
|
omar
|
921bb92eec
|
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. (#1542)
|
7 years ago |
|
omar
|
c50198debe
|
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542) wip
|
7 years ago |
|
omar
|
8657201257
|
Merge branch 'master' into viewport
|
7 years ago |
|
omar
|
0e3a6ef4f7
|
Moved IM_NEW, IM_DELETE helpers to imgui.h for convenient use by back-ends and user code.
|
7 years ago |
|
omar
|
7b833dabc8
|
ImVector: Spacing, assert tweaks
|
7 years ago |
|
omar
|
26296bb4c1
|
Misc: Fix 111ea7af77, GetStyleColorName() would assert, removed removed ImGuiCol defines (too much risk/complexity trying to silently ignore it).
|
7 years ago |
|
omar
|
b88492746e
|
Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. (#1542, #1042)
|
7 years ago |
|
omar
|
f6fc28dfd2
|
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
|
7 years ago |
|
omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
7 years ago |
|
omar
|
e7670c0bcc
|
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707)
|
7 years ago |
|
omar
|
5e63711084
|
Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. (#1542, #1676)
|
7 years ago |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
7 years ago |
|
omar
|
64cbbed152
|
Merge branch 'master' into viewport
|
7 years ago |
|
omar
|
43f375b2f2
|
Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. (#1542)
|
7 years ago |
|
omar
|
1eb89d7e3b
|
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
|
7 years ago |
|
omar
|
4d46383100
|
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). (#1542)
|
7 years ago |
|
omar
|
a3d5f92214
|
Merge branch 'master' into font_offset
|
7 years ago |
|
omar
|
1ef1acbd8d
|
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
|
7 years ago |
|
omar
|
3dfac93ebe
|
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
|
7 years ago |
|
omar
|
642c6748ac
|
Comments, Changelog
|
7 years ago |
|
omar
|
a1f3949d71
|
Drag and Drop: Increased payload data type to 32 characters. (#143)
|
7 years ago |
|
omar
|
9dcc07422e
|
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)
|
7 years ago |
|
omar
|
3637193556
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
|
7 years ago |
|
omar
|
8e3274e137
|
Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). (#1542)
|
7 years ago |
|
omar
|
0ec356eb6e
|
Comments, FAQ update.
|
7 years ago |
|
omar
|
c4a158656e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
7 years ago |
|
omar
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
7 years ago |
|
omar
|
1549c5cf5e
|
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
|
7 years ago |
|
omar
|
e9fa17e1bf
|
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)
|
7 years ago |
|
omar
|
df8a9c49eb
|
Allow user to override ImTextureId. (#1641)
|
7 years ago |
|
omar
|
6797ee4b68
|
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. (#787)
|
7 years ago |
|
omar
|
b3594a6407
|
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
|
7 years ago |
|
omar
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
7 years ago |
|
omar
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
7 years ago |
|
omar
|
735267d27c
|
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542)
|
7 years ago |
|
omar
|
b32bb4e6e3
|
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
|
7 years ago |
|
omar
|
3f335b0d42
|
Merge branch 'master' into examples_refactor
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
|
7 years ago |
|
omar
|
27667fc035
|
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. (#1079)
|
7 years ago |
|
omar
|
e6bc840f6f
|
Merge branch 'master' into examples_refactor
|
7 years ago |
|
omar
|
79969931e6
|
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
|
7 years ago |
|
omar
|
91cadc1130
|
Merge branch 'master' into examples_refactor
|
7 years ago |
|
omar
|
2c3c5125b3
|
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. (#143, #1637)
|
7 years ago |
|
omar
|
45cbebad64
|
Added dummy io.DisplayPos field.
|
7 years ago |
|
omar
|
8d0723c2c3
|
ImFontAtlas: Added IsBuilt() helper.
|
7 years ago |
|
omar
|
1399c9c8a9
|
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
|
7 years ago |
|
omar
|
7c75835200
|
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626)
|
7 years ago |
|
omar
|
63332d152a
|
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..(#1599)
Examples: Updated examples.
|
7 years ago |
|
omar
|
30c469f7c5
|
ImFont: DisplayOffset.y defaults to 0 instead of +1.
|
7 years ago |
|
omar
|
024e23c4d7
|
Comments, moved ImFontAtlas::Flags to "public" area.
|
7 years ago |
|
omar
|
fed0a884f7
|
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. (#1613)
|
7 years ago |
|
omar
|
9263bd68db
|
Fixed legacy forward function IsRootWindowOrAnyChildHovered() broken by a63fbbca8b
|
7 years ago |
|
omar
|
7cc1bc7635
|
Added IsAnyMouseDown() helper.
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
|
7 years ago |
|
omar
|
88dcbeb7ff
|
Styles: Comments and re-ordered.
|
7 years ago |
|
omar
|
8099f8c270
|
Comments
|
7 years ago |
|
omar
|
7c16d52f72
|
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)
|
7 years ago |
|
omar
|
f0364aa359
|
Merge branch 'context'
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
|
7 years ago |
|
omar
|
4e5b7612ae
|
Nav: Documentation tweaks. (#787)
|
7 years ago |
|
omar
|
3171f90a1a
|
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. (#787)
|
7 years ago |
|
omar
|
9e3a807813
|
Removed comments
|
7 years ago |
|
omar
|
057807f4a7
|
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. (#787)
|
7 years ago |
|
omar
|
7e32fc7109
|
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). (#787)
|
7 years ago |
|
omar
|
ed4bbc4fd4
|
Nav: Comments, guides.
|
7 years ago |
|
omar
|
cea8017e0b
|
Merge branch 'master' into context
|
7 years ago |
|
omar
|
3b7bd4563a
|
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
|
7 years ago |
|
omar
|
ad09396672
|
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
|
7 years ago |
|
omar
|
92ee6b1185
|
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. (#787)
|
7 years ago |
|
omar
|
5c83b55d04
|
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. (#787)
|
7 years ago |
|
omar
|
8ad88f725c
|
Nav: Minor tidying up. (#787)
|
7 years ago |
|
omar
|
0bd15b52a6
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
147ec8d1e2
|
Style Added style.MouseCursorScale, may remove (#939).
|
7 years ago |
|
omar
|
ce9d7baaba
|
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. (#787, #1079)
|
7 years ago |
|
omar
|
27980d9688
|
Merge branch 'master' into context
|
7 years ago |
|
omar
|
23c11e9764
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
dd41a1650a
|
Comments
|
7 years ago |