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
|
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 |