Skip to content

Commit

Permalink
fix: merge issues from recent PR sweep
Browse files Browse the repository at this point in the history
  • Loading branch information
hoffstadt committed Jan 6, 2024
1 parent 30aa1aa commit 077b344
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 28 deletions.
6 changes: 3 additions & 3 deletions dearpygui/_dearpygui.pyi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions dearpygui/_dearpygui_RTD.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 10 additions & 11 deletions dearpygui/dearpygui.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions src/mvContainers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -675,20 +675,6 @@ DearPyGui::draw_menu(ImDrawList* drawlist, mvAppItem& item, mvMenuConfig& config

ImGui::EndMenu();
}
else
{
// even if menu popup is not open, we still need to update the state
item.state.lastFrameUpdate = GContext->frame;
item.state.active = ImGui::IsItemActive();
item.state.activated = ImGui::IsItemActivated();
item.state.deactivated = ImGui::IsItemDeactivated();
item.state.prevFocused = item.state.focused;
item.state.focused = false;
item.state.prevHovered = item.state.hovered;
item.state.hovered = false;
item.state.rectSize = { 0.0f, 0.0f };
item.state.contextRegionAvail = { ImGui::GetContentRegionAvail().x, ImGui::GetContentRegionAvail().y };
}
}

//-----------------------------------------------------------------------------
Expand Down

0 comments on commit 077b344

Please sign in to comment.