anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Removed bool return value from BegniPopup() at the moment, it is meaningless. Tidying up.

Browse Source
features/sdl_renderer3_multiviewports
ocornut ago%!(EXTRA string=11 years)
parent 4b7818dfc2
commit e1de4908f6
2 changed files with 8 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      imgui.cpp
  2. 2
      imgui.h

13
imgui.cpp
Unescape View File

@ -2742,8 +2742,8 @@ int ImGui::GetFrameCount()
void ImGui::BeginTooltip() void ImGui::BeginTooltip()
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
ImGuiWindowFlags window_flags = ImGuiWindowFlags_Tooltip|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize; ImGuiWindowFlags flags = ImGuiWindowFlags_Tooltip|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize;
ImGui::Begin("##Tooltip", NULL, ImVec2(0,0), g.Style.Colors[ImGuiCol_TooltipBg].w, window_flags); ImGui::Begin("##Tooltip", NULL, ImVec2(0,0), g.Style.Colors[ImGuiCol_TooltipBg].w, flags);
} }
void ImGui::EndTooltip() void ImGui::EndTooltip()
@ -2752,12 +2752,13 @@ void ImGui::EndTooltip()
ImGui::End(); ImGui::End();
} }
bool ImGui::BeginPopup(bool* p_opened) void ImGui::BeginPopup(bool* p_opened)
{ {
IM_ASSERT(p_opened != NULL); // Must provide a bool at the moment IM_ASSERT(p_opened != NULL); // Must provide a bool at the moment
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
bool ret = ImGui::Begin("##Popup", p_opened, ImGuiWindowFlags_Popup|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize); ImGuiWindowFlags flags = ImGuiWindowFlags_Popup|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoSavedSettings|ImGuiWindowFlags_AlwaysAutoResize;
return ret; ImGui::Begin("##Popup", p_opened, flags);
} }
void ImGui::EndPopup() void ImGui::EndPopup()
@ -9469,7 +9470,7 @@ void ImGui::ShowTestWindow(bool* opened)
ImGui::TreePop(); ImGui::TreePop();
} }
if (ImGui::TreeNode("Popup Menu")) if (ImGui::TreeNode("Popup"))
{ {
static bool popup_open = false; static bool popup_open = false;
static int selected_fish = -1; static int selected_fish = -1;

2
imgui.h
Unescape View File

@ -225,7 +225,7 @@ namespace ImGui
IMGUI_API void EndTooltip(); IMGUI_API void EndTooltip();
// Popup // Popup
IMGUI_API bool BeginPopup(bool* p_opened); IMGUI_API void BeginPopup(bool* p_opened);
IMGUI_API void EndPopup(); IMGUI_API void EndPopup();
// Layout // Layout

Write Preview
Loading…
Cancel
Save