imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-27 23:37:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Issues with drawing interactive tutorial

Browse Source
This commit is contained in:
WerWolv
2025-11-30 14:07:57 +01:00
parent f3a2fe5b0d
commit cba93e87eb
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libimhex/source/api/tutorial_manager.cpp
View File

@@ -251,6 +251,7 @@ namespace hex {
{
auto highlightColor = ImGuiExt::GetCustomColorVec4(ImGuiCustomCol_Highlight);
highlightColor.w *= ImSin(ImGui::GetTime() * 6.0F) / 4.0F + 0.75F;
ImHexApi::System::unlockFrameRate();
drawList->AddRect(rect.Min - ImVec2(5, 5), rect.Max + ImVec2(5, 5), ImColor(highlightColor), 5.0F, ImDrawFlags_None, 2.0F);
}

3
lib/third_party/imgui/cimgui/include/cimgui.h vendored
View File

@@ -5147,7 +5147,8 @@ CIMGUI_API bool igIsDragDropActive(void);
CIMGUI_API bool igBeginDragDropTargetCustom(const ImRect bb,ImGuiID id);
CIMGUI_API void igClearDragDrop(void);
CIMGUI_API bool igIsDragDropPayloadBeingAccepted(void);
CIMGUI_API void igRenderDragDropTargetRect(const ImRect bb,const ImRect item_clip_rect);
CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList *draw_list, const ImRect bb);
CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect bb);
CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags);
CIMGUI_API int igTypingSelectFindMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);
CIMGUI_API int igTypingSelectFindNextSingleCharMatch(ImGuiTypingSelectRequest* req,int items_count,const char*(*get_item_name_func)(void*,int),void* user_data,int nav_item_idx);

8
lib/third_party/imgui/cimgui/source/cimgui.cpp vendored
View File

@@ -5141,9 +5141,13 @@ CIMGUI_API bool igIsDragDropPayloadBeingAccepted()
{
return ImGui::IsDragDropPayloadBeingAccepted();
}
CIMGUI_API void igRenderDragDropTargetRect(const ImRect bb,const ImRect item_clip_rect)
CIMGUI_API void igRenderDragDropTargetRectEx(ImDrawList *draw_list, const ImRect bb)
{
return ImGui::RenderDragDropTargetRect(bb,item_clip_rect);
return ImGui::RenderDragDropTargetRectEx(draw_list, bb);
}
CIMGUI_API void igRenderDragDropTargetRectForItem(const ImRect bb)
{
return ImGui::RenderDragDropTargetRectForItem(bb);
}
CIMGUI_API ImGuiTypingSelectRequest* igGetTypingSelectRequest(ImGuiTypingSelectFlags flags)
{

4
main/gui/source/window/window.cpp
View File

@@ -416,8 +416,6 @@ namespace hex {
// Run all deferred calls
TaskManager::runDeferredCalls();
TutorialManager::drawTutorial();
EventFrameBegin::post();
// Handle all undocked floating windows
@@ -621,6 +619,8 @@ namespace hex {
}
}
TutorialManager::drawTutorial();
// Draw Toasts
{
u32 index = 0;

4
plugins/builtin/source/content/tutorials/introduction.cpp
View File

@@ -32,7 +32,7 @@ namespace hex::plugin::builtin {
)
.addHighlight("hex.builtin.tutorial.introduction.step2.highlight",
{
"Welcome Screen/Start##SubWindow_69AA6996",
"Welcome Screen/Start_087A287D",
Lang("hex.builtin.welcome.start.create_file")
})
.onAppear([&step] {
@@ -85,7 +85,7 @@ namespace hex::plugin::builtin {
step.addHighlight("hex.builtin.tutorial.introduction.step6.highlight", {
"##MainMenuBar",
"##menubar",
"##MenuBar",
Lang("hex.builtin.menu.help")
})
.addHighlight({