From 994f3827b36b9ce5428feb1009447c7cabe45570 Mon Sep 17 00:00:00 2001 From: Henning Gruendl Date: Wed, 5 Jun 2024 18:42:37 +0200 Subject: [PATCH] QmlDesigner: Make form editor color permanent Make the form editor color permanent via AuxiliaryDataType::Document instead of AuxiliaryDataType::Temporary. Also put it into the globally available AuxiliaryDataProperties. Task-number: QDS-12245 Change-Id: Ib9191f168bdbfdb09367afaeb8052d6fdbf7dad9 Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 5 ----- .../designercore/include/auxiliarydataproperties.h | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 841ac1fce1e..46c7a5cc8f4 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -324,11 +324,6 @@ void FormEditorWidget::changeRootItemHeight(const QString &heighText) } } -namespace { -constexpr AuxiliaryDataKeyView formeditorColorProperty{AuxiliaryDataType::Temporary, - "formeditorColor"}; -} - void FormEditorWidget::changeBackgound(const QColor &color) { if (color.alpha() == 0) { diff --git a/src/plugins/qmldesigner/designercore/include/auxiliarydataproperties.h b/src/plugins/qmldesigner/designercore/include/auxiliarydataproperties.h index b6bb22290a7..55eb57f2e1b 100644 --- a/src/plugins/qmldesigner/designercore/include/auxiliarydataproperties.h +++ b/src/plugins/qmldesigner/designercore/include/auxiliarydataproperties.h @@ -115,6 +115,8 @@ inline constexpr AuxiliaryDataKeyView bakeLightsManualProperty{AuxiliaryDataType "bakeLightsManual"}; inline constexpr AuxiliaryDataKeyView contextImageProperty{AuxiliaryDataType::Temporary, "contextImage"}; +inline constexpr AuxiliaryDataKeyView formeditorColorProperty{AuxiliaryDataType::Document, + "formeditorColor"}; // Most material preview aux properties are duplicated as document and instance types, as they // are both required to be persistent and used at runtime to control material preview rendering