diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-23 11:56:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 11:56:53 +0200 |
| commit | 2283498ccb15bf6e51aafed167785a6f91fe765b (patch) | |
| tree | 40669ad4cf3780857eca7047af3b92b066263470 /launcher/ui/pages | |
| parent | f7951f6082ac21ac19bc0089d01d6c7f5b322422 (diff) | |
| parent | eed7e996da260db2c3bc7e062953bee7bb04b8e7 (diff) | |
| download | PrismLauncher-2283498ccb15bf6e51aafed167785a6f91fe765b.tar.gz PrismLauncher-2283498ccb15bf6e51aafed167785a6f91fe765b.tar.bz2 PrismLauncher-2283498ccb15bf6e51aafed167785a6f91fe765b.zip | |
Merge pull request #1552 from Trial97/memory_quick_setup
Diffstat (limited to 'launcher/ui/pages')
| -rw-r--r-- | launcher/ui/pages/global/JavaPage.cpp | 4 | ||||
| -rw-r--r-- | launcher/ui/pages/instance/InstanceSettingsPage.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/launcher/ui/pages/global/JavaPage.cpp b/launcher/ui/pages/global/JavaPage.cpp index 45d8f018..ac50319e 100644 --- a/launcher/ui/pages/global/JavaPage.cpp +++ b/launcher/ui/pages/global/JavaPage.cpp @@ -185,6 +185,7 @@ void JavaPage::updateThresholds() { auto sysMiB = Sys::getSystemRam() / Sys::mebibyte; unsigned int maxMem = ui->maxMemSpinBox->value(); + unsigned int minMem = ui->minMemSpinBox->value(); QString iconName; @@ -194,6 +195,9 @@ void JavaPage::updateThresholds() } else if (maxMem > (sysMiB * 0.9)) { iconName = "status-yellow"; ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity.")); + } else if (maxMem < minMem) { + iconName = "status-yellow"; + ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation is smaller than the minimum value")); } else { iconName = "status-good"; ui->labelMaxMemIcon->setToolTip(""); diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp index d5dbb80b..7aa6bd32 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp +++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp @@ -478,6 +478,7 @@ void InstanceSettingsPage::updateThresholds() { auto sysMiB = Sys::getSystemRam() / Sys::mebibyte; unsigned int maxMem = ui->maxMemSpinBox->value(); + unsigned int minMem = ui->minMemSpinBox->value(); QString iconName; @@ -487,6 +488,9 @@ void InstanceSettingsPage::updateThresholds() } else if (maxMem > (sysMiB * 0.9)) { iconName = "status-yellow"; ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation approaches your system memory capacity.")); + } else if (maxMem < minMem) { + iconName = "status-yellow"; + ui->labelMaxMemIcon->setToolTip(tr("Your maximum memory allocation is smaller than the minimum value")); } else { iconName = "status-good"; ui->labelMaxMemIcon->setToolTip(""); |