scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 10:35:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated imgui.

Browse source
This commit is contained in:
Branimir Karadžić 2015-05-27 16:09:15 -07:00
parent 5b688c5824
commit b5ea61856c
2 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
3rdparty/ocornut-imgui/imgui.cpp vendored
View file

@ -2986,10 +2986,14 @@ bool ImGui::IsItemActive()
return false;
}
bool ImGui::IsAnyItemHovered()
{
return GImGui->HoveredId != 0 || GImGui->HoveredIdPreviousFrame != 0;
}
bool ImGui::IsAnyItemActive()
{
ImGuiState& g = *GImGui;
return g.ActiveId != 0;
return GImGui->ActiveId != 0;
}
bool ImGui::IsItemVisible()
@ -3129,7 +3133,7 @@ static void ClearSetNextWindowData()
static bool BeginPopupEx(const char* str_id, ImGuiWindowFlags extra_flags)
{
ImGuiState& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow();
ImGuiWindow* window = g.CurrentWindow;
const ImGuiID id = window->GetID(str_id);
if (!IsPopupOpen(id))
{
@ -3169,6 +3173,21 @@ void ImGui::EndPopup()
ImGui::PopStyleVar();
}
bool ImGui::BeginPopupContextItem(const char* str_id, int button)
{
if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(button))
ImGui::OpenPopup(str_id);
return ImGui::BeginPopup(str_id);
}
bool ImGui::BeginPopupContextWindow(const char* str_id, bool void_only, int button)
{
if (ImGui::IsMouseHoveringWindow() && ImGui::IsMouseClicked(button))
if (!void_only || !ImGui::IsAnyItemHovered())
ImGui::OpenPopup(str_id);
return ImGui::BeginPopup(str_id);
}
bool ImGui::BeginChild(const char* str_id, const ImVec2& size_arg, bool border, ImGuiWindowFlags extra_flags)
{
ImGuiState& g = *GImGui;
@ -3576,7 +3595,7 @@ bool ImGui::Begin(const char* name, bool* p_opened, const ImVec2& size_on_first_
}
// Minimum window size
if (!(flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_Tooltip)))
if (!(flags & (ImGuiWindowFlags_ChildWindow | ImGuiWindowFlags_Popup | ImGuiWindowFlags_ChildMenu | ImGuiWindowFlags_Tooltip)))
{
window->SizeFull = ImMax(window->SizeFull, style.WindowMinSize);
if (!window->Collapsed)
@ -5452,20 +5471,17 @@ void ImGui::PopID()
ImGuiID ImGui::GetID(const char* str_id)
{
ImGuiWindow* window = GetCurrentWindow();
return window->GetID(str_id);
return GImGui->CurrentWindow->GetID(str_id);
}
ImGuiID ImGui::GetID(const char* str_id_begin, const char* str_id_end)
{
ImGuiWindow* window = GetCurrentWindow();
return window->GetID(str_id_begin, str_id_end);
return GImGui->CurrentWindow->GetID(str_id_begin, str_id_end);
}
ImGuiID ImGui::GetID(const void* ptr_id)
{
ImGuiWindow* window = GetCurrentWindow();
return window->GetID(ptr_id);
return GImGui->CurrentWindow->GetID(ptr_id);
}
// User can input math operators (e.g. +100) to edit a numerical values.
@ -10611,12 +10627,25 @@ void ImGui::ShowTestWindow(bool* opened)
}
if (ImGui::Button("Popup Menu.."))
ImGui::OpenPopup("context menu");
if (ImGui::BeginPopup("context menu"))
ImGui::OpenPopup("popup from button");
if (ImGui::BeginPopup("popup from button"))
{
ShowExampleMenuFile();
ImGui::EndPopup();
}
static float value = 0.5f;
ImGui::Text("Value = %.3f", value);
if (ImGui::IsItemHovered() && ImGui::IsMouseClicked(1))
ImGui::OpenPopup("context menu");
ImGui::SameLine(); ImGui::Text("<-- right-click");
if (ImGui::BeginPopup("context menu"))
{
if (ImGui::Selectable("Set to zero")) value = 0.0f;
if (ImGui::Selectable("Set to PI")) value = PI;
ImGui::EndPopup();
}
ImGui::TreePop();
}
@ -11682,6 +11711,11 @@ struct ExampleAppConsole
// NB- if you have thousands of entries this approach may be too inefficient. You can seek and display only the lines that are visible - CalcListClipping() is a helper to compute this information.
// If your items are of variable size you may want to implement code similar to what CalcListClipping() does. Or split your data into fixed height items to allow random-seeking into your list.
ImGui::BeginChild("ScrollingRegion", ImVec2(0,-ImGui::GetTextLineHeightWithSpacing()*2));
if (ImGui::BeginPopupContextWindow())
{
if (ImGui::Selectable("Clear")) ClearLog();
ImGui::EndPopup();
}
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4,1)); // Tighten spacing
for (size_t i = 0; i < Items.size(); i++)
{

5
3rdparty/ocornut-imgui/imgui.h vendored
View file

@ -169,6 +169,8 @@ namespace ImGui
// Popup
IMGUI_API void OpenPopup(const char* str_id); // mark popup as open. popup identifiers are relative to the current ID-stack (so OpenPopup and BeginPopup needs to be at the same level). close childs popups if any. will close popup when user click outside, or activate a pressable item, or CloseCurrentPopup() is called within a BeginPopup()/EndPopup() block.
IMGUI_API bool BeginPopup(const char* str_id); // return true if popup if opened and start outputting to it. only call EndPopup() if BeginPopup() returned true!
IMGUI_API bool BeginPopupContextItem(const char* str_id, int button = 1); // open popup when clicked on last item
IMGUI_API bool BeginPopupContextWindow(const char* str_id = "window_context_menu", bool void_only = false, int button = 1); // open popup when clicked on current window
IMGUI_API void EndPopup();
IMGUI_API void CloseCurrentPopup(); // close the popup we have begin-ed into. clicking on a MenuItem or Selectable automatically close the current popup.
@ -333,8 +335,9 @@ namespace ImGui
IMGUI_API bool IsItemHovered(); // was the last item hovered by mouse?
IMGUI_API bool IsItemHoveredRect(); // was the last item hovered by mouse? even if another item is active while we are hovering this
IMGUI_API bool IsItemActive(); // was the last item active? (e.g. button being held, text field being edited- items that don't interact will always return false)
IMGUI_API bool IsAnyItemActive(); //
IMGUI_API bool IsItemVisible();
IMGUI_API bool IsAnyItemHovered(); //
IMGUI_API bool IsAnyItemActive(); //
IMGUI_API ImVec2 GetItemRectMin(); // get bounding rect of last item in screen space
IMGUI_API ImVec2 GetItemRectMax(); // "
IMGUI_API ImVec2 GetItemRectSize(); // "