Improve several parts of the variant tags feature

- Update slide view variants tooltip immediately upon tag/group rename.
- Fix flicker upon first showing of the filtering dialog.
- Word wrap the "empty variants" hint text.
- Preserve groups addition order (in inspector and filter dialog).
- Use predefined colors for newly created groups.
- Add a border around tags in the timeline rows.
- Other minor relevant tweaks.

Task-number: QT3DS-3114
Change-Id: I2b345f94784fefda5fa1a004bb73dccbad2ddae9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 15 insertions, 18 deletions

diff --git a/src/Authoring/Studio/MainFrm.cpp b/src/Authoring/Studio/MainFrm.cpp
index 3069304e..0b42bb56 100644
--- a/src/Authoring/Studio/MainFrm.cpp
+++ b/src/Authoring/Studio/MainFrm.cpp
@@ -83,12 +83,8 @@ const long PLAYBACK_TIMER_TIMEOUT = 10; // 10 milliseconds
 CMainFrame::CMainFrame()
     : m_ui(new Ui::MainFrame)
     , m_remoteDeploymentSender(new RemoteDeploymentSender(this))
-    , m_sceneView(nullptr)
-    , m_recentItems(nullptr)
-    , m_paletteManager(nullptr)
     , m_updateUITimer(new QTimer)
     , m_playbackTimer(new QTimer)
-    , m_propSheet(nullptr)
 {
     m_ui->setupUi(this);
 
@@ -377,6 +373,14 @@ void CMainFrame::OnCreate()
         theDialogs->ResetSettings(theMostRecentOpen);
     }
 
+    // create the variants filtering dialog, singleShot is used so that actionGeom is calculated
+    // correctly
+    QTimer::singleShot(0, this, [&] {
+        QRect actionGeom = m_ui->m_PlaybackToolbar->actionGeometry(m_ui->actionFilterVariants);
+        m_filterVariantsDlg.reset(new FilterVariantsDlg(this, m_ui->actionFilterVariants,
+                                                        actionGeom.width()));
+    });
+
     // Create the view manager
     m_paletteManager.reset(new CPaletteManager(this));
 
@@ -1048,20 +1052,13 @@ void CMainFrame::OnPlaybackPreviewRuntime2()
 void CMainFrame::onFilterVariants()
 {
     if (m_ui->actionFilterVariants->isChecked()) {
-        QTimer::singleShot(0, [&] {
-            QRect actionGeom = m_ui->m_PlaybackToolbar->actionGeometry(m_ui->actionFilterVariants);
-            if (!m_filterVariantsDlg) {
-                m_filterVariantsDlg = new FilterVariantsDlg(this, m_ui->actionFilterVariants,
-                                                            actionGeom.width());
-            }
-
-            m_filterVariantsDlg->activateWindow();
-            m_filterVariantsDlg->raise();
-            m_filterVariantsDlg->move(m_ui->m_PlaybackToolbar->pos()
-                                      + QPoint(actionGeom.x(), actionGeom.bottom()));
-            m_filterVariantsDlg->setFocus();
-            m_filterVariantsDlg->show();
-        });
+        QRect actionGeom = m_ui->m_PlaybackToolbar->actionGeometry(m_ui->actionFilterVariants);
+        m_filterVariantsDlg->activateWindow();
+        m_filterVariantsDlg->raise();
+        m_filterVariantsDlg->move(m_ui->m_PlaybackToolbar->pos()
+                                  + QPoint(actionGeom.x(), actionGeom.bottom()));
+        m_filterVariantsDlg->setFocus();
+        m_filterVariantsDlg->show();
     } else {
         m_filterVariantsDlg->close();
     }