diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-02 20:46:01 +0100 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-02 20:46:04 +0100 |
commit | b9a17f59997ced5be50c9316406cbc5791265099 (patch) | |
tree | 21296860dc21b3d418adf37b6c720db71e5dee68 /launcher/ui/widgets/JavaSettingsWidget.h | |
parent | 66f9fed2f2fccfb00ee3086637a667eca60213aa (diff) | |
parent | ab23f542c648f09e989b2fa650031e169567a3d6 (diff) | |
download | PrismLauncher-b9a17f59997ced5be50c9316406cbc5791265099.tar.gz PrismLauncher-b9a17f59997ced5be50c9316406cbc5791265099.tar.bz2 PrismLauncher-b9a17f59997ced5be50c9316406cbc5791265099.zip |
Merge branch 'upstream/develop' into develop
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/ui/widgets/JavaSettingsWidget.h')
-rw-r--r-- | launcher/ui/widgets/JavaSettingsWidget.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/launcher/ui/widgets/JavaSettingsWidget.h b/launcher/ui/widgets/JavaSettingsWidget.h index 5344e2cd..e4b7c712 100644 --- a/launcher/ui/widgets/JavaSettingsWidget.h +++ b/launcher/ui/widgets/JavaSettingsWidget.h @@ -56,6 +56,8 @@ public: int maxHeapSize() const; QString javaPath() const; + void updateThresholds(); + protected slots: void memoryValueChanged(int); @@ -85,6 +87,7 @@ private: /* data */ QSpinBox *m_maxMemSpinBox = nullptr; QLabel *m_labelMinMem = nullptr; QLabel *m_labelMaxMem = nullptr; + QLabel *m_labelMaxMemIcon = nullptr; QSpinBox *m_minMemSpinBox = nullptr; QLabel *m_labelPermGen = nullptr; QSpinBox *m_permGenSpinBox = nullptr; @@ -92,9 +95,9 @@ private: /* data */ QIcon yellowIcon; QIcon badIcon; - int observedMinMemory = 0; - int observedMaxMemory = 0; - int observedPermGenMemory = 0; + unsigned int observedMinMemory = 0; + unsigned int observedMaxMemory = 0; + unsigned int observedPermGenMemory = 0; QString queuedCheck; uint64_t m_availableMemory = 0ull; shared_qobject_ptr<JavaChecker> m_checker; |