From 692eb035ec279302870704cffa44bc3ae224a396 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Mon, 11 Jan 2021 01:29:31 +1000
Subject: [PATCH] Qt: Fix flex sizing with >1 flex column

---
 src/duckstation-qt/qtutils.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/duckstation-qt/qtutils.cpp b/src/duckstation-qt/qtutils.cpp
index 74cac9393..230e56f41 100644
--- a/src/duckstation-qt/qtutils.cpp
+++ b/src/duckstation-qt/qtutils.cpp
@@ -67,10 +67,23 @@ ALWAYS_INLINE_RELEASE static void ResizeColumnsForView(T* view, const std::initi
                                view->verticalScrollBarPolicy() == Qt::ScrollBarAlwaysOn) ?
                                 view->verticalScrollBar()->width() :
                                 0;
-  const int flex_width = std::max(view->contentsRect().width() - total_width - scrollbar_width, 1);
-
+  int num_flex_items = 0;
   int column_index = 0;
   for (const int spec_width : widths)
+  {
+    if (spec_width < 0 && !view->isColumnHidden(column_index))
+      num_flex_items++;
+
+    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))
     {
@@ -750,9 +763,9 @@ std::optional<unsigned> PromptForAddress(QWidget* parent, const QString& title,
     address = address_str.midRef(2).toUInt(&ok, 16);
   else
     address = address_str.toUInt(&ok, 16);
-  if ( code == true )
-    address = address & 0xFFFFFFFC; //disassembly address should be divisible by 4 so make sure
-  
+  if (code)
+    address = address & 0xFFFFFFFC; // disassembly address should be divisible by 4 so make sure
+
   if (!ok)
   {
     QMessageBox::critical(