From f795e8408535f4d3d0491c120739d1825f55bba6 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Thu, 18 Apr 2024 21:30:46 +0800 Subject: Don't initialize meter mode in custom meter init functions Let the respective `MeterClass.updateMode` functions initialize the meter mode instead. The `updateMode` function is always called after the `MeterClass.init` function by `Meter_new()`. This not only simplifies the init functions of meter subclasses, but avoids the use of the global `Meter_modes` array when it's unnecessary. Signed-off-by: Kang-Che Sung --- MemorySwapMeter.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'MemorySwapMeter.c') diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c index 6aea784f..6e9f45c2 100644 --- a/MemorySwapMeter.c +++ b/MemorySwapMeter.c @@ -60,17 +60,12 @@ static void MemorySwapMeter_init(Meter* this) { if (!data->swapMeter) data->swapMeter = Meter_new(this->host, 0, (const MeterClass*) Class(SwapMeter)); - if (Meter_initFn(data->memoryMeter)) + if (Meter_initFn(data->memoryMeter)) { Meter_init(data->memoryMeter); - if (Meter_initFn(data->swapMeter)) + } + if (Meter_initFn(data->swapMeter)) { Meter_init(data->swapMeter); - - 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); } static void MemorySwapMeter_updateMode(Meter* this, int mode) { -- cgit v1.2.3