summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-10 14:59:00 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-10 14:18:11 +0000
commit7bcade8b7dc87762260e50a88a4bd91e7d729db3 (patch)
treeeb58e54877892e3a61095904ea8e9445dd2db2c1
parent7eefe6232e2f7a189650b36cb321135442c71f06 (diff)
Qt Designer: Fix alignment when adding new QTableWidget columns
Add a default for new items to the column editor. Amends 3ecd3398218f4bddebeb034b4914699132cd5288. Task-number: QTBUG-85513 Change-Id: Ib78a967db710f16c783610825544c31187351654 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit dde1806d113b953955986589c866885f9958adf5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/designer/src/components/taskmenu/itemlisteditor.cpp12
-rw-r--r--src/designer/src/components/taskmenu/itemlisteditor.h4
-rw-r--r--src/designer/src/components/taskmenu/tablewidgeteditor.cpp1
3 files changed, 17 insertions, 0 deletions
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index 0549f9e69..899462584 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -334,6 +334,8 @@ void ItemListEditor::on_newListItemButton_clicked()
QListWidgetItem *item = new QListWidgetItem(m_newItemText);
item->setData(Qt::DisplayPropertyRole, QVariant::fromValue(PropertySheetStringValue(m_newItemText)));
+ if (m_alignDefault != 0)
+ item->setTextAlignment(Qt::Alignment(m_alignDefault));
item->setFlags(item->flags() | Qt::ItemIsEditable);
if (row < ui.listWidget->count())
ui.listWidget->insertItem(row, item);
@@ -481,6 +483,16 @@ void ItemListEditor::updateEditor()
else
m_propertyBrowser->clear();
}
+
+uint ItemListEditor::alignDefault() const
+{
+ return m_alignDefault;
+}
+
+void ItemListEditor::setAlignDefault(uint newAlignDefault)
+{
+ m_alignDefault = newAlignDefault;
+}
} // namespace qdesigner_internal
QT_END_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index a12591b5d..640396290 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -121,6 +121,9 @@ public:
QString newItemText() const { return m_newItemText; }
void setCurrentIndex(int idx);
+ uint alignDefault() const;
+ void setAlignDefault(uint newAlignDefault);
+
signals:
void indexChanged(int idx);
void itemChanged(int idx, int role, const QVariant &v);
@@ -148,6 +151,7 @@ private:
void setPropertyBrowserVisible(bool v);
void updateEditor();
Ui::ItemListEditor ui;
+ uint m_alignDefault = 0;
bool m_updating;
QString m_newItemText;
};
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp b/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
index 0f24e00dd..3555bb5a9 100644
--- a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
@@ -51,6 +51,7 @@ TableWidgetEditor::TableWidgetEditor(QDesignerFormWindowInterface *form, QDialog
{
m_columnEditor = new ItemListEditor(form, this);
m_columnEditor->setObjectName(QStringLiteral("columnEditor"));
+ m_columnEditor->setAlignDefault(Qt::AlignCenter);
m_columnEditor->setNewItemText(tr("New Column"));
m_rowEditor = new ItemListEditor(form, this);
m_rowEditor->setObjectName(QStringLiteral("rowEditor"));