aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2025-11-04 19:04:56 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: use BINDABLE only with trivial setters

Browse source 
Fixes various bugs caused by the QML engine bypassing setters
when BINDABLE is specified (even if the bindable is const).
Also restructures all properties using BINDABLE to have
a default READ and WRITE to ensure this doesn't happen again.
This commit is contained in:
outfoxxed 2025-05-29 16:05:30 -07:00
parent 2e3c15f7a1
commit b67f92bc13
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
10 changed files with 167 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/services/upower/core.hpp
View file

@ -22,7 +22,7 @@ class UPower: public QObject {
public:
[[nodiscard]] UPowerDevice* displayDevice();
[[nodiscard]] ObjectModel<UPowerDevice>* devices();
QS_BINDABLE_GETTER(bool, bOnBattery, onBattery, bindableOnBattery);
[[nodiscard]] QBindable<bool> bindableOnBattery() const { return &this->bOnBattery; };
static UPower* instance();
@ -77,7 +77,7 @@ class UPowerQml: public QObject {
QSDOC_TYPE_OVERRIDE(ObjectModel<qs::service::upower::UPowerDevice>*);
Q_PROPERTY(UntypedObjectModel* devices READ devices CONSTANT);
/// If the system is currently running on battery power, or discharging.
Q_PROPERTY(bool onBattery READ onBattery NOTIFY onBatteryChanged BINDABLE bindableOnBattery);
Q_PROPERTY(bool onBattery READ default NOTIFY onBatteryChanged BINDABLE bindableOnBattery);
// clang-format on
public:
@ -85,7 +85,6 @@ public:
[[nodiscard]] UPowerDevice* displayDevice();
[[nodiscard]] ObjectModel<UPowerDevice>* devices();
[[nodiscard]] static bool onBattery() { return UPower::instance()->onBattery(); }
[[nodiscard]] static QBindable<bool> bindableOnBattery() {
return UPower::instance()->bindableOnBattery();