eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 10:19:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2018-10-10 19:33:08 +02:00
parent b4c67dba8c c7ef111791
commit 09970d73b1
49 changed files with 1697 additions and 1026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uilayer.cpp
View File

@@ -170,6 +170,11 @@ bool ui_layer::on_key(int const Key, int const Action)
return true;
}
if (Key == GLFW_KEY_F10) {
m_quit_active = !m_quit_active;
return true;
}
if (m_quit_active)
{
if (Key == GLFW_KEY_Y) {
@@ -319,7 +324,7 @@ void ui_layer::render_menu_contents()
if (ImGui::BeginMenu(LOC_STR(ui_general)))
{
ImGui::MenuItem(LOC_STR(ui_debug_mode), nullptr, &DebugModeFlag);
ImGui::MenuItem(LOC_STR(ui_quit), nullptr, &m_quit_active);
ImGui::MenuItem(LOC_STR(ui_quit), "F10", &m_quit_active);
ImGui::EndMenu();
}
if (ImGui::BeginMenu(LOC_STR(ui_tools)))