CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: segfault in progress dialog

Browse Source 
- dialog tries to resize after unhiding the subtask scroll area
- after resize attempts to recenter on parent
  - `calls parentWidget()->{x|y}()`
  - what if there is no parent? nullptr->() = segfault

- recenter on last pos, don't access parent

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-07-02 20:22:25 -07:00
parent c523765c19
commit 4004e0faee
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
launcher/ui/dialogs/ProgressDialog.cpp
View File

@ -34,6 +34,7 @@
*/
#include "ProgressDialog.h"
#include <qpoint.h>
#include "ui_ProgressDialog.h"
#include <limits>
@ -96,21 +97,30 @@ ProgressDialog::~ProgressDialog()
void ProgressDialog::updateSize()
{
QSize lastSize = this->size();
QSize qSize = QSize(480, minimumSizeHint().height());
QPoint lastPos = this->pos();
int minHeight = minimumSizeHint().height();
if (ui->taskProgressScrollArea->isHidden())
minHeight -= ui->taskProgressScrollArea->minimumSizeHint().height();
QSize labelMinSize = ui->globalStatusLabel->minimumSize();
int labelHeight = ui->globalStatusLabel->height();
if (labelHeight > labelMinSize.height())
minHeight += labelHeight - labelMinSize.height(); // account for multiline label
minHeight = std::max(minHeight, 0);
QSize minSize = QSize(480, minHeight);
// if the current window is too small
if ((lastSize != qSize) && (lastSize.height() < qSize.height()))
if ((lastSize != minSize) && (lastSize.height() < minSize.height()))
{
resize(qSize);
// keep the dialog in the center after a resize
this->move(
this->parentWidget()->x() + (this->parentWidget()->width() - this->width()) / 2,
this->parentWidget()->y() + (this->parentWidget()->height() - this->height()) / 2
);
resize(minSize);
QSize newSize = this->size();
QSize sizeDiff = lastSize - newSize; // last size was smaller, the results should be negative
// center on old position after resize
QPoint newPos(lastPos.x() + (sizeDiff.width() / 2), lastPos.y() + (sizeDiff.height() / 2));
this->move(newPos);
}
setMinimumSize(qSize);
setMinimumSize(minSize);
}