From b9f624dd7192613478664b905dc166513963e55d Mon Sep 17 00:00:00 2001 From: Zachary Hall Date: Wed, 10 Apr 2024 13:25:18 -0700 Subject: [PATCH] Fix building with -Werror, hopefully. --- CMakeLists.txt | 2 +- backends/ui/imgui/main.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b475ea9..7e886ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,4 +151,4 @@ install(TARGETS looper ${EXTRA_LIBS}) install(FILES assets/icon.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/) install(FILES assets/com.complecwaft.Looper.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install(FILES assets/com.complecwaft.Looper.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) -install(DIRECTORY assets/translations/ TYPE LOCALE PATTERN "*" EXCLUDE PATTERN "looper.pot") +install(DIRECTORY assets/translations/ TYPE LOCALE PATTERN "*" EXCLUDE PATTERN "looper.pot") \ No newline at end of file diff --git a/backends/ui/imgui/main.cpp b/backends/ui/imgui/main.cpp index 5bcd5b7..690f37b 100644 --- a/backends/ui/imgui/main.cpp +++ b/backends/ui/imgui/main.cpp @@ -252,10 +252,10 @@ void MainLoop::GuiFunction() { } } static string filter = ""; - ImGui::Text(_TR_CTX("Preference | Theme selector | Filter label", "Filter:")); ImGui::SameLine(); + ImGui::TextUnformatted(_TR_CTX("Preference | Theme selector | Filter label", "Filter:")); ImGui::SameLine(); ImGui::SetNextItemWidth(ImGui::GetWindowWidth() - ImGui::GetCursorPosX() - ImGui::GetStyle().WindowPadding.x); ImGui::InputText("##FilterInput", &filter); - ImGui::Text(_TR_CTX("Preferences | Theme selector | Selector label", "Select a theme...")); + ImGui::TextUnformatted(_TR_CTX("Preferences | Theme selector | Selector label", "Select a theme...")); ImVec2 ChildSize = ImVec2(ImGui::GetWindowWidth() - (ImGui::GetStyle().WindowPadding.x * 2.0f), -ImGui::GetFrameHeightWithSpacing()); if (ImGui::BeginChildFrame(ImGui::GetID("##ThemesContainer"), ChildSize)) { ImVec2 TableSize = ImVec2(0, 0); @@ -303,11 +303,11 @@ void MainLoop::GuiFunction() { ImGui::PushFont(title); static const string APP_NAME_STR = _TR_CTX("Application name.", "Looper"); ImGui::SetCursorPosX((ImGui::GetWindowWidth() - ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0.0f, APP_NAME_STR.c_str()).x) / 2.0f); - ImGui::Text(APP_NAME_STR.c_str()); + ImGui::TextUnformatted(APP_NAME_STR.c_str()); ImGui::PopFont(); static const string VER_STRING = _TR_CTX("Version string format specifier", "Version ") + string(TAG) + _TRS_CTX("Suffix to the version string in the about window, if needed", " "); ImGui::SetCursorPosX((ImGui::GetWindowWidth() - ImGui::GetFont()->CalcTextSizeA(ImGui::GetFontSize(), FLT_MAX, 0.0f, VER_STRING.c_str()).x) / 2.0f); - ImGui::Text(VER_STRING.c_str()); + ImGui::TextUnformatted(VER_STRING.c_str()); ImGui::NewLine(); auto &license_data = get_license_data(); // Left @@ -461,4 +461,4 @@ void ImGuiUIBackend::add_licenses() { LOAD_LICENSE(libportal, lgpl_3_0); license_data.insert(libportal); #endif -} \ No newline at end of file +}