summaryrefslogtreecommitdiffstats
path: root/src/designer/src/components/taskmenu/itemlisteditor.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-06 11:18:17 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-10 13:32:21 +0200
commit3ecd3398218f4bddebeb034b4914699132cd5288 (patch)
tree536588efad79a9e99c9ca898a4ff815b268bca2a /src/designer/src/components/taskmenu/itemlisteditor.h
parent0de5a1d53e2efa0c75c8a02a09f176a7bcc1988f (diff)
Qt Designer: Fix alignment of horizontal QTableWidget headers
The horizontal QTableWidget headers are centered by default. This is a problem since QTableWidgetItem::textAlignment() returns 0 for the default value and the header items are presented as list widget items in the editor which have default alignment. Populate the header list in the item editor correctly. Add a default value to the property manager (in the form of an attribute) and add a reset function. Also pass a default for saving. Pick-to: 6.1 5.15 Fixes: QTBUG-85513 Change-Id: I78b95515f829cfb280f19a674575c8bd91fbb948 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/components/taskmenu/itemlisteditor.h')
-rw-r--r--src/designer/src/components/taskmenu/itemlisteditor.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index 97bcb19d9..9ba6ff8df 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -86,9 +86,11 @@ private slots:
protected:
virtual int defaultItemFlags() const = 0;
- void setupProperties(PropertyDefinition *propDefs);
+ void setupProperties(const PropertyDefinition *propList,
+ Qt::Alignment alignDefault = Qt::AlignLeading | Qt::AlignVCenter);
void setupObject(QWidget *object);
- void setupEditor(QWidget *object, PropertyDefinition *propDefs);
+ void setupEditor(QWidget *object, const PropertyDefinition *propDefs,
+ Qt::Alignment alignDefault = Qt::AlignLeading | Qt::AlignVCenter);
void injectPropertyBrowser(QWidget *parent, QWidget *widget);
void updateBrowser();
virtual void setItemData(int role, const QVariant &v) = 0;
@@ -112,7 +114,8 @@ class ItemListEditor: public AbstractItemEditor
public:
explicit ItemListEditor(QDesignerFormWindowInterface *form, QWidget *parent);
- void setupEditor(QWidget *object, PropertyDefinition *propDefs);
+ void setupEditor(QWidget *object, const PropertyDefinition *propDefs,
+ Qt::Alignment alignDefault = Qt::AlignLeading | Qt::AlignVCenter);
QListWidget *listWidget() const { return ui.listWidget; }
void setNewItemText(const QString &tpl) { m_newItemText = tpl; }
QString newItemText() const { return m_newItemText; }