diff options
| author | Explorer09 <explorer09@gmail.com> | 2024-04-18 21:08:54 +0800 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2024-04-20 19:36:00 +0200 |
| commit | faaf6dd25e064f4e6e73061b15547b965b353ae5 (patch) | |
| tree | 28f8e3a6e958302a29f75999039675264b9d5163 /MemorySwapMeter.c | |
| parent | 52486dbc0f056c37b8cc81bf2f8c2830d77c7d52 (diff) | |
Obsolete the CUSTOM_METERMODE use in default mode
The use of CUSTOM_METERMODE value in meter default mode was a bad
design. There are no meter that really has a "custom" mode to work with
and currently that value serves as a useless placeholder that hides the
real default mode for a meter.
Replace CUSTOM_METERMODE in `defaultMode` of all meters with the real
intended default modes. Currently only CPU meters and MemorySwapMeter
used this, and their real defaults are BAR_METERMODE.
In Meter_setMode(), remove the special treatment of `defaultMode ==
CUSTOM_METERMODE`, Meter_setMode() still calls the `updateMode` function
for custom treatment when it's present for a meter class.
As CUSTOM_METERMODE is obsolete from `defaultMode`, the init functions
of CPU meters and MemorySwapMeter need to be adjusted to avoid
incomplete initialization (Meter.draw function bring NULL).
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Diffstat (limited to 'MemorySwapMeter.c')
| -rw-r--r-- | MemorySwapMeter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c index 82eddee2..6aea784f 100644 --- a/MemorySwapMeter.c +++ b/MemorySwapMeter.c @@ -65,8 +65,10 @@ static void MemorySwapMeter_init(Meter* this) { if (Meter_initFn(data->swapMeter)) Meter_init(data->swapMeter); - if (this->mode == 0) + if (this->mode == 0) { this->mode = BAR_METERMODE; + this->draw = Meter_drawFn(this); + } this->h = MAXIMUM(Meter_modes[data->memoryMeter->mode]->h, Meter_modes[data->swapMeter->mode]->h); } @@ -97,7 +99,7 @@ const MeterClass MemorySwapMeter_class = { .delete = Meter_delete, }, .updateValues = MemorySwapMeter_updateValues, - .defaultMode = CUSTOM_METERMODE, + .defaultMode = BAR_METERMODE, .isMultiColumn = true, .name = "MemorySwap", .uiName = "Memory & Swap", |