From 662d8bcfda8df87a4353b02de9445e3c37a79645 Mon Sep 17 00:00:00 2001
From: Bruno Herbelin <bruno.herbelin@gmail.com>
Date: Tue, 24 May 2022 23:28:36 +0200
Subject: [PATCH] Minor UI and wording changes

---
 ImGuiVisitor.cpp         | 2 +-
 InfoVisitor.cpp          | 4 +++-
 Source.cpp               | 2 +-
 UserInterfaceManager.cpp | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ImGuiVisitor.cpp b/ImGuiVisitor.cpp
index bf4749f..95d9e65 100644
--- a/ImGuiVisitor.cpp
+++ b/ImGuiVisitor.cpp
@@ -712,7 +712,7 @@ void ImGuiVisitor::visit (SessionGroupSource& s)
                               ImGuiInputTextFlags_ReadOnly);
     ImGui::PopStyleColor(1);
 
-    if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Import", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
+    if ( ImGui::Button( ICON_FA_SIGN_OUT_ALT " Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0)) )
         Mixer::manager().import( &s );
     ImGui::SameLine(0, IMGUI_SAME_LINE);
     ImGui::Text("Sources");
diff --git a/InfoVisitor.cpp b/InfoVisitor.cpp
index 99cbee5..de40043 100644
--- a/InfoVisitor.cpp
+++ b/InfoVisitor.cpp
@@ -176,6 +176,8 @@ void InfoVisitor::visit (SessionGroupSource& s)
         return;
 
     std::ostringstream oss;
+
+    if (!brief_) oss << "Group of ";
     uint N = s.session()->size();
     oss << N << " source" << (N>1 ? "s" : "");
     uint T = s.session()->numSources();
@@ -187,7 +189,7 @@ void InfoVisitor::visit (SessionGroupSource& s)
             oss << ", RGB, " << s.session()->frame()->width() << " x " << s.session()->frame()->height();
         }
         else {
-            oss << " in Group"<< std::endl;
+            oss << std::endl;
             oss << "RGB" << std::endl;
             oss << s.session()->frame()->width() << " x " << s.session()->frame()->height();
         }
diff --git a/Source.cpp b/Source.cpp
index 3c0769d..19c7bca 100644
--- a/Source.cpp
+++ b/Source.cpp
@@ -546,7 +546,7 @@ void Source::attach(FrameBuffer *renderbuffer)
     // if a symbol is available
     if (symbol_)
         // hack to place the symbols in the corner independently of aspect ratio
-        symbol_->translation_.x = 1.1f * (renderbuffer_->aspectRatio()-1.f);
+        symbol_->translation_.x = (renderbuffer_->aspectRatio() - 0.3f) / renderbuffer_->aspectRatio();
 
     // hack to place the initials in the corner independently of aspect ratio
     initial_0_->translation_.x = 0.2f - renderbuffer_->aspectRatio();
diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp
index 767f477..62400b7 100644
--- a/UserInterfaceManager.cpp
+++ b/UserInterfaceManager.cpp
@@ -983,13 +983,13 @@ void UserInterface::showMenuFile()
 
     // GROUP
     ImGui::Separator();
-    if (ImGuiToolkit::MenuItemIcon(11, 2, "Group all sources", false, Mixer::manager().numSource() > 0)) {
+    if (ImGuiToolkit::MenuItemIcon(11, 2, " Group all sources", false, Mixer::manager().numSource() > 0)) {
         // create a new group session with all sources
         Mixer::manager().groupAll();
         // switch pannel to show first source (created)
         navigator.showPannelSource(0);
     }
-    if (ImGuiToolkit::MenuItemIcon(7, 2, "Expand all groups", false, Mixer::manager().numSource() > 0)) {
+    if (ImGuiToolkit::MenuItemIcon(7, 2, " Expand all groups", false, Mixer::manager().numSource() > 0)) {
         // create a new group session with all sources
         Mixer::manager().ungroupAll();
     }
@@ -5934,7 +5934,7 @@ void Navigator::RenderSourcePannel(Source *s)
         // clone & delete buttons
         ImGui::Text(" ");
         // Action on source
-        if ( ImGui::Button( ICON_FA_SHARE_SQUARE " Clone", ImVec2(ImGui::GetContentRegionAvail().x, 0)) )
+        if ( ImGui::Button( ICON_FA_SHARE_SQUARE " Clone & Filter", ImVec2(ImGui::GetContentRegionAvail().x, 0)) )
             Mixer::manager().addSource ( Mixer::manager().createSourceClone() );
         if ( ImGui::Button( ICON_FA_BACKSPACE " Delete", ImVec2(ImGui::GetContentRegionAvail().x, 0)) ) {
             Mixer::manager().deleteSource(s);