diff --git a/src/Scenes/DecryptFileScene.cpp b/src/Scenes/DecryptFileScene.cpp index 31e0eecbf..65035b590 100644 --- a/src/Scenes/DecryptFileScene.cpp +++ b/src/Scenes/DecryptFileScene.cpp @@ -49,17 +49,10 @@ void DecryptFileScene::OnImGuiDraw() { static constexpr const auto inline_dummy = [](const float& x, const float& y) noexcept { ImGui::SameLine(); ImGui::Dummy(ImVec2(x, y)); }; static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_16 = fonts.at("Montserrat-Medium-16"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_ubuntu_regular_30 = fonts.at("Ubuntu-Regular-30"); - static ImFont *const& font_ubuntu_regular_20 = fonts.at("Ubuntu-Regular-20"); - static ImFont *const& font_ubuntu_regular_18 = fonts.at("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 =ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 =ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_12 =ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -71,14 +64,14 @@ void DecryptFileScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = ("Decrypt File"); static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -93,7 +86,7 @@ void DecryptFileScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -105,7 +98,7 @@ void DecryptFileScene::OnImGuiDraw() { spacing(3); // Algorithm used for encryption - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Algorithm")); @@ -114,8 +107,7 @@ void DecryptFileScene::OnImGuiDraw() { // Algo types radio buttons const static auto supported_algorithms = Algorithm::GetSupportedAlgorithms(); for (const auto& [algo_name, algo_type]: supported_algorithms) { - inline_dummy(1.0f, 0.0f); - ImGui::SameLine(); + ImGui::SameLine(0.0f,5.0f); if (ImGui::RadioButton(algo_name.c_str(), m_type == algo_type)) { m_type = algo_type; } @@ -148,14 +140,14 @@ void DecryptFileScene::OnImGuiDraw() { spacing(3); // In File to Decrypt - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("File To Decrypt")); // Encrypted text static const ImVec2 browse_button_size(45.0f, 25.0f); ImGuiWidgets::InputText("##text1", &m_in_filename, win_w - (browse_button_size.x * 1.5f)); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12);; ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -176,14 +168,14 @@ void DecryptFileScene::OnImGuiDraw() { // Out File Decrypted if (!m_in_filename.empty()) { - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Decrypted File Location")); // Encrypted text static const ImVec2 browse_button_size(45.0f, 25.0f); ImGuiWidgets::InputText("##text2", &m_out_filename, win_w - (browse_button_size.x * 1.5f)); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12);; ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -223,7 +215,7 @@ void DecryptFileScene::OnImGuiDraw() { ImGui::PopFont(); } else { // Password used for encryption - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Password")); @@ -232,7 +224,7 @@ void DecryptFileScene::OnImGuiDraw() { ImGuiWidgets::InputText("##text3", &m_password, static_cast(win_w), ImGuiInputTextFlags_::ImGuiInputTextFlags_Password); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_password.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_password.size()).c_str()); ImGui::PopFont(); @@ -245,7 +237,7 @@ void DecryptFileScene::OnImGuiDraw() { // Decrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed diff --git a/src/Scenes/DecryptTextScene.cpp b/src/Scenes/DecryptTextScene.cpp index a89c5d964..843019798 100644 --- a/src/Scenes/DecryptTextScene.cpp +++ b/src/Scenes/DecryptTextScene.cpp @@ -47,16 +47,14 @@ void DecryptTextScene::OnImGuiDraw() { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; static constexpr const auto inline_spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) { ImGui::SameLine(); ImGui::Spacing(); } }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_ubuntu_regular_30 = fonts.at("Ubuntu-Regular-30"); - static ImFont *const& font_ubuntu_regular_20 = fonts.at("Ubuntu-Regular-20"); - static ImFont *const& font_ubuntu_regular_18 = fonts.at("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -68,14 +66,14 @@ void DecryptTextScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = ("Decrypt Text"); static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -90,7 +88,7 @@ void DecryptTextScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -103,7 +101,7 @@ void DecryptTextScene::OnImGuiDraw() { spacing(3); // Algorithm used in encryption to decrypt text with - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Algorithm")); @@ -112,8 +110,7 @@ void DecryptTextScene::OnImGuiDraw() { // Algo types radio buttons const static auto supported_algorithms = Algorithm::GetSupportedAlgorithms(); for (const auto& [algo_name, algo_type]: supported_algorithms) { - inline_dummy(1.0f, 0.0f); - ImGui::SameLine(); + ImGui::SameLine(0.0f,5.0f); if (ImGui::RadioButton(algo_name.c_str(), m_type == algo_type)) { m_type = algo_type; } @@ -146,7 +143,7 @@ void DecryptTextScene::OnImGuiDraw() { spacing(3); // Encrypted Text in Base64 to Decrypt - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Cipher (in base64)")); @@ -156,7 +153,7 @@ void DecryptTextScene::OnImGuiDraw() { ImGuiWidgets::InputTextMultiline("##cipher_base64", &m_cipher_base64, input_text_size); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_cipher_base64.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_cipher_base64.size()).c_str()); ImGui::PopFont(); @@ -184,7 +181,7 @@ void DecryptTextScene::OnImGuiDraw() { ImGui::PopFont(); } else { // Password used for encryption - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Password")); @@ -193,7 +190,7 @@ void DecryptTextScene::OnImGuiDraw() { ImGuiWidgets::InputText("##password", &m_password, static_cast(win_w), ImGuiInputTextFlags_::ImGuiInputTextFlags_Password); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_password.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_password.size()).c_str()); ImGui::PopFont(); @@ -208,7 +205,7 @@ void DecryptTextScene::OnImGuiDraw() { ImGui::Separator(); spacing(3); - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Recovered Text")); @@ -222,7 +219,7 @@ void DecryptTextScene::OnImGuiDraw() { this->OnCopyDecryptedTextButtonPressed(); } // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_recovered_text.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_recovered_text.size()).c_str()); ImGui::PopFont(); @@ -237,7 +234,7 @@ void DecryptTextScene::OnImGuiDraw() { // Decrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed diff --git a/src/Scenes/EncryptFileScene.cpp b/src/Scenes/EncryptFileScene.cpp index e02fead5a..e7e7cc121 100644 --- a/src/Scenes/EncryptFileScene.cpp +++ b/src/Scenes/EncryptFileScene.cpp @@ -52,17 +52,14 @@ void EncryptFileScene::OnImGuiDraw() { static constexpr const auto inline_dummy = [](const float& x, const float& y) noexcept { ImGui::SameLine(); ImGui::Dummy(ImVec2(x, y)); }; static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_16 = fonts.at("Montserrat-Medium-16"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_ubuntu_regular_30 = fonts.at("Ubuntu-Regular-30"); - static ImFont *const& font_ubuntu_regular_20 = fonts.at("Ubuntu-Regular-20"); - static ImFont *const& font_ubuntu_regular_18 = fonts.at("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -74,14 +71,14 @@ void EncryptFileScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = ("Encrypt File"); static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -96,7 +93,7 @@ void EncryptFileScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -109,7 +106,7 @@ void EncryptFileScene::OnImGuiDraw() { // Algorithm To encrypt File with - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Algorithm")); @@ -118,8 +115,7 @@ void EncryptFileScene::OnImGuiDraw() { // Algo types radio buttons const static auto supported_algorithms = Algorithm::GetSupportedAlgorithms(); for (const auto& [algo_name, algo_type]: supported_algorithms) { - inline_dummy(1.0f, 0.0f); - ImGui::SameLine(); + ImGui::SameLine(0.0f,5.0f); if (ImGui::RadioButton(algo_name.c_str(), m_type == algo_type)) { m_type = algo_type; } @@ -150,9 +146,9 @@ void EncryptFileScene::OnImGuiDraw() { spacing(2); // Save to database widget - ImGui::PushFont(font_montserrat_medium_16); + ImGui::PushFont(font_ubuntu_regular_16); { - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); ImGui::Text("%s:", ("Save to database")); ImGui::PopFont(); inline_dummy(6.0f, 0.0f); @@ -160,8 +156,7 @@ void EncryptFileScene::OnImGuiDraw() { ImGui::Checkbox("##savetodb_checkbox", &m_save_to_database); if (m_save_to_database) { - ImGui::Text("%s:", ("Encryption Title")); - ImGuiWidgets::InputTextWithHint("##idb", ("(example > An important video) helps with searching through encryption records in the future"), &m_db_title, win_w / 1.3f); + ImGuiWidgets::InputTextWithHint("##idb", ("A clear encryption title (e.g., An important Document) facilitates future record searches."), &m_db_title, win_w / 1.3f); } } ImGui::PopFont(); @@ -172,14 +167,14 @@ void EncryptFileScene::OnImGuiDraw() { spacing(3); // In File to Encrypt - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("File To Encrypt")); // Encrypted text static const ImVec2 browse_button_size(win_w * 0.10f, 25.0f); ImGuiWidgets::InputText("##text1", &m_in_filename, win_w * 0.85f); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -200,7 +195,7 @@ void EncryptFileScene::OnImGuiDraw() { // Out File Encrypted if (!m_in_filename.empty()) { - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Encrypted File Location")); @@ -208,7 +203,7 @@ void EncryptFileScene::OnImGuiDraw() { // Encrypted text static const ImVec2 browse_button_size(win_w * 0.10f, 25.0f); ImGuiWidgets::InputText("##text2", &m_out_filename, win_w * 0.85f); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -275,7 +270,7 @@ void EncryptFileScene::OnImGuiDraw() { } else // RSA Doesnt need password { // Encryption Password & Confirm password - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // password text coloring for each state ImGui::PushStyleColor(ImGuiCol_::ImGuiCol_Text, @@ -295,7 +290,7 @@ void EncryptFileScene::OnImGuiDraw() { ImGuiWidgets::InputText("##text4", &m_confirm_password, static_cast(win_w), ImGuiInputTextFlags_::ImGuiInputTextFlags_Password); ImGui::PopStyleColor(); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_password.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_password.size()).c_str()); ImGui::PopFont(); @@ -311,7 +306,7 @@ void EncryptFileScene::OnImGuiDraw() { // Encrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed @@ -328,14 +323,14 @@ void EncryptFileScene::OnImGuiDraw() { ImGui::PopFont(); } // Out File Encrypted - /*ImGui::PushFont(font_montserrat_medium_20); + /*ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("Save Encrypted File To:"); // Encrypted text static const ImVec2 browse_button_size(45.0f, 25.0f); ImGuiUtils::InputText("##text2", &m_out_file_path, win_w - (browse_button_size.x * 1.5f)); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::SameLine(); if (ImGui::Button("Browse ", browse_button_size)) { diff --git a/src/Scenes/EncryptTextScene.cpp b/src/Scenes/EncryptTextScene.cpp index 9644ed80d..aeb109e1f 100644 --- a/src/Scenes/EncryptTextScene.cpp +++ b/src/Scenes/EncryptTextScene.cpp @@ -49,18 +49,14 @@ void EncryptTextScene::OnImGuiDraw() { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; static constexpr const auto inline_spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) { ImGui::SameLine(); ImGui::Spacing(); } }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_16 = fonts.at("Montserrat-Medium-16"); - static ImFont *const& font_montserrat_medium_14 = fonts.at("Montserrat-Medium-14"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_ubuntu_regular_30 = fonts.at("Ubuntu-Regular-30"); - static ImFont *const& font_ubuntu_regular_20 = fonts.at("Ubuntu-Regular-20"); - static ImFont *const& font_ubuntu_regular_18 = fonts.at("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -72,14 +68,14 @@ void EncryptTextScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = ("Encrypt Text"); static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -94,7 +90,7 @@ void EncryptTextScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -106,7 +102,7 @@ void EncryptTextScene::OnImGuiDraw() { spacing(3); // Algorithm To encrypt text with - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label //ImGui::LabelText("##label", "Algorithm:"); @@ -116,24 +112,13 @@ void EncryptTextScene::OnImGuiDraw() { // Algo types radio buttons const static auto supported_algorithms = Algorithm::GetSupportedAlgorithms(); for (const auto& [algo_name, algo_type]: supported_algorithms) { - inline_dummy(1.0f, 0.0f); - ImGui::SameLine(); + ImGui::SameLine(0.0f,5.0f); if (ImGui::RadioButton(algo_name.c_str(), m_type == algo_type)) { m_type = algo_type; } if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", Algorithm::ALGORITHM_DESCRIPTIONS.at(algo_type).data()); } - /*const static auto supported_algorithms = Algorithm::GetSupportedAlgorithms(); - for (const auto& [algo_name, algo_type] : supported_algorithms) - { - inline_dummy(6.0f, 0.0f); - ImGui::SameLine(); - if (ImGui::RadioButton(algo_name.c_str(), m_algorithm->GetType() == algo_type)) - { - m_algorithm->SetType(algo_type); - } - }*/ } ImGui::PopFont(); @@ -158,7 +143,7 @@ void EncryptTextScene::OnImGuiDraw() { spacing(2); // Save to database widget - ImGui::PushFont(font_montserrat_medium_16); + ImGui::PushFont(font_ubuntu_regular_16); { ImGui::PushFont(font_ubuntu_regular_18); ImGui::Text("%s:", ("Save to database")); @@ -168,8 +153,7 @@ void EncryptTextScene::OnImGuiDraw() { ImGui::Checkbox("##checkbox", &m_save_to_database); if (m_save_to_database) { - ImGui::Text("%s:", ("Encryption Title")); - ImGuiWidgets::InputTextWithHint("##idb", "(example: An important message) helps with searching through encryption records in the future", &m_db_title, win_w / 1.3f); + ImGuiWidgets::InputTextWithHint("##idb", ("A clear encryption title (e.g., An important Document) facilitates future record searches."), &m_db_title, win_w / 1.3f); } } ImGui::PopFont(); @@ -180,7 +164,7 @@ void EncryptTextScene::OnImGuiDraw() { // Text to encrypt - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Text")); @@ -189,7 +173,7 @@ void EncryptTextScene::OnImGuiDraw() { const ImVec2 input_text_size(static_cast(win_w), ImGui::GetTextLineHeightWithSpacing() * 6); ImGuiWidgets::InputTextMultiline("##text1", &m_text, input_text_size); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::Text("%s", SizeUtils::FriendlySize(m_text.size()).c_str()); ImGui::PopFont(); } @@ -243,7 +227,7 @@ void EncryptTextScene::OnImGuiDraw() { ImGui::PopFont(); } else // RSA Doesnt need password { - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // password text coloring for each state ImGui::PushStyleColor(ImGuiCol_::ImGuiCol_Text, @@ -263,7 +247,7 @@ void EncryptTextScene::OnImGuiDraw() { ImGuiWidgets::InputText("##text3", &m_confirm_password, static_cast(win_w), ImGuiInputTextFlags_::ImGuiInputTextFlags_Password); ImGui::PopStyleColor(); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_password.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_password.size()).c_str()); ImGui::PopFont(); @@ -278,13 +262,13 @@ void EncryptTextScene::OnImGuiDraw() { ImGui::Separator(); spacing(3); - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Cipher (in base64)")); // Encrypted text ImGuiWidgets::InputText("##text4", &m_cipher_base64, win_w * 0.88f); - ImGui::PushFont(font_montserrat_medium_14); + ImGui::PushFont(font_ubuntu_regular_14); ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -293,7 +277,7 @@ void EncryptTextScene::OnImGuiDraw() { this->OnCopyEncryptedBase64TextButtonPressed(); } //ImGui::NewLine(); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::Text("%s", SizeUtils::FriendlySize(m_cipher_base64.size()).c_str()); ImGui::PopFont(); ImGui::PopStyleColor(3); @@ -308,7 +292,7 @@ void EncryptTextScene::OnImGuiDraw() { // Encrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed diff --git a/src/Scenes/MainMenuScene.cpp b/src/Scenes/MainMenuScene.cpp index 4735d5592..b82a03c93 100644 --- a/src/Scenes/MainMenuScene.cpp +++ b/src/Scenes/MainMenuScene.cpp @@ -53,11 +53,15 @@ void MainMenuScene::OnImGuiDraw() { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_audiowide_regular_60 = fonts.at("Audiowide-Regular-60"); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); + static constexpr const auto container_flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -74,7 +78,7 @@ void MainMenuScene::OnImGuiDraw() { // Menu bar { ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0.0f, 22.0f)); // 22.0f Menu bar padding - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); if (ImGui::BeginMenuBar()) { if (ImGui::BeginMenu("File")) { if (ImGui::MenuItem("Export")) { this->OnExportEncryptionsButtonPressed(); } @@ -181,12 +185,12 @@ void MainMenuScene::OnImGuiDraw() { #if true // use text // Enigma Version { - ImGui::PushFont(font_audiowide_regular_60); // text font + ImGui::PushFont(font_ubuntu_regular_60); // text font ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color { static constexpr const auto title = "Enigma"; - static const ImVec2 title_size = {ImGui::CalcTextSize(title).x * font_audiowide_regular_60->Scale, ImGui::CalcTextSize(title).y * font_audiowide_regular_60->Scale}; + static const ImVec2 title_size = {ImGui::CalcTextSize(title).x * font_ubuntu_regular_60->Scale, ImGui::CalcTextSize(title).y * font_ubuntu_regular_60->Scale}; ImGui::SetCursorPosX((io.DisplaySize.x - title_size.x) / 2.0f); ImGui::Text(title); //static const ImVec2 label_size = { ImGui::CalcTextSize("Enigma x.y.z").x * font_audiowide_regular_45->Scale, ImGui::CalcTextSize("Enigma x.y.z").y * font_audiowide_regular_45->Scale }; @@ -212,7 +216,7 @@ void MainMenuScene::OnImGuiDraw() { // Buttons { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed @@ -438,7 +442,7 @@ void MainMenuScene::OnAboutMenuButtonPressed() { } void MainMenuScene::OnExportEncryptionsButtonPressed() { - const fs::path defaultExportFilename = ResourceUtils::GetResourcesDir() / DateTimeUtils::now("Enigma_export_%Y_%m_%d_%H_%M_%S.db"); + const fs::path defaultExportFilename = ResourceManager::getResourcesDir() / DateTimeUtils::now("Enigma_export_%Y_%m_%d_%H_%M_%S.db"); const SaveFileDialog sfd("Export Database to ...", defaultExportFilename.string(), true); const std::string outputFilename = sfd.Show(); if (outputFilename.empty()) return; @@ -455,7 +459,7 @@ void MainMenuScene::OnExportEncryptionsButtonPressed() { }); } void MainMenuScene::OnImportEncryptionsButtonPressed() { - const OpenFileDialog ofd("Import Database from ...", ResourceUtils::GetResourcesDir().string(), false); + const OpenFileDialog ofd("Import Database from ...", ResourceManager::getResourcesDir().string(), false); const std::vector selectedFiles = ofd.Show(); if (selectedFiles.empty()) return; const std::string& inputFilename = selectedFiles[0]; diff --git a/src/Scenes/MyEncryptionsScene.cpp b/src/Scenes/MyEncryptionsScene.cpp index 0e859f135..4e0598426 100644 --- a/src/Scenes/MyEncryptionsScene.cpp +++ b/src/Scenes/MyEncryptionsScene.cpp @@ -51,13 +51,11 @@ void MyEncryptionsScene::OnImGuiDraw() { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; static constexpr const auto inline_spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) { ImGui::SameLine(); ImGui::Spacing(); ImGui::SameLine(); } }; - static auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -69,14 +67,14 @@ void MyEncryptionsScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = "My Encryptions"; static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -91,7 +89,7 @@ void MyEncryptionsScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -104,7 +102,7 @@ void MyEncryptionsScene::OnImGuiDraw() { spacing(2); // Search Query - ImGui::PushFont(font_montserrat_medium_18); // text font + ImGui::PushFont(font_ubuntu_regular_18); // text font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed @@ -155,7 +153,7 @@ void MyEncryptionsScene::OnImGuiDraw() { { // Order By - ImGui::PushFont(font_montserrat_medium_18); // text font + ImGui::PushFont(font_ubuntu_regular_18); // text font ImGui::Text(("Order By")); ImGui::SameLine(); for (byte i = static_cast(Database::OrderBy::BEGIN); i <= static_cast(Database::OrderBy::END); i++) { @@ -189,7 +187,7 @@ void MyEncryptionsScene::OnImGuiDraw() { #if 0 // Order By - ImGui::PushFont(font_montserrat_medium_18); // text font + ImGui::PushFont(font_ubuntu_regular_18); // text font ImGui::Text("Order By "); ImGui::SameLine(); if (ImGui::RadioButton("ID", m_order_by == Database::OrderBy::ID)) { @@ -248,7 +246,7 @@ void MyEncryptionsScene::OnImGuiDraw() { // Encryptions records Table // https://github.com/ocornut/imgui/blob/master/imgui_demo.cpp#L5024 { - ImGui::PushFont(font_montserrat_medium_18); // text font + ImGui::PushFont(font_ubuntu_regular_18); // text font // settings inspired from https://github.com/ocornut/imgui/issues/2957 # https://user-images.githubusercontent.com/8225057/71590710-dd057f80-2b29-11ea-8c1f-d827c008e050.png static constexpr const auto table_flags = @@ -349,11 +347,11 @@ void MyEncryptionsScene::OnImGuiDraw() { } else // No Encryption records saved yet. { // Centre text no saved encryption records - ImGui::PushFont(font_montserrat_medium_18); // text font + ImGui::PushFont(font_ubuntu_regular_18); // text font ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color { const char *text = m_isSearching ? ("No Encryptions found") : ("No Encryptions saved yet"); - static const ImVec2 text_size(ImGui::CalcTextSize(text).x * font_montserrat_medium_18->Scale, ImGui::CalcTextSize(text).y * font_montserrat_medium_18->Scale); + static const ImVec2 text_size(ImGui::CalcTextSize(text).x * font_ubuntu_regular_18->Scale, ImGui::CalcTextSize(text).y * font_ubuntu_regular_18->Scale); ImGui::SetCursorPosX((io.DisplaySize.x - text_size.x) / 2.0f); ImGui::Text("%s", text); } diff --git a/src/Scenes/ToolsScene/HashingTool.cpp b/src/Scenes/ToolsScene/HashingTool.cpp index cd74f0816..8f75a63b8 100644 --- a/src/Scenes/ToolsScene/HashingTool.cpp +++ b/src/Scenes/ToolsScene/HashingTool.cpp @@ -18,21 +18,18 @@ void HashingTool::OnDraw(Scene *parent) { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; static constexpr const auto inline_dummy = [](const float& x, const float& y) noexcept { ImGui::SameLine(); ImGui::Dummy(ImVec2(x, y)); }; - static auto& fonts = Application::getInstance()->GetFonts(); - //static ImFont* const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - //static ImFont* const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_14 = fonts.at("Montserrat-Medium-14"); - //static ImFont* const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - - ImGui::PushFont(font_audiowide_regular_20); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); + + ImGui::PushFont(font_ubuntu_regular_20); { //if (ImGui::CollapsingHeader("Hashing", nullptr, ImGuiTreeNodeFlags_::ImGuiTreeNodeFlags_DefaultOpen)) if (ImGui::CollapsingHeader(("Hashing"), nullptr)) { - ImGui::PushFont(font_montserrat_medium_18); + ImGui::PushFont(font_ubuntu_regular_18); spacing(3); // Hashing algorithms diff --git a/src/Scenes/ToolsScene/PasswordGeneratorTool.cpp b/src/Scenes/ToolsScene/PasswordGeneratorTool.cpp index fc03d73dd..cc1afeb67 100644 --- a/src/Scenes/ToolsScene/PasswordGeneratorTool.cpp +++ b/src/Scenes/ToolsScene/PasswordGeneratorTool.cpp @@ -20,25 +20,22 @@ void PasswordGeneratorTool::OnDraw(Scene *parent) { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static auto& fonts = Application::getInstance()->GetFonts(); - //static ImFont* const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - //static ImFont* const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_14 = fonts.at("Montserrat-Medium-14"); - //static ImFont* const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - - ImGui::PushFont(font_audiowide_regular_20); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); + + ImGui::PushFont(font_ubuntu_regular_20); { if (ImGui::CollapsingHeader(("Password Generator"), nullptr, ImGuiTreeNodeFlags_::ImGuiTreeNodeFlags_DefaultOpen)) //if (ImGui::CollapsingHeader("Password Generator", nullptr)) { - ImGui::PushFont(font_montserrat_medium_18); + ImGui::PushFont(font_ubuntu_regular_18); spacing(3); // Copy button, Output Input Text , Generate Button // Copy Generated password button 10% of width - //ImGui::PushFont(font_montserrat_medium_20); + //ImGui::PushFont(font_ubuntu_regular_20); ImGui::PushID("CopyGeneratedPw"); if (ImGuiWidgets::Button(("Copy"), ImVec2(win_w * 0.10f, 33.0f), Constants::Colors::BUTTON_COLOR, Constants::Colors::BUTTON_COLOR_HOVER, Constants::Colors::BUTTON_COLOR_ACTIVE)) { this->OnCopyPasswordButtonPressed(); @@ -67,7 +64,7 @@ void PasswordGeneratorTool::OnDraw(Scene *parent) { // Password Settings // Wrap password settings in columns to order things up - //ImGui::PushFont(font_montserrat_medium_14); + //ImGui::PushFont(font_ubuntu_regular_14); ImGui::BeginColumns("Password Settings", 5, ImGuiOldColumnFlags_::ImGuiOldColumnFlags_NoResize); // Length Combo Box /* diff --git a/src/Scenes/ToolsScene/SystemAndHardwareInfoTool.cpp b/src/Scenes/ToolsScene/SystemAndHardwareInfoTool.cpp index 00309febf..71bf3e3e0 100644 --- a/src/Scenes/ToolsScene/SystemAndHardwareInfoTool.cpp +++ b/src/Scenes/ToolsScene/SystemAndHardwareInfoTool.cpp @@ -18,19 +18,18 @@ void SystemAndHardwareInfoTool::OnDraw(Scene *) { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static auto& fonts = Application::getInstance()->GetFonts(); - //static ImFont* const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - //static ImFont* const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_14 = fonts.at("Montserrat-Medium-14"); - //static ImFont* const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - - ImGui::PushFont(font_audiowide_regular_20); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); + + ImGui::PushFont(font_ubuntu_regular_20); { if (ImGui::CollapsingHeader("System and Hardware Information", nullptr)) { - ImGui::PushFont(font_montserrat_medium_18); + ImGui::PushFont(font_ubuntu_regular_18); spacing(3); /// CPU Information BEGIN /// Static diff --git a/src/Scenes/ToolsScene/ToolsScene.cpp b/src/Scenes/ToolsScene/ToolsScene.cpp index 8d1787b39..de546dfb6 100644 --- a/src/Scenes/ToolsScene/ToolsScene.cpp +++ b/src/Scenes/ToolsScene/ToolsScene.cpp @@ -47,13 +47,14 @@ void ToolsScene::OnImGuiDraw() { static constexpr const auto inline_dummy = [](const float& x, const float& y) noexcept { ImGui::SameLine(); ImGui::Dummy(ImVec2(x, y)); }; static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -66,14 +67,14 @@ void ToolsScene::OnImGuiDraw() { { // Back button [<] & Title { - static const auto& title_font = font_audiowide_regular_30; - const auto title = ("Tools"); - static const ImVec2 title_size((ImGui::CalcTextSize(title).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title).y * title_font->Scale); + static const auto& title_font = font_ubuntu_regular_30; + static const std::string title = ("Tools"); + static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { Scene::EndScene(); } @@ -88,7 +89,7 @@ void ToolsScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title, ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); diff --git a/src/Scenes/ToolsScene/XOREncryptionTool.cpp b/src/Scenes/ToolsScene/XOREncryptionTool.cpp index eaacfde2b..1a9f7d856 100644 --- a/src/Scenes/ToolsScene/XOREncryptionTool.cpp +++ b/src/Scenes/ToolsScene/XOREncryptionTool.cpp @@ -21,19 +21,19 @@ void XOREncryptionTool::OnDraw(Scene *parent) { static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static auto& fonts = Application::getInstance()->GetFonts(); - //static ImFont* const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - //static ImFont* const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_14 = fonts.at("Montserrat-Medium-14"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - - ImGui::PushFont(font_audiowide_regular_20); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); + + ImGui::PushFont(font_ubuntu_regular_20); { if (ImGui::CollapsingHeader(("XOR Encrypt/Decrypt"))) { - ImGui::PushFont(font_montserrat_medium_18); + ImGui::PushFont(font_ubuntu_regular_18); spacing(3); @@ -50,7 +50,7 @@ void XOREncryptionTool::OnDraw(Scene *parent) { spacing(3); // Buffer or cipher to encrypt/decrypt - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Input")); @@ -60,7 +60,7 @@ void XOREncryptionTool::OnDraw(Scene *parent) { ImGuiWidgets::InputTextMultiline("##text1", &m_input, input_text_size); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::Text("%s", SizeUtils::FriendlySize(m_input.size()).c_str()); ImGui::PopFont(); } @@ -69,7 +69,7 @@ void XOREncryptionTool::OnDraw(Scene *parent) { spacing(3); // Encryption Password - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Password")); @@ -82,13 +82,13 @@ void XOREncryptionTool::OnDraw(Scene *parent) { // Encrypted/decrypted output if (!m_output.empty()) { - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", ("Output (in base64)")); // Encrypted/Decrypted text ImGuiWidgets::InputTextMultiline("##text4", &m_output, ImVec2(win_w * 0.88f, ImGui::GetTextLineHeightWithSpacing() * 3.0f)); - ImGui::PushFont(font_montserrat_medium_14); + ImGui::PushFont(font_ubuntu_regular_14); ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -97,7 +97,7 @@ void XOREncryptionTool::OnDraw(Scene *parent) { Clipboard::Set(m_output); } //ImGui::NewLine(); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::Text("%s", SizeUtils::FriendlySize(m_output.size()).c_str()); ImGui::PopFont(); ImGui::PopStyleColor(3); @@ -110,7 +110,7 @@ void XOREncryptionTool::OnDraw(Scene *parent) { // Encrypt/Decrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed diff --git a/src/Scenes/ViewEncryptionScene.cpp b/src/Scenes/ViewEncryptionScene.cpp index 3d419b8de..13a2697df 100644 --- a/src/Scenes/ViewEncryptionScene.cpp +++ b/src/Scenes/ViewEncryptionScene.cpp @@ -48,16 +48,14 @@ void ViewEncryptionScene::OnImGuiDraw() { static constexpr const auto inline_dummy = [](const float& x, const float& y) noexcept { ImGui::SameLine(); ImGui::Dummy(ImVec2(x, y)); ImGui::SameLine(); }; static constexpr const auto spacing = [](const std::uint8_t& n) noexcept { for (std::uint8_t i = 0; i < n; i++) ImGui::Spacing(); }; - static const auto& fonts = Application::getInstance()->GetFonts(); - static ImFont *const& font_audiowide_regular_45 = fonts.at("Audiowide-Regular-45"); - static ImFont *const& font_audiowide_regular_30 = fonts.at("Audiowide-Regular-30"); - static ImFont *const& font_audiowide_regular_20 = fonts.at("Audiowide-Regular-20"); - static ImFont *const& font_montserrat_medium_20 = fonts.at("Montserrat-Medium-20"); - static ImFont *const& font_montserrat_medium_18 = fonts.at("Montserrat-Medium-18"); - static ImFont *const& font_montserrat_medium_12 = fonts.at("Montserrat-Medium-12"); - static ImFont *const& font_ubuntu_regular_30 = fonts.at("Ubuntu-Regular-30"); - static ImFont *const& font_ubuntu_regular_20 = fonts.at("Ubuntu-Regular-20"); - static ImFont *const& font_ubuntu_regular_18 = fonts.at("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_60 = ResourceManager::getFont("Ubuntu-Regular-60"); + static ImFont *const& font_ubuntu_regular_45 = ResourceManager::getFont("Ubuntu-Regular-45"); + static ImFont *const& font_ubuntu_regular_30 = ResourceManager::getFont("Ubuntu-Regular-30"); + static ImFont *const& font_ubuntu_regular_20 = ResourceManager::getFont("Ubuntu-Regular-20"); + static ImFont *const& font_ubuntu_regular_18 = ResourceManager::getFont("Ubuntu-Regular-18"); + static ImFont *const& font_ubuntu_regular_16 = ResourceManager::getFont("Ubuntu-Regular-16"); + static ImFont *const& font_ubuntu_regular_14 = ResourceManager::getFont("Ubuntu-Regular-14"); + static ImFont *const& font_ubuntu_regular_12 = ResourceManager::getFont("Ubuntu-Regular-12"); static constexpr const auto container_flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove; // | ImGuiWindowFlags_NoBackground; @@ -69,14 +67,14 @@ void ViewEncryptionScene::OnImGuiDraw() { ImGui::SetWindowPos(ImVec2(0.0f, 0.0f)); // top left { #pragma region Back button [<] & Scene Title - static const auto& title_font = font_audiowide_regular_30; + static const auto& title_font = font_ubuntu_regular_30; static const std::string title = ("View Encryption"); static const ImVec2 title_size((ImGui::CalcTextSize(title.c_str()).x * title_font->Scale) - 45.0f, ImGui::CalcTextSize(title.c_str()).y * title_font->Scale); static const ImVec2 back_button_size(45.0f, title_size.y); // Back Button [<] { - ImGui::PushFont(font_montserrat_medium_18); // < arrow is a text too + ImGui::PushFont(font_ubuntu_regular_18); // < arrow is a text too if (ImGuiWidgets::BackButton("##back", back_button_size)) { this->OnBackButtonPressed(); } @@ -91,7 +89,7 @@ void ViewEncryptionScene::OnImGuiDraw() { ImGui::PushStyleColor(ImGuiCol_Text, Constants::Colors::TEXT_COLOR); // text color ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::SCENE_TITLE_BACKGROUND_COLOR); // Scene title back color { - (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w), title_size.y), ImGuiItemFlags_Disabled); + (void) ImGui::ButtonEx(title.c_str(), ImVec2(static_cast(win_w) - back_button_size.x - 25.0f, title_size.y), ImGuiItemFlags_Disabled); } ImGui::PopStyleColor(2); ImGui::PopFont(); @@ -106,14 +104,14 @@ void ViewEncryptionScene::OnImGuiDraw() { // Encryption info (title \n Date time - size) { // title - ImGui::PushFont(font_audiowide_regular_20); + ImGui::PushFont(font_ubuntu_regular_20); ImGui::TextWrapped("%s", m_encryption->title.c_str()); // we had an issue here, abort was called because the random generated string contains % confuses imgui which thinks it needs format string, solved by adding %s then text ImGui::PopFont(); spacing(2); // Date time - size - ... - ImGui::PushFont(font_montserrat_medium_18); + ImGui::PushFont(font_ubuntu_regular_18); { static const std::string format = std::string("Format: ") + (m_encryption->is_file ? ("File") : ("Text")); ImGui::ButtonEx(format.c_str(), {0.0f, 0.0f}, ImGuiItemFlags_Disabled); @@ -160,7 +158,7 @@ void ViewEncryptionScene::OnImGuiDraw() { ImGui::PopFont(); } else { // Password used for encryption - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", "Password"); @@ -169,7 +167,7 @@ void ViewEncryptionScene::OnImGuiDraw() { ImGuiWidgets::InputText("##password", &m_password, static_cast(win_w), ImGuiInputTextFlags_::ImGuiInputTextFlags_Password); // Bytes count - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); //ImGui::Text("%zu bytes", m_password.size()); ImGui::Text("%s", SizeUtils::FriendlySize(m_password.size()).c_str()); ImGui::PopFont(); @@ -185,7 +183,7 @@ void ViewEncryptionScene::OnImGuiDraw() { spacing(3); - ImGui::PushFont(font_montserrat_medium_20); + ImGui::PushFont(font_ubuntu_regular_20); { // Label ImGui::Text("%s:", "Recovered Text"); @@ -193,7 +191,7 @@ void ViewEncryptionScene::OnImGuiDraw() { // Encrypted text static const ImVec2 copy_button_size(45.0f, 25.0f); ImGuiWidgets::InputTextMultiline("##enc_txt", &m_recovered_text, ImVec2(win_w - (copy_button_size.x * 1.5f), ImGui::GetTextLineHeightWithSpacing() * 10.0f)); - ImGui::PushFont(font_montserrat_medium_12); + ImGui::PushFont(font_ubuntu_regular_12); ImGui::SameLine(); ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover @@ -214,7 +212,7 @@ void ViewEncryptionScene::OnImGuiDraw() { // Decrypt Button { - ImGui::PushFont(font_audiowide_regular_20); // buttons font + ImGui::PushFont(font_ubuntu_regular_20); // buttons font ImGui::PushStyleColor(ImGuiCol_Button, Constants::Colors::BUTTON_COLOR); // buttons color idle ImGui::PushStyleColor(ImGuiCol_ButtonHovered, Constants::Colors::BUTTON_COLOR_HOVER); // buttons color hover ImGui::PushStyleColor(ImGuiCol_ButtonActive, Constants::Colors::BUTTON_COLOR_ACTIVE); // buttons color pressed