Script Canvas: Fixed variable configuration panel minimizing editor (o…

…3de#16897) Signed-off-by: Luis Sempé <[email protected]>
chilltk · Oct 19, 2023 · 783c3b3 · 783c3b3
1 parent 45a7a4a
commit 783c3b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Widgets/ComboBox/ComboBoxItemModels.h
@@ -117,7 +117,10 @@ namespace GraphCanvas
             {
                 QFont sizedFont;
                 int pointSize = sizedFont.pointSize();
-                sizedFont.setPointSizeF(pointSize * m_fontScale);
+                if (pointSize >= 0)
+                {
+                    sizedFont.setPointSizeF(pointSize * m_fontScale);
+                }
                 return sizedFont;
             }
             default:

diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableConfigurationWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableConfigurationWidget.cpp
@@ -91,7 +91,6 @@ namespace ScriptCanvasEditor
                 // only emitted on container types
                 OnCreateVariable(variableType);
                 OnNameChanged(variableName.c_str());
-                accept();
             });
 
         // Tell the widget to auto create our context menu, for now

diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
@@ -251,9 +251,9 @@ namespace ScriptCanvasEditor
             GraphVariablesTableView::CopyVariableToClipboard(dockWidget->GetActiveScriptCanvasId(), varId);
         });
 
-        QAction* pasteAction = new QAction(QObject::tr("Paste").arg(variableName.c_str()), this);
-        pasteAction->setToolTip(QObject::tr("Pastes the variable currently on the clipboard").arg(variableName.c_str()));
-        pasteAction->setStatusTip(QObject::tr("Pastes the variable currently on the clipboard").arg(variableName.c_str()));
+        QAction* pasteAction = new QAction(QObject::tr("Paste %1").arg(variableName.c_str()), this);
+        pasteAction->setToolTip(QObject::tr("Pastes the variable %1 currently on the clipboard").arg(variableName.c_str()));
+        pasteAction->setStatusTip(QObject::tr("Pastes the variable %1 currently on the clipboard").arg(variableName.c_str()));
 
         pasteAction->setEnabled(GraphVariablesTableView::HasCopyVariableData());
 
@@ -763,7 +763,7 @@ namespace ScriptCanvasEditor
         }
         else
         {
-            ResetPool();            
+            ResetPool();
         }
 
         AZStd::vector<AZ::EntityId> selection;