omar
|
f6fc28dfd2
|
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
|
2018-03-12 17:50:32 +01:00 |
|
omar
|
cdeef65b05
|
Examples: Vulkan: Passing Queue, QueueFamily to binding. Fixed scissor (fixed in master). ImGui_ImplVulkanH_DestroyWindowData() waits for device to be idle. (#1042)
|
2018-03-12 17:37:28 +01:00 |
|
omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
2018-03-12 17:24:15 +01:00 |
|
omar
|
1e81a53e75
|
Examples: DPI: Minor warning fix. (#1676)
|
2018-03-12 16:22:24 +01:00 |
|
omar
|
37cb177745
|
Examples: Vulkan: Only resize swap chain and framebuffer once. (#1042)
|
2018-03-12 14:47:41 +01:00 |
|
omar
|
1c18d65313
|
Examples: Renamed glfw error callback for clarity.
|
2018-03-12 14:43:37 +01:00 |
|
Peter Particle
|
b2453d7e8f
|
Fixed resize window validation errors with removing frame prerender once and present last but one frame functionality. Frame rate is still similar.
|
2018-03-12 14:34:36 +01:00 |
|
omar
|
887712a6f1
|
Updated templates, added pull request template.
|
2018-03-12 14:20:39 +01:00 |
|
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)
|
2018-03-12 11:48:04 +01:00 |
|
omar
|
b9ac127b0b
|
Internals: Columns renaming fields
|
2018-03-12 11:03:27 +01:00 |
|
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)
|
2018-03-12 10:31:39 +01:00 |
|
omar
|
a2fbcc9ad4
|
Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. (#1542, #1676)
|
2018-03-12 10:31:39 +01:00 |
|
omar
|
10030ff3ec
|
Viewport: Fix dropping back viewport not being moved to the front of the window list. (Now that viewport are more tighly coupled to a single root window) (#1542)
|
2018-03-12 10:31:38 +01:00 |
|
omar
|
648735a4cf
|
Viewport, DPI: Don't activate current window until a viewport has been selected. At this point we'll have the proper size/scale for the current DPI + fix viewport callback when appending to an existing window more than once a frame. (#1542, #1676)
|
2018-03-12 10:31:38 +01:00 |
|
omar
|
a4629b0b36
|
Viewport, DPI: Select viewport before locking style sizes and before handling double-click-on-title-bar to collapse. (#1542, #1676)
|
2018-03-12 10:31:38 +01:00 |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
2018-03-10 10:33:12 +01:00 |
|
omar
|
64cbbed152
|
Merge branch 'master' into viewport
|
2018-03-09 10:41:12 +01:00 |
|
omar
|
43f375b2f2
|
Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. (#1542)
|
2018-03-09 10:40:38 +01:00 |
|
omar
|
351b3fa7b0
|
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
|
2018-03-09 10:29:41 +01:00 |
|
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 |
|