MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

ImGui also wants even pushes/pops in childframe scopes.

This commit is contained in:
David Salvisberg 2015-07-19 18:31:53 +02:00
parent 9d8aad7ffe
commit 5378cca875
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/settingsmenu.cpp
View File

@ -449,6 +449,7 @@ struct SettingsMenuPrivate
static inline bool TextCheckbox(const char* str_id, bool active, bool &hovered, const ImVec2 &size) static inline bool TextCheckbox(const char* str_id, bool active, bool &hovered, const ImVec2 &size)
{ {
bool result; bool result;
bool pushedFour = false;
ImVec2 innerPadding = ImGui::GetStyle().FramePadding; ImVec2 innerPadding = ImGui::GetStyle().FramePadding;
ImVec2 innerSize = ImVec2(size.x-2*innerPadding.x, size.y-2*innerPadding.y); ImVec2 innerSize = ImVec2(size.x-2*innerPadding.x, size.y-2*innerPadding.y);
ImGuiID id = ImGui::GetID(str_id); ImGuiID id = ImGui::GetID(str_id);
@ -463,10 +464,11 @@ struct SettingsMenuPrivate
/* Was item hovered in the previous frame? */ /* Was item hovered in the previous frame? */
if(hovered) if(hovered)
{
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImGui::GetStyle().Colors[ImGuiCol_FrameBgHovered]); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImGui::GetStyle().Colors[ImGuiCol_FrameBgHovered]);
pushedFour = true;
}
ImGui::BeginChildFrame(id, size); ImGui::BeginChildFrame(id, size);
if(hovered)
ImGui::PopStyleColor();
hovered = ImGui::IsWindowHovered(); hovered = ImGui::IsWindowHovered();
/* Align button properly in child window */ /* Align button properly in child window */
@ -476,7 +478,7 @@ struct SettingsMenuPrivate
ImGui::SetWindowPos(pos); ImGui::SetWindowPos(pos);
result = ImGui::Button(str_id, innerSize); result = ImGui::Button(str_id, innerSize);
ImGui::EndChildFrame(); ImGui::EndChildFrame();
ImGui::PopStyleColor(3); ImGui::PopStyleColor(pushedFour ? 4 : 3);
return result; return result;
} }