Skip to content

Commit 0fb119e

Browse files
committed
Merge tag 'v1.92.8-docking'
2 parents 9298ba3 + b61e563 commit 0fb119e

185 files changed

Lines changed: 33085 additions & 13417 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/issue_template.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
FOR FIRST-TIME USERS ISSUES COMPILING/LINKING/RUNNING or LOADING FONTS, please use [GitHub Discussions](https://github.com/ocornut/imgui/discussions)
8-
For anything else: we are happy to use 'GitHub Issues' for many types of open-ended questions. We are encouraging 'Issues' becoming a large, centralized and cross-referenced database of Dear ImGui contents.
7+
FOR FIRST-TIME USERS ISSUES COMPILING/LINKING/RUNNING, please use [GitHub Discussions](https://github.com/ocornut/imgui/discussions)
8+
For anything else: **we are happy to use 'GitHub Issues' for many types of open-ended questions**. We are encouraging 'Issues' becoming a large, centralized, tagged, cross-referenced database of Dear ImGui contents.
99
1010
Be mindful that messages are being sent to the e-mail box of "Watching" users. Try to proof-read your messages before sending them. Edits are not seen by those users.
11+
12+
**If you are using Dear ImGui as part of a job that you are being well-paid for** and your company is not a sponsor. Please be mindful that this is a Free Software and you might be about to ask volunteers to help you doing your job. Please put extra effort describing your issue or question properly. If your company is wealthy, please read [Funding](https://github.com/ocornut/imgui/wiki/Funding) and consider getting in touch.
1113
- type: markdown
1214
attributes:
1315
value: |

.github/pull_request_template.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,9 @@
22

33
1. PLEASE CAREFULLY READ: [Contributing Guidelines](https://github.com/ocornut/imgui/blob/master/docs/CONTRIBUTING.md)
44

5-
2. Clear this template before submitting your PR.
5+
2. **Make sure you're using a special branch just for this pull request**. (In git, 1 PR = 1 branch. If you update the branch the PR will be updated.)
6+
7+
3. Consider running the [imgui_test_suite](https://github.com/ocornut/imgui_test_engine) or adding new tests to test for expected behaviors.
8+
9+
4. Clear this template before submitting your PR.
610

.github/workflows/build.yml

Lines changed: 293 additions & 67 deletions
Large diffs are not rendered by default.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This is current meant to be run manually, occasionally:
2+
# - Run then zip the contents of vulkanArtifact/ into e.g. vulkan_windows_libs_1.4.326
3+
# - Upload as an attachment to https://github.com/ocornut/imgui/pull/8925 then change filename in build.yml
4+
# - There is a build_windows_vulkan_libs.yml in commit history that we removed thinking this is run so rarely we don't need to pollute CI UI with it.
5+
6+
# Set default vulkan version if none provided
7+
if (-not $env:VULKAN_TAG) { $env:VULKAN_TAG = "1.4.326" }
8+
9+
# Create output folder
10+
mkdir vulkanArtifact
11+
12+
# Download Vulkan Headers
13+
14+
Invoke-WebRequest -Uri "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$($env:VULKAN_TAG).zip" -OutFile Vulkan-Headers-$($env:VULKAN_TAG).zip
15+
Expand-Archive -Path Vulkan-Headers-$($env:VULKAN_TAG).zip
16+
17+
# Copy Vulkan Headers to artifact folder
18+
19+
cp -R Vulkan-Headers-$($env:VULKAN_TAG)\Vulkan-Headers-$($env:VULKAN_TAG)\include vulkanArtifact\Include
20+
21+
# Download Vulkan Loader
22+
23+
Invoke-WebRequest -Uri "https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$($env:VULKAN_TAG).zip" -OutFile Vulkan-Loader-$($env:VULKAN_TAG).zip
24+
Expand-Archive -Path Vulkan-Loader-$($env:VULKAN_TAG).zip
25+
26+
# Build Vulkan Loader x64
27+
28+
cmake -S Vulkan-Loader-$($env:VULKAN_TAG)\Vulkan-Loader-$($env:VULKAN_TAG) -B VulkanLoader-build64 -D UPDATE_DEPS=On -A x64
29+
cmake --build VulkanLoader-build64
30+
mkdir vulkanArtifact\Lib
31+
copy VulkanLoader-build64\loader\Debug\vulkan-1.lib vulkanArtifact\Lib
32+
33+
# Build Vulkan Loader win32
34+
35+
cmake -S Vulkan-Loader-$($env:VULKAN_TAG)\Vulkan-Loader-$($env:VULKAN_TAG) -B VulkanLoader-build32 -D UPDATE_DEPS=On -A Win32
36+
cmake --build VulkanLoader-build32
37+
mkdir vulkanArtifact\Lib32
38+
copy VulkanLoader-build32\loader\Debug\vulkan-1.lib vulkanArtifact\Lib32

.github/workflows/static-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ on:
1010

1111
jobs:
1212
PVS-Studio:
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v6
1616
with:
1717
fetch-depth: 1
1818

.gitignore

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
## OSX artifacts
1+
## Misc artifacts
22
.DS_Store
3+
.claude
4+
.vscode
35

46
## Dear ImGui artifacts
57
imgui.ini
@@ -12,6 +14,7 @@ imgui*.ini
1214
examples/*/Debug/*
1315
examples/*/Release/*
1416
examples/*/x64/*
17+
examples/*.tmp
1518

1619
## Visual Studio artifacts
1720
.vs
@@ -29,12 +32,14 @@ ipch
2932
## Getting files created in JSON/Schemas/Catalog/ from a VS2022 update
3033
JSON/
3134

32-
## Commonly used CMake directories
35+
## Commonly used CMake directories & CMake CPM cache
3336
build*/
37+
.cache
3438

35-
## Xcode artifacts
39+
## Xcode & macOS artifacts
3640
project.xcworkspace
3741
xcuserdata
42+
examples/*/*.dSYM
3843

3944
## Emscripten artifacts
4045
examples/*.o.tmp
@@ -44,18 +49,30 @@ examples/example_glfw_opengl3/web/*
4449
examples/example_glfw_wgpu/web/*
4550
examples/example_glfw_wgpu/external/*
4651
examples/example_sdl2_opengl3/web/*
52+
examples/example_sdl2_wgpu/web/*
53+
examples/example_sdl3_opengl3/web/*
54+
examples/example_sdl3_wgpu/web/*
4755

4856
## JetBrains IDE artifacts
4957
.idea
5058
cmake-build-*
5159

5260
## Unix executables from our example Makefiles
61+
examples/example_apple_metal/example_apple_metal
62+
examples/example_apple_opengl2/example_apple_opengl2
5363
examples/example_glfw_metal/example_glfw_metal
5464
examples/example_glfw_opengl2/example_glfw_opengl2
5565
examples/example_glfw_opengl3/example_glfw_opengl3
66+
examples/example_glfw_vulkan/example_glfw_vulkan
5667
examples/example_glut_opengl2/example_glut_opengl2
5768
examples/example_null/example_null
5869
examples/example_sdl2_metal/example_sdl2_metal
5970
examples/example_sdl2_opengl2/example_sdl2_opengl2
6071
examples/example_sdl2_opengl3/example_sdl2_opengl3
61-
examples/example_sdl2_sdlrenderer/example_sdl2_sdlrenderer
72+
examples/example_sdl2_sdlrenderer2/example_sdl2_sdlrenderer2
73+
examples/example_sdl2_vulkan/example_sdl2_vulkan
74+
examples/example_sdl3_metal/example_sdl3_metal
75+
examples/example_sdl3_opengl3/example_sdl3_opengl3
76+
examples/example_sdl3_sdlgpu3/example_sdl3_sdlgpu3
77+
examples/example_sdl3_sdlrenderer3/example_sdl3_sdlrenderer3
78+
examples/example_sdl3_vulkan/example_sdl3_vulkan

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2024 Omar Cornut
3+
Copyright (c) 2014-2026 Omar Cornut
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)