From edd63dfd9c44e4c5ea069beb1ff3ff22ac116ab7 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 7 Aug 2025 21:26:37 +1000 Subject: [PATCH] Qt: Remove now-unused resize column helpers --- src/duckstation-qt/qtutils.cpp | 60 ---------------------------------- src/duckstation-qt/qtutils.h | 5 --- 2 files changed, 65 deletions(-) diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp index ca5391629..497cf8e1b 100644 --- a/src/duckstation-qt/qtutils.cpp +++ b/src/duckstation-qt/qtutils.cpp @@ -97,56 +97,6 @@ void QtUtils::ShowOrRaiseWindow(QWidget* window) } } -template -ALWAYS_INLINE_RELEASE static void ResizeColumnsForView(T* view, const std::initializer_list& widths) -{ - QHeaderView* header; - if constexpr (std::is_same_v) - header = view->horizontalHeader(); - else - header = view->header(); - - const int min_column_width = header->minimumSectionSize(); - const int scrollbar_width = ((view->verticalScrollBar() && view->verticalScrollBar()->isVisible()) || - view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ? - view->verticalScrollBar()->width() : - 0; - int num_flex_items = 0; - int total_width = 0; - int column_index = 0; - for (const int spec_width : widths) - { - if (!view->isColumnHidden(column_index)) - { - if (spec_width < 0) - num_flex_items++; - else - total_width += std::max(spec_width, min_column_width); - } - - column_index++; - } - - const int flex_width = - (num_flex_items > 0) ? - std::max((view->contentsRect().width() - total_width - scrollbar_width) / num_flex_items, 1) : - 0; - - column_index = 0; - for (const int spec_width : widths) - { - if (view->isColumnHidden(column_index)) - { - column_index++; - continue; - } - - const int width = spec_width < 0 ? flex_width : (std::max(spec_width, min_column_width)); - view->setColumnWidth(column_index, width); - column_index++; - } -} - template static void SetColumnWidthForView(T* const view, QHeaderView* const header, const std::initializer_list& widths) { @@ -169,16 +119,6 @@ static void SetColumnWidthForView(T* const view, QHeaderView* const header, cons header->setStretchLastSection(false); } -void QtUtils::ResizeColumnsForTableView(QTableView* view, const std::initializer_list& widths) -{ - ResizeColumnsForView(view, widths); -} - -void QtUtils::ResizeColumnsForTreeView(QTreeView* view, const std::initializer_list& widths) -{ - ResizeColumnsForView(view, widths); -} - void QtUtils::SetColumnWidthsForTableView(QTableView* view, const std::initializer_list& widths) { SetColumnWidthForView(view, view->horizontalHeader(), widths); diff --git a/src/duckstation-qt/qtutils.h b/src/duckstation-qt/qtutils.h index 4a46d2cff..fbb679382 100644 --- a/src/duckstation-qt/qtutils.h +++ b/src/duckstation-qt/qtutils.h @@ -70,11 +70,6 @@ inline void CloseAndDeleteWindow(T*& window) window = nullptr; } -/// Resizes columns of the table view to at the specified widths. A negative width will stretch the column to use the -/// remaining space. -void ResizeColumnsForTableView(QTableView* view, const std::initializer_list& widths); -void ResizeColumnsForTreeView(QTreeView* 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.