From dd3bdcd3f4088afdaec060678c1f8258735945ee Mon Sep 17 00:00:00 2001 From: Nicholas Van Sickle Date: Tue, 31 Aug 2021 11:08:11 -0700 Subject: [PATCH] Fix some Qt warnings (#3731) -Fix a missing QPainter::restore call -Remove 0px font sizes from our qss, which was just getting ignored by Qt and triggering a warning Signed-off-by: nvsickle --- .../ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss | 2 -- Code/Editor/Style/NewEditorStylesheet.qss | 1 - .../AzToolsFramework/UI/Outliner/EntityOutliner.qss | 2 -- .../AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp | 1 + 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss index 1b6f04d06d..de35f91678 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/EntityOutliner.qss @@ -48,7 +48,6 @@ OutlinerCheckBox spacing: 0px; padding: 0px; line-height: 0px; - font-size: 0px; margin: 0px; background-color: none; max-height: 20px; @@ -66,7 +65,6 @@ OutlinerCheckBox::indicator spacing: 0px; padding: 0px; line-height: 0px; - font-size: 0px; margin: 0; } diff --git a/Code/Editor/Style/NewEditorStylesheet.qss b/Code/Editor/Style/NewEditorStylesheet.qss index d92ec33357..1de8634b4c 100644 --- a/Code/Editor/Style/NewEditorStylesheet.qss +++ b/Code/Editor/Style/NewEditorStylesheet.qss @@ -2505,7 +2505,6 @@ OutlinerCheckBox spacing: 0px; padding: 0px; line-height: 0px; - font-size: 0px; margin: 2px 2px 0 2px; background-color: none; max-height: 20px; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss index 8e569eb134..15ff8b1b67 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutliner.qss @@ -43,7 +43,6 @@ AzToolsFramework--EntityOutlinerCheckBox padding: 0; padding-right: 2px; line-height: 0px; - font-size: 0px; margin: 0px; max-height: 20px; max-width: 18px; @@ -59,7 +58,6 @@ AzToolsFramework--EntityOutlinerCheckBox::indicator spacing: 0px; padding: 0px; line-height: 0px; - font-size: 0px; margin: 3px 0 0 0; max-width: 18px; width: 18px; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp index 708a6d9b13..73a28a3edc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/LevelRootUiHandler.cpp @@ -99,5 +99,6 @@ namespace AzToolsFramework // Draw border at the bottom painter->drawLine(rect.bottomLeft(), rect.bottomRight()); + painter->restore(); } }