diff --git a/src/duckstation-qt/memorycardeditorwindow.cpp b/src/duckstation-qt/memorycardeditorwindow.cpp index db01e96d4..f49a49a86 100644 --- a/src/duckstation-qt/memorycardeditorwindow.cpp +++ b/src/duckstation-qt/memorycardeditorwindow.cpp @@ -52,6 +52,9 @@ MemoryCardEditorWindow::MemoryCardEditorWindow() : QWidget() m_card_b.table = m_ui.cardB; m_card_b.blocks_free_label = m_ui.cardBUsage; + QtUtils::SetColumnWidthsForTableView(m_card_a.table, {32, -1, 155, 45}); + QtUtils::SetColumnWidthsForTableView(m_card_b.table, {32, -1, 155, 45}); + createCardButtons(&m_card_a, m_ui.buttonBoxA); createCardButtons(&m_card_b, m_ui.buttonBoxB); connectUi(); @@ -114,12 +117,6 @@ bool MemoryCardEditorWindow::createMemoryCard(const QString& path, Error* error) return MemoryCardImage::SaveToFile(*data.get(), path.toUtf8().constData(), error); } -void MemoryCardEditorWindow::resizeEvent(QResizeEvent* ev) -{ - QtUtils::ResizeColumnsForTableView(m_card_a.table, {32, -1, 155, 45}); - QtUtils::ResizeColumnsForTableView(m_card_b.table, {32, -1, 155, 45}); -} - void MemoryCardEditorWindow::closeEvent(QCloseEvent* ev) { m_card_a.path_cb->setCurrentIndex(0); @@ -303,10 +300,12 @@ void MemoryCardEditorWindow::updateCardTable(Card* card) card->table->setItem(row, 1, item); item = new QTableWidgetItem(QString::fromStdString(fi.filename)); + item->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); setCardTableItemProperties(item, fi); card->table->setItem(row, 2, item); item = new QTableWidgetItem(QString::number(fi.num_blocks)); + item->setTextAlignment(Qt::AlignHCenter | Qt::AlignVCenter); setCardTableItemProperties(item, fi); card->table->setItem(row, 3, item); } diff --git a/src/duckstation-qt/memorycardeditorwindow.h b/src/duckstation-qt/memorycardeditorwindow.h index 1a5aeb47f..da082c804 100644 --- a/src/duckstation-qt/memorycardeditorwindow.h +++ b/src/duckstation-qt/memorycardeditorwindow.h @@ -31,7 +31,6 @@ public: static bool createMemoryCard(const QString& path, Error* error); protected: - void resizeEvent(QResizeEvent* ev); void closeEvent(QCloseEvent* ev); private Q_SLOTS: diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp index effb809a5..b727e18e9 100644 --- a/src/duckstation-qt/qtutils.cpp +++ b/src/duckstation-qt/qtutils.cpp @@ -153,9 +153,15 @@ static void SetColumnWidthForView(T* const view, QHeaderView* const header, cons int column_index = 0; for (const int width : widths) { - header->setSectionResizeMode(column_index, (width < 0) ? QHeaderView::Stretch : QHeaderView::Fixed); - if (width > 0) + if (width <= 0) + { + header->setSectionResizeMode(column_index, (width < 0) ? QHeaderView::Stretch : QHeaderView::ResizeToContents); + } + else + { + header->setSectionResizeMode(column_index, QHeaderView::Fixed); view->setColumnWidth(column_index, width); + } column_index++; } diff --git a/src/duckstation-qt/qtutils.h b/src/duckstation-qt/qtutils.h index e897de902..4a46d2cff 100644 --- a/src/duckstation-qt/qtutils.h +++ b/src/duckstation-qt/qtutils.h @@ -76,6 +76,7 @@ void ResizeColumnsForTableView(QTableView* view, const std::initializer_list& widths); /// For any positive values, sets the corresponding column width to the specified value. +/// Any values of 0 will set the column's width based on the content. /// Any values of -1 will stretch the column to use the remaining space. void SetColumnWidthsForTableView(QTableView* view, const std::initializer_list& widths); void SetColumnWidthsForTreeView(QTreeView* view, const std::initializer_list& widths);