From d1841f286388261dae8d28bed7277c89a68fbd6f Mon Sep 17 00:00:00 2001 From: Bruno Date: Sun, 6 Jun 2021 14:54:21 +0200 Subject: [PATCH] Define UNICODE symbols --- GeometryView.cpp | 4 ++-- TextureView.cpp | 4 ++-- UserInterfaceManager.cpp | 2 +- rsc/fonts/IconsFontAwesome5.h | 11 +++++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/GeometryView.cpp b/GeometryView.cpp index 1cc200e..aaa5425 100644 --- a/GeometryView.cpp +++ b/GeometryView.cpp @@ -927,10 +927,10 @@ View::Cursor GeometryView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::p sourceNode->rotation_.z = glm::radians( float(degrees) ); overlay_rotation_clock_->visible_ = true; overlay_rotation_clock_->copyTransform(overlay_rotation_); - info << "Angle " << degrees << "\u00b0"; // degree symbol + info << "Angle " << degrees << UNICODE_DEGREE; } else - info << "Angle " << std::fixed << std::setprecision(1) << glm::degrees(sourceNode->rotation_.z) << "\u00b0"; // degree symbol + info << "Angle " << std::fixed << std::setprecision(1) << glm::degrees(sourceNode->rotation_.z) << UNICODE_DEGREE; overlay_rotation_clock_hand_->visible_ = true; overlay_rotation_clock_hand_->translation_.x = s->stored_status_->translation_.x; diff --git a/TextureView.cpp b/TextureView.cpp index 6822555..829eb69 100644 --- a/TextureView.cpp +++ b/TextureView.cpp @@ -1209,10 +1209,10 @@ View::Cursor TextureView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pa sourceNode->rotation_.z = glm::radians( float(degrees) ); overlay_rotation_clock_->visible_ = true; overlay_rotation_clock_->copyTransform(overlay_rotation_); - info << "Texture Angle " << degrees << "\u00b0"; // degree symbol + info << "Texture Angle " << degrees << UNICODE_DEGREE; } else - info << "Texture Angle " << std::fixed << std::setprecision(1) << glm::degrees(sourceNode->rotation_.z) << "\u00b0"; // degree symbol + info << "Texture Angle " << std::fixed << std::setprecision(1) << glm::degrees(sourceNode->rotation_.z) << UNICODE_DEGREE; overlay_rotation_clock_hand_->visible_ = true; overlay_rotation_clock_hand_->translation_.x = s->stored_status_->translation_.x; diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index 68f1ef4..7badc53 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -1687,7 +1687,7 @@ void UserInterface::RenderAbout(bool* p_open) ImGui::Separator(); ImGui::Text("vimix performs graphical mixing and blending of\nseveral movie clips and computer generated graphics,\nwith image processing effects in real-time."); - ImGui::Text("\nvimix is licensed under the GNU GPL version 3.\nCopyright 2019-2021 Bruno Herbelin."); + ImGui::Text("\nvimix is licensed under GNU GPL version 3 or later.\n" UNICODE_COPYRIGHT " 2019-2021 Bruno Herbelin."); ImGui::Spacing(); ImGuiToolkit::ButtonOpenUrl("Visit vimix website", "https://brunoherbelin.github.io/vimix/", ImVec2(ImGui::GetContentRegionAvail().x, 0)); diff --git a/rsc/fonts/IconsFontAwesome5.h b/rsc/fonts/IconsFontAwesome5.h index 0631b0f..f635895 100644 --- a/rsc/fonts/IconsFontAwesome5.h +++ b/rsc/fonts/IconsFontAwesome5.h @@ -985,3 +985,14 @@ #define ICON_FA_CHEVRON_UP "\xEF\x81\xB7" #define ICON_FA_HAND_SPOCK "\xEF\x89\x99" #define ICON_FA_HAND_POINT_UP "\xEF\x82\xA6" + +// Unicode Characters +#define UNICODE_DEGREE "\u00B0" +#define UNICODE_PLUSMINUS "\u00B1" +#define UNICODE_MULTIPLY "\u00D7" +#define UNICODE_SUPERSCRIPT_ONE "\u00B9" +#define UNICODE_SUPERSCRIPT_TWO "\u00B2" +#define UNICODE_SUPERSCRIPT_THREE "\u00B3" +#define UNICODE_SUPERSCRIPT_MINUS "\u00AF" +#define UNICODE_HALF "\u00BD" +#define UNICODE_COPYRIGHT "\u00A9"