Skip to content

ImGui: Added ImGuiDiligentFileIO to route file operations through Dil… #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MikhailGorobets wants to merge 2 commits into
base: master
Choose a base branch
from
+418 −481
Open

ImGui: Added ImGuiDiligentFileIO to route file operations through Dil… #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58d1002
MacOS app: Customize window appearance and maximize on API selection
MikhailGorobets Feb 27, 2026
d8fd78d
ImGui: Make MacOS backend self-contained and match Web mouse cursors
MikhailGorobets Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Imgui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,8 @@ else()
if(PLATFORM_WIN32)
list(APPEND DEAR_IMGUI_SOURCE ${DILIGENT_DEAR_IMGUI_PATH}/backends/imgui_impl_win32.cpp)
list(APPEND DEAR_IMGUI_INCLUDE ${DILIGENT_DEAR_IMGUI_PATH}/backends/imgui_impl_win32.h)
elseif(PLATFORM_MACOS)
set(DEAR_IMGUI_V185_SOURCE
../ThirdParty/imgui_v1.85/imgui_impl_osx_v1.85.mm
../ThirdParty/imgui_v1.85/imgui_impl_osx_v1.85.h
)
target_sources(Diligent-Imgui PRIVATE ${DEAR_IMGUI_V185_SOURCE})
source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/imgui_v1.85 PREFIX "dear_imgui_v1.85" FILES ${DEAR_IMGUI_V185_SOURCE})
endif()
# MacOS uses the self-contained ImGuiImplMacOS.mm (no dear imgui platform backend).

target_sources(Diligent-Imgui PRIVATE
${DEAR_IMGUI_SOURCE}
Expand Down
22 changes: 21 additions & 1 deletion Imgui/interface/ImGuiImplMacOS.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@

#pragma once

#include <atomic>
#include <chrono>
#include <mutex>
#include <vector>

#include "imgui.h"
#include "ImGuiImplDiligent.hpp"

@class NSEvent;
@class NSView;
@class NSCursor;

namespace Diligent
{
Expand All @@ -58,7 +64,21 @@ class ImGuiImplMacOS final : public ImGuiImplDiligent
bool HandleOSXEvent(NSEvent* _Nonnull event, NSView* _Nonnull view);

private:
std::mutex m_Mtx;
void InitMouseCursors();
void UpdateMouseCursor();

// clang-format off
NSCursor* _Nullable m_MouseCursors[ImGuiMouseCursor_COUNT] = {};

int32_t m_LastMouseCursor = ImGuiMouseCursor_Arrow;
id _Nullable m_FocusObserver = nullptr;
std::atomic<bool> m_AppActive = true;
std::atomic<bool> m_FocusDirty = false;

std::vector<ImGuiKey> m_KeysPressedWithCmd;
std::chrono::high_resolution_clock::time_point m_LastTime = {};
std::mutex m_Mtx;
// clang-format on
};

} // namespace Diligent
Loading
Loading