Skip to content

Commit 6700271

Browse files
committed
Qt: Use header resize mode for disc windows
1 parent 93d6fc6 commit 6700271

File tree

5 files changed

+4
-36
lines changed

5 files changed

+4
-36
lines changed

src/duckstation-qt/isobrowserwindow.cpp

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "common/log.h"
1414
#include "common/path.h"
1515

16-
#include <QtCore/QTimer>
1716
#include <QtGui/QIcon>
1817
#include <QtWidgets/QFileDialog>
1918
#include <QtWidgets/QMenu>
@@ -27,6 +26,7 @@ ISOBrowserWindow::ISOBrowserWindow(QWidget* parent) : QWidget(parent)
2726
{
2827
m_ui.setupUi(this);
2928
m_ui.splitter->setSizes({200, 600});
29+
QtUtils::SetColumnWidthsForTreeView(m_ui.fileView, {-1, 200, 100});
3030
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
3131
enableUi(false);
3232

@@ -81,18 +81,6 @@ bool ISOBrowserWindow::tryOpenFile(const QString& path, Error* error /*= nullptr
8181
return true;
8282
}
8383

84-
void ISOBrowserWindow::resizeEvent(QResizeEvent* ev)
85-
{
86-
QWidget::resizeEvent(ev);
87-
resizeFileListColumns();
88-
}
89-
90-
void ISOBrowserWindow::showEvent(QShowEvent* ev)
91-
{
92-
QWidget::showEvent(ev);
93-
resizeFileListColumns();
94-
}
95-
9684
void ISOBrowserWindow::onOpenFileClicked()
9785
{
9886
const QString path = QFileDialog::getOpenFileName(
@@ -186,11 +174,6 @@ void ISOBrowserWindow::onFileContextMenuRequested(const QPoint& pos)
186174
menu.exec(m_ui.fileView->mapToGlobal(pos));
187175
}
188176

189-
void ISOBrowserWindow::resizeFileListColumns()
190-
{
191-
QtUtils::ResizeColumnsForTreeView(m_ui.fileView, {-1, 200, 100});
192-
}
193-
194177
void ISOBrowserWindow::extractFile(const QString& path, IsoReader::ReadMode mode)
195178
{
196179
const std::string spath = path.toStdString();
@@ -365,7 +348,4 @@ void ISOBrowserWindow::populateFiles(const QString& path)
365348

366349
add_entry(full_path, entry);
367350
}
368-
369-
// this is utter shit, the scrollbar visibility doesn't update in time, so we have to queue it.
370-
QTimer::singleShot(20, Qt::CoarseTimer, this, &ISOBrowserWindow::resizeFileListColumns);
371351
}

src/duckstation-qt/isobrowserwindow.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,12 @@ class ISOBrowserWindow : public QWidget
1919

2020
bool tryOpenFile(const QString& path, Error* error = nullptr);
2121

22-
protected:
23-
void resizeEvent(QResizeEvent* ev);
24-
void showEvent(QShowEvent* ev);
25-
2622
private Q_SLOTS:
2723
void onOpenFileClicked();
2824
void onDirectoryItemClicked(QTreeWidgetItem* item, int column);
2925
void onFileItemActivated(QTreeWidgetItem* item, int column);
3026
void onFileItemSelectionChanged();
3127
void onFileContextMenuRequested(const QPoint& pos);
32-
void resizeFileListColumns();
3328

3429
private:
3530
void enableUi(bool enabled);

src/duckstation-qt/qtutils.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ static void SetColumnWidthForView(T* const view, QHeaderView* const header, cons
165165

166166
column_index++;
167167
}
168+
169+
header->setStretchLastSection(false);
168170
}
169171

170172
void QtUtils::ResizeColumnsForTableView(QTableView* view, const std::initializer_list<int>& widths)

src/duckstation-qt/selectdiscdialog.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
SelectDiscDialog::SelectDiscDialog(const std::string& disc_set_name, QWidget* parent /* = nullptr */) : QDialog(parent)
1717
{
1818
m_ui.setupUi(this);
19+
QtUtils::SetColumnWidthsForTreeView(m_ui.discList, {50, -1, 100});
1920
populateList(disc_set_name);
2021
updateStartEnabled();
2122

@@ -27,13 +28,6 @@ SelectDiscDialog::SelectDiscDialog(const std::string& disc_set_name, QWidget* pa
2728

2829
SelectDiscDialog::~SelectDiscDialog() = default;
2930

30-
void SelectDiscDialog::resizeEvent(QResizeEvent* ev)
31-
{
32-
QDialog::resizeEvent(ev);
33-
34-
QtUtils::ResizeColumnsForTreeView(m_ui.discList, {50, -1, 100});
35-
}
36-
3731
void SelectDiscDialog::onListItemActivated(const QTreeWidgetItem* item)
3832
{
3933
if (!item)

src/duckstation-qt/selectdiscdialog.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ class SelectDiscDialog final : public QDialog
1919

2020
ALWAYS_INLINE const std::string& getSelectedDiscPath() { return m_selected_path; }
2121

22-
protected:
23-
void resizeEvent(QResizeEvent* ev);
24-
2522
private Q_SLOTS:
2623
void onListItemActivated(const QTreeWidgetItem* item);
2724
void updateStartEnabled();

0 commit comments

Comments
 (0)