Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
aiekick committed Aug 18, 2024
1 parent d366f03 commit 9221b8a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/imgui
Submodule imgui updated 48 files
+1 −0 backends/imgui_impl_allegro5.h
+1 −0 backends/imgui_impl_android.h
+1 −0 backends/imgui_impl_dx10.h
+1 −0 backends/imgui_impl_dx11.h
+2 −0 backends/imgui_impl_dx12.h
+1 −0 backends/imgui_impl_dx9.h
+14 −0 backends/imgui_impl_glfw.cpp
+4 −0 backends/imgui_impl_glfw.h
+1 −0 backends/imgui_impl_glut.h
+2 −0 backends/imgui_impl_metal.h
+1 −0 backends/imgui_impl_opengl2.h
+1 −0 backends/imgui_impl_opengl3.cpp
+1 −1 backends/imgui_impl_opengl3.h
+2 −0 backends/imgui_impl_osx.h
+1 −0 backends/imgui_impl_sdl2.h
+1 −0 backends/imgui_impl_sdl3.h
+1 −0 backends/imgui_impl_sdlrenderer2.h
+1 −0 backends/imgui_impl_sdlrenderer3.h
+6 −2 backends/imgui_impl_vulkan.cpp
+1 −1 backends/imgui_impl_vulkan.h
+1 −0 backends/imgui_impl_wgpu.h
+1 −0 backends/imgui_impl_win32.h
+19 −19 docs/BACKENDS.md
+100 −46 docs/CHANGELOG.txt
+6 −39 docs/EXAMPLES.md
+3 −3 docs/README.md
+1 −1 examples/example_android_opengl3/android/app/src/main/AndroidManifest.xml
+5 −0 examples/example_glfw_opengl2/main.cpp
+5 −0 examples/example_glfw_opengl3/main.cpp
+5 −0 examples/example_glfw_vulkan/main.cpp
+5 −0 examples/example_glfw_wgpu/main.cpp
+5 −0 examples/example_sdl2_directx11/main.cpp
+5 −0 examples/example_sdl2_opengl2/main.cpp
+5 −0 examples/example_sdl2_opengl3/main.cpp
+5 −0 examples/example_sdl2_sdlrenderer2/main.cpp
+5 −0 examples/example_sdl2_vulkan/main.cpp
+3 −3 examples/example_sdl3_opengl3/README.md
+5 −0 examples/example_sdl3_opengl3/main.cpp
+8 −0 examples/example_sdl3_sdlrenderer3/main.cpp
+5 −0 examples/example_win32_opengl3/main.cpp
+4 −3 examples/libs/emscripten/emscripten_mainloop_stub.h
+90 −81 imgui.cpp
+33 −30 imgui.h
+279 −59 imgui_demo.cpp
+1 −1 imgui_draw.cpp
+29 −22 imgui_internal.h
+25 −22 imgui_tables.cpp
+162 −120 imgui_widgets.cpp
6 changes: 3 additions & 3 deletions 3rdparty/imwidgets/ImWidgets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ bool RadioButtonLabeled(float vWidth, const char* label, bool active, bool disab
float w = vWidth;
const ImGuiID id = window->GetID(label);
const ImVec2 label_size = CalcTextSize(label, nullptr, true);
if (w < 0.0f) w = GetContentRegionMaxAbs().x - window->DC.CursorPos.x;
if (w < 0.0f) w = GetContentRegionAvail().x;
if (IS_FLOAT_EQUAL(w, 0.0f)) w = label_size.x + style.FramePadding.x * 2.0f;
const ImRect total_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, label_size.y + style.FramePadding.y * 2.0f));

Expand Down Expand Up @@ -379,8 +379,8 @@ bool RadioButtonLabeled(ImVec2 vSize, const char* label, bool active, bool disab
float h = vSize.y;
const ImGuiID id = window->GetID(label);
const ImVec2 label_size = CalcTextSize(label, nullptr, true);
if (w < 0.0f) w = GetContentRegionMaxAbs().x - window->DC.CursorPos.x;
if (h < 0.0f) w = GetContentRegionMaxAbs().y - window->DC.CursorPos.y;
if (w < 0.0f) w = GetContentRegionAvail().x;
if (h < 0.0f) w = GetContentRegionAvail().y;
if (IS_FLOAT_EQUAL(w, 0.0f)) w = label_size.x + style.FramePadding.x * 2.0f;
if (IS_FLOAT_EQUAL(h, 0.0f)) h = label_size.y + style.FramePadding.y * 2.0f;
const ImRect total_bb(window->DC.CursorPos, window->DC.CursorPos + ImVec2(w, h));
Expand Down
2 changes: 1 addition & 1 deletion ImGuiFileDialog
3 changes: 1 addition & 2 deletions mainWinLinuxMacos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ int main(int, char**) {
// Setup Dear ImGui context
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO& io = ImGui::GetIO();
(void)io;
ImGuiIO& io = ImGui::GetIO(); (void)io;
// io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
// io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking
Expand Down
Empty file added samples/- jhdksfjhsdf.txt
Empty file.

0 comments on commit 9221b8a

Please sign in to comment.