Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-27 08:05:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix flex sizing with >1 flex column

Browse source
This commit is contained in:
Connor McLaughlin 2021-01-11 01:29:31 +10:00
parent 25847494d5
commit 692eb035ec
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/duckstation-qt/qtutils.cpp
View file

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