|
|
f6fc28dfd2
|
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
|
2018-03-12 17:50:32 +01:00 |
|
|
|
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 |
|
|
|
b9ac127b0b
|
Internals: Columns renaming fields
|
2018-03-12 11:03:27 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
64cbbed152
|
Merge branch 'master' into viewport
|
2018-03-09 10:41:12 +01:00 |
|
|
|
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 |
|
|
|
351b3fa7b0
|
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
|
2018-03-09 10:29:41 +01:00 |
|
|
|
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 |
|
|
|
a3d5f92214
|
Merge branch 'master' into font_offset
|
2018-03-08 16:49:39 +01:00 |
|
|
|
642c6748ac
|
Comments, Changelog
|
2018-03-08 11:15:27 +01:00 |
|
|
|
9ea16e344a
|
Viewport: Disable extra viewports from hosting other windows. (#1542)
|
2018-03-07 16:34:18 +01:00 |
|
|
|
d8719cf59b
|
Fixed warnings.
|
2018-03-07 14:46:53 +01:00 |
|
|
|
9dcc07422e
|
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. (#1542)
|
2018-03-07 12:35:26 +01:00 |
|
|
|
21ff03978a
|
Viewport: Modal display their darkneing/whitening layer over all viewports. (#1542)
|
2018-03-07 11:36:37 +01:00 |
|
|
|
25fd9d6132
|
Viewport: Various sanity fixes. Popup always inherit viewport from their parent for now. (#1542)
|
2018-03-07 10:50:30 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
51afaf7117
|
Fixed type cast warning.
|
2018-03-05 13:15:15 +01:00 |
|
|
|
0ec356eb6e
|
Comments, FAQ update.
|
2018-03-05 13:05:47 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
|
|
8a4093f38b
|
Added ArrowButton(). Exposed ImGuiDir.
|
2018-03-03 20:08:03 +01:00 |
|
|
|
1549c5cf5e
|
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
|
2018-03-03 19:43:31 +01:00 |
|
|
|
ad7ff7504e
|
Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1
|
2018-03-03 19:34:47 +01:00 |
|
|
|
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 |
|
|
|
11f13ab24f
|
Internal: renamed RenderTriangle() to RenderArrow().
|
2018-03-03 19:08:22 +01:00 |
|
|
|
e9fa17e1bf
|
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). (#1542)
|
2018-03-02 22:44:06 +01:00 |
|
|
|
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 |
|
|
|
00b9e70ba2
|
Viewport: Always be lenient with invalid mouse position during dragging, since they are provided by back-end and technically acceptable inputs + comments. (#1542)
|
2018-03-01 20:19:36 +01:00 |
|
|
|
6797ee4b68
|
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. (#787)
|
2018-03-01 13:03:12 +01:00 |
|
|
|
c994796e26
|
Internal: Moved IM_NEWLINE helper to imgui_internal.h
|
2018-02-28 21:45:02 +01:00 |
|
|
|
d98a5d54aa
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 19:03:39 +01:00 |
|
|
|
2c9f45bbe7
|
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. (#787)
|
2018-02-28 18:51:40 +01:00 |
|
|
|
735267d27c
|
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) (#1542)
|
2018-02-27 23:25:39 +01:00 |
|
|
|
b5ced477f4
|
Metrics: Added option to show begin order, useful for debugging.
|
2018-02-27 23:02:50 +01:00 |
|
|
|
67319a71e5
|
Internal: Minor renaming.
|
2018-02-27 22:58:27 +01:00 |
|
|
|
184a6f1198
|
Internals: Moving window: test mouse validity while translating window + using SetWindowPos().
|
2018-02-27 22:56:22 +01:00 |
|
|
|
b32bb4e6e3
|
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
|
2018-02-27 22:55:18 +01:00 |
|
|
|
0e62b7d68a
|
Clearing next window data at the end of Begin() more reliably. Misc comments.
|
2018-02-27 22:47:45 +01:00 |
|
|
|
a761779b12
|
Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.
|
2018-02-27 22:32:45 +01:00 |
|
