omar
|
5fdde52444
|
Merge branch '2018-03-font_offset' into master2
|
2018-03-09 10:29:22 +01:00 |
|
omar
|
1eb89d7e3b
|
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
|
2018-03-08 20:32:34 +01:00 |
|
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)
|
2018-03-08 20:27:01 +01:00 |
|
omar
|
aa3fe81c87
|
Examples: DPI: Hacked in a quick compile-and-run-everywhere call to SetProcessDpiAwareness(), will need to revisit.
|
2018-03-08 18:46:30 +01:00 |
|
omar
|
a3d5f92214
|
Merge branch 'master' into font_offset
|
2018-03-08 16:49:39 +01:00 |
|
omar
|
1ef1acbd8d
|
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
|
2018-03-08 16:47:41 +01:00 |
|
omar
|
3dfac93ebe
|
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
|
2018-03-08 15:58:56 +01:00 |
|
omar
|
642c6748ac
|
Comments, Changelog
|
2018-03-08 11:15:27 +01:00 |
|
omar
|
a1f3949d71
|
Drag and Drop: Increased payload data type to 32 characters. (#143)
|
2018-03-08 10:42:51 +01:00 |
|
omar
|
9ea16e344a
|
Viewport: Disable extra viewports from hosting other windows. (#1542)
|
2018-03-07 16:34:18 +01:00 |
|
omar
|
d8719cf59b
|
Fixed warnings.
|
2018-03-07 14:46:53 +01:00 |
|
omar
|
9dcc07422e
|
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)
|
2018-03-07 12:35:26 +01:00 |
|
omar
|
52c78820aa
|
Examples: SDL: Fix for pre 2.0.4.
|
2018-03-07 12:19:19 +01:00 |
|
omar
|
19b92751b9
|
Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.
|
2018-03-07 12:05:47 +01:00 |
|
omar
|
f318f2d5ea
|
Examples: Added Makefile for SDL+OpenGL2 example. (#1668)
|
2018-03-07 11:51:41 +01:00 |
|
omar
|
7fd62baa42
|
Examples: Added Makefile for SDL+OpenGL2 example. (#1668)
|
2018-03-07 11:50:56 +01:00 |
|
omar
|
21ff03978a
|
Viewport: Modal display their darkneing/whitening layer over all viewports. (#1542)
|
2018-03-07 11:36:37 +01:00 |
|
omar
|
25fd9d6132
|
Viewport: Various sanity fixes. Popup always inherit viewport from their parent for now. (#1542)
|
2018-03-07 10:50:30 +01:00 |
|
omar
|
6190d794d4
|
Update README.md
|
2018-03-07 10:01:20 +01:00 |
|
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
|
2018-03-06 20:02:40 +01:00 |
|
omar
|
a2ed3ee2cf
|
Examples: OpenGL3: Added a way to override the glsl version number through the Init call. (#1667, #1466)
|
2018-03-06 19:48:30 +01:00 |
|
omar
|
cea7492bab
|
Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done).
|
2018-03-05 22:47:53 +01:00 |
|
omar
|
8e3274e137
|
Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). (#1542)
|
2018-03-05 22:31:12 +01:00 |
|
omar
|
945f4d1ecd
|
Removed redundant semi colons. (#1653)
|
2018-03-05 16:16:27 +01:00 |
|
omar
|
51afaf7117
|
Fixed type cast warning.
|
2018-03-05 13:15:15 +01:00 |
|
omar
|
0ec356eb6e
|
Comments, FAQ update.
|
2018-03-05 13:05:47 +01:00 |
|
omar
|
5ed45d0aec
|
Columns: Fixed destructive small resize. (#1656). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0).
|
2018-03-04 17:55:59 +01:00 |
|
omar
|
bf7481eba0
|
Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. (#125). +9 Internal: Store InnerClipRect.
|
2018-03-04 17:44:17 +01:00 |
|
omar
|
968a8d2a3f
|
Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. (#125)
|
2018-03-04 16:58:24 +01:00 |
|
omar
|
ee770af72c
|
Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. (#125, #1499, #1656)
|
2018-03-04 16:56:21 +01:00 |
|
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
|
2018-03-03 23:13:31 +01:00 |
|
omar
|
e026c8d3b7
|
Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. (#1542)
|
2018-03-03 22:53:31 +01:00 |
|
omar
|
cab41d954e
|
Examples: Vulkan: Further refactor.
|
2018-03-03 22:38:24 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
2018-03-03 20:08:03 +01:00 |
|
omar
|
1549c5cf5e
|
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
|
2018-03-03 19:43:31 +01:00 |
|
omar
|
ad7ff7504e
|
Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1
|
2018-03-03 19:34:47 +01:00 |
|
omar
|
839cdd37a3
|
Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding.
|
2018-03-03 19:23:48 +01:00 |
|
omar
|
11f13ab24f
|
Internal: renamed RenderTriangle() to RenderArrow().
|
2018-03-03 19:08:22 +01:00 |
|
omar
|
e0cbfd74d7
|
Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h
|
2018-03-02 23:59:21 +01:00 |
|
omar
|
426930e028
|
Examples: Vulkan: Moved main.cpp data structures to imgui_impl_vulkan.h as shared helpers for the benefit of both the example and the platform/viewport renderer interface.
|
2018-03-02 23:05:23 +01:00 |
|
omar
|
e9fa17e1bf
|
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)
|
2018-03-02 22:44:06 +01:00 |
|
omar
|
b807347e94
|
Viewport: When enabled we assert against using RenderDrawListFn to make user more aware of rendering order. (#1542)
|
2018-03-02 22:22:14 +01:00 |
|
omar
|
7113fc7dee
|
Examples: Vulkan: Moved variables into per-window data, refactored/tweaks to that the bug functions main.cpp for both SDL and GLFW examples match (they'll probably be moved to imgui_impl_vulkan as helpers).
|
2018-03-02 21:37:14 +01:00 |
|
omar
|
e0f283cfcb
|
Examples: Vulkan: Fix 7b968b098e
|
2018-03-02 20:09:21 +01:00 |
|
omar
|
7b968b098e
|
Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend 201d589714 by @ParticlePeter
|
2018-03-02 20:01:18 +01:00 |
|
omar
|
e927a6ac4a
|
Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer().
|
2018-03-02 19:40:09 +01:00 |
|
omar
|
9da475e4e8
|
Examples: GLFW, Vulkan: GLFW binding viewport tweaks to supports Vulkan better (do not call SwapBuffer, share context etc.). Added DUMMY (empty) platform/viewport interface in the viewport code.
|
2018-03-02 19:24:24 +01:00 |
|
omar
|
5b282bdd48
|
Examples: Renamed glfw error callback so it's more clear what it is.
|
2018-03-02 19:24:23 +01:00 |
|
omar
|
fc80f2b41a
|
Merge branch 'examples_refactor' into viewport
# Conflicts:
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.h
|
2018-03-01 23:27:11 +01:00 |
|