Blitz/Blitz
3
1
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects 1 Releases 2 Wiki Activity

fix retour / quitter button
All checks were successful
Linux arm64 / Build (push) Successful in 4m35s
Details

Browse Source
This commit is contained in:
Morph01
2024-03-26 09:32:07 +01:00
parent 63c33e4bc5
commit bd517c6cfe
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/client/gui/OptionsMenu.cpp
View File

@@ -160,33 +160,6 @@ void OptionsMenu::Render() {
ImGui::NewLine();
if (ImGui::Button("Retour") || (ImGui::IsKeyPressed(ImGuiKey_Escape, false) && !m_IsKeyPopupOpen)) {
Disable();
if (m_Client->IsConnected()) {
ImGui::SetCursorPosX(displaySize.x - buttonSize.x - paddingHeight);
ImGui::SetCursorPosY(displaySize.y - 2 * buttonSize.y - paddingHeight);
} else {
ImGui::SetCursorPosX(displaySize.x - buttonSize.x - paddingHeight);
ImGui::SetCursorPosY(displaySize.y - buttonSize.y - paddingHeight);
}
ImGui::BeginGroup();
if (ImGui::Button("Retour", buttonSize) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
Disable();
if (m_Client->IsConnected()) {
InputManager::GrabMouse(true);
} else {
m_Parent->Enable();
}
}
if (m_Client->IsConnected()) {
if (ImGui::Button("Quitter la partie", buttonSize)) {
m_Client->Disconnect();
Disable();
m_Parent->Enable();
}
}
ImGui::EndGroup();
}
ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None;
if (ImGui::BeginTabBar("OPTIONS", tab_bar_flags)) {
if (ImGui::BeginTabItem("CONTROLES")) {
@@ -214,6 +187,33 @@ void OptionsMenu::Render() {
ImGui::EndTabItem();
}
ImGui::EndTabBar();
if (m_Client->IsConnected()) {
ImGui::SetCursorPosX(displaySize.x - buttonSize.x - paddingHeight);
ImGui::SetCursorPosY(displaySize.y - 2 * buttonSize.y - paddingHeight);
} else {
ImGui::SetCursorPosX(displaySize.x - buttonSize.x - paddingHeight);
ImGui::SetCursorPosY(displaySize.y - buttonSize.y - paddingHeight);
}
ImGui::BeginGroup();
{
if (ImGui::Button("Retour", buttonSize) || ImGui::IsKeyPressed(ImGuiKey_Escape)) {
Disable();
if (m_Client->IsConnected()) {
InputManager::GrabMouse(true);
} else {
m_Parent->Enable();
}
}
if (m_Client->IsConnected()) {
if (ImGui::Button("Quitter la partie", buttonSize)) {
m_Client->Disconnect();
Disable();
m_Parent->Enable();
}
}
}
ImGui::EndGroup();
}
}
ImGui::End();