From 80f3052c2b19eeeae1e735887fedcf20c146c1cb Mon Sep 17 00:00:00 2001
From: Bruno Herbelin <bruno.herbelin@gmail.com>
Date: Sun, 3 Mar 2024 23:18:57 +0100
Subject: [PATCH] Improv GUI selection list of Patterns for Source

Sub-menus for static and animated patterns (instead of ugly icons)
---
 src/UserInterfaceManager.cpp | 42 +++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp
index 9341333..bbdc626 100644
--- a/src/UserInterfaceManager.cpp
+++ b/src/UserInterfaceManager.cpp
@@ -3930,24 +3930,45 @@ void Navigator::RenderNewPannel(const ImVec2 &iconsize)
             ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
             if (ImGui::BeginCombo("##Pattern", "Select", ImGuiComboFlags_HeightLarge))
             {
-                if ( ImGui::Selectable("Custom gstreamer   " ICON_FA_TERMINAL) ) {
+                if ( ImGuiToolkit::SelectableIcon(16, 16, "Custom gstreamer", false) )
+                {
                     update_new_source = true;
                     generated_type = 0;
                     pattern_type = -1;
                 }
-                if ( ImGui::Selectable("Text   " ICON_FA_TERMINAL) ) {
+                if ( ImGuiToolkit::SelectableIcon(0, 13, "Text", false) )
+                {
                     update_new_source = true;
                     generated_type = 1;
                     pattern_type = -1;
                 }
-                for (int p = 0; p < (int) Pattern::count(); ++p){
-                    pattern_descriptor pattern = Pattern::get(p);
-                    std::string label = pattern.label + (pattern.animated ? "  " ICON_FA_PLAY_CIRCLE : " ");
-                    if (pattern.available && ImGui::Selectable( label.c_str(), p == pattern_type )) {
-                        update_new_source = true;
-                        generated_type = 2;
-                        pattern_type = p;
+                if (ImGui::BeginMenu(ICON_FA_CUBES "  Static patterns"))
+                {
+                    for (int p = 0; p < (int) Pattern::count(); ++p) {
+                        pattern_descriptor pattern = Pattern::get(p);
+                        if (pattern.available && !pattern.animated) {
+                            if (ImGui::Selectable(pattern.label.c_str())) {
+                                update_new_source = true;
+                                generated_type = 2;
+                                pattern_type = p;
+                            }
+                        }
                     }
+                    ImGui::EndMenu();
+                }
+                if (ImGui::BeginMenu(ICON_FA_PLAY_CIRCLE "  Animated patterns"))
+                {
+                    for (int p = 0; p < (int) Pattern::count(); ++p) {
+                        pattern_descriptor pattern = Pattern::get(p);
+                        if (pattern.available && pattern.animated) {
+                            if (ImGui::Selectable(pattern.label.c_str())) {
+                                update_new_source = true;
+                                generated_type = 2;
+                                pattern_type = p;
+                            }
+                        }
+                    }
+                    ImGui::EndMenu();
                 }
                 ImGui::EndCombo();
             }
@@ -4022,7 +4043,8 @@ void Navigator::RenderNewPannel(const ImVec2 &iconsize)
                                      IM_ARRAYSIZE(dummy_str),
                                      ImGuiInputTextFlags_ReadOnly);
                     ImGui::PopStyleColor(1);
-                } else if (ImGuiToolkit::InputTextMultiline("Text", &_contents, fieldsize, &numlines))
+                }
+                else if (ImGuiToolkit::InputTextMultiline("Text", &_contents, fieldsize, &numlines))
                     update_new_source = true;
 
                 // Local menu for list of examples