chatlanin/rrr.v2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix double help dialog

Browse Source
This commit is contained in:
chatlanin 2023-05-10 22:13:55 +03:00
parent e5dca6cf34
commit 73649a48e6
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rrr/layers/gui/browser/navigation/navigation.cpp
View File

@ -348,7 +348,6 @@ namespace rrr::layers::gui
// помощь
if (key.get_keycode() == try_engine::key::F1)
{
hack::log()("help");
em->execute(types::event_type::SHOW_HELP_DIALOG, nullptr);
freeze = true;
}

11
src/rrr/layers/gui/dialogs/dialogs.cpp
View File

@ -40,8 +40,6 @@ namespace rrr::layers::gui
if (help_dialog)
draw_help_dialog();
hack::log()("render dialog");
END_IMGUI_WIN();
ImGui::PopStyleVar();
@ -95,7 +93,6 @@ namespace rrr::layers::gui
{
show = true;
help_dialog = true;
hack::log()("SHOW_HELP_DIALOG", show, help_dialog);
}
break;
default:
@ -145,9 +142,6 @@ namespace rrr::layers::gui
if (rename_dialog)
rename();
}
if (help_dialog && key.get_keycode() == try_engine::key::F1)
cancel();
}
void dialogs::released(system_event& e)
@ -288,7 +282,7 @@ namespace rrr::layers::gui
void dialogs::draw_help_dialog()
{
hack::log()("draw_help_dialog");
height = try_engine::application::get()->get_window()->height() / 2.5f;
height = try_engine::application::get()->get_window()->height() / 2.4f;
TR_PUSH_FONT(MEDIUM, 16);
@ -309,6 +303,7 @@ namespace rrr::layers::gui
ImGui::TextUnformatted("Удаление: D");
ImGui::TextUnformatted("Переименование: R");
ImGui::TextUnformatted("Создание: A");
ImGui::TextUnformatted("Вырезание: x");
ImGui::Separator();
ImGui::TextUnformatted("Перемещение в начало: gg");
@ -317,7 +312,7 @@ namespace rrr::layers::gui
ImGui::TextUnformatted("Быстрое перемещение вниз: K");
ImGui::Separator();
ImGui::TextUnformatted("Выход из помощи: F1");
ImGui::TextUnformatted("Выход из диалогов: ESCAPE");
TR_POP_FONT();
}