ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

feat(cmake): update ImGui to latest release (#2621)

Browse Source
This commit is contained in:
Andreas Maerten 2023-12-21 16:01:47 +01:00 committed by GitHub
parent 3237f6ade4
commit 5324d0a244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/imgui.cmake
View File

@ -2,7 +2,7 @@ include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
imgui imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG 94c46d74869ec991c101c187088da0f25d6c8e40 GIT_TAG v1.90
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
) )
message("ImGui") message("ImGui")

7
src/lua/bindings/imgui.hpp
View File

@ -231,10 +231,6 @@ namespace lua::imgui
const auto vec2{ImGui::GetWindowContentRegionMax()}; const auto vec2{ImGui::GetWindowContentRegionMax()};
return std::make_tuple(vec2.x, vec2.y); return std::make_tuple(vec2.x, vec2.y);
} }
inline float GetWindowContentRegionWidth()
{
return ImGui::GetWindowContentRegionWidth();
}
// Windows Scrolling // Windows Scrolling
inline float GetScrollX() inline float GetScrollX()
@ -3242,7 +3238,7 @@ namespace lua::imgui
#pragma endregion MouseButton #pragma endregion MouseButton
#pragma region ImDrawCorner Flags #pragma region ImDrawCorner Flags
luaGlobals.new_enum("ImDrawCornerFlags", "None", ImDrawCornerFlags_None, "TopLeft", ImDrawCornerFlags_TopLeft, "TopRight", ImDrawCornerFlags_TopRight, "BotLeft", ImDrawCornerFlags_BotLeft, "BotRight", ImDrawCornerFlags_BotRight, "Top", ImDrawCornerFlags_Top, "Bot", ImDrawCornerFlags_Bot, "Left", ImDrawCornerFlags_Left, "Right", ImDrawCornerFlags_Right, "All", ImDrawCornerFlags_All); luaGlobals.new_enum("ImDrawCornerFlags", "None", ImDrawFlags_RoundCornersNone, "TopLeft", ImDrawFlags_RoundCornersTopLeft, "TopRight", ImDrawFlags_RoundCornersTopRight, "BotLeft", ImDrawFlags_RoundCornersBottomLeft, "BotRight", ImDrawFlags_RoundCornersBottomRight, "Top", ImDrawFlags_RoundCornersTop, "Bot", ImDrawFlags_RoundCornersBottom, "Left", ImDrawFlags_RoundCornersLeft, "Right", ImDrawFlags_RoundCornersRight, "All", ImDrawFlags_RoundCornersAll);
#pragma endregion ImDrawCorner Flags #pragma endregion ImDrawCorner Flags
} }
@ -3294,7 +3290,6 @@ namespace lua::imgui
ImGui.set_function("GetContentRegionAvail", GetContentRegionAvail); ImGui.set_function("GetContentRegionAvail", GetContentRegionAvail);
ImGui.set_function("GetWindowContentRegionMin", GetWindowContentRegionMin); ImGui.set_function("GetWindowContentRegionMin", GetWindowContentRegionMin);
ImGui.set_function("GetWindowContentRegionMax", GetWindowContentRegionMax); ImGui.set_function("GetWindowContentRegionMax", GetWindowContentRegionMax);
ImGui.set_function("GetWindowContentRegionWidth", GetWindowContentRegionWidth);
#pragma endregion Content Region #pragma endregion Content Region
#pragma region Windows Scrolling #pragma region Windows Scrolling

3
src/widgets/imgui_hotkey.hpp
View File

@ -31,8 +31,7 @@ namespace ImGui
//const bool focus_requested = ImGui::FocusableItemRegister(window, g.ActiveId == id, false); //const bool focus_requested = ImGui::FocusableItemRegister(window, g.ActiveId == id, false);
//const bool focus_requested_by_code = focus_requested && (window->FocusIdxAllCounter == window->FocusIdxAllRequestCurrent); //const bool focus_requested_by_code = focus_requested && (window->FocusIdxAllCounter == window->FocusIdxAllRequestCurrent);
const bool hovered = ImGui::ItemHoverable(frame_bb, id); const bool hovered = ImGui::ItemHoverable(frame_bb, id, ImGuiItemFlags_None);
if (hovered) if (hovered)
{ {
ImGui::SetHoveredID(id); ImGui::SetHoveredID(id);