From 81e7c944e7ad00c23578a659f00d5dc985f4294d Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 8 Apr 2025 15:28:46 +0100 Subject: [PATCH] breakManager: Clarify some nextBreakType variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn’t introduce any functional changes, as `this._manager.currentBreakType` is set to the value returned by `this._manager.getNextBreakDue()` when entering `BreakState.BREAK_DUE`. However, it should make the code a little clearer as now the code refers to the ’next’ break type rather than the ‘current’ one in the context of an upcoming break. Signed-off-by: Philip Withnall Part-of: --- js/misc/breakManager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/misc/breakManager.js b/js/misc/breakManager.js index 06c88e06a..d9b1cb3d6 100644 --- a/js/misc/breakManager.js +++ b/js/misc/breakManager.js @@ -1190,11 +1190,11 @@ class BreakNotificationSource extends GObject.Object { if ((this._previousState === BreakState.ACTIVE || this._previousState === BreakState.DISABLED) && breakDueAgo < BREAK_OVERDUE_TIME_SECONDS) { - const durationSecs = this._manager.getDurationForBreakType(this._manager.currentBreakType); + const durationSecs = this._manager.getDurationForBreakType(nextBreakType); const [durationText, durationValue, unused] = this._formatTimeSpan(durationSecs); let titleText, bodyText; - switch (this._manager.currentBreakType) { + switch (nextBreakType) { case 'movement': titleText = _('Time for a Movement Break'); bodyText = Gettext.ngettext( @@ -1255,7 +1255,7 @@ class BreakNotificationSource extends GObject.Object { this._scheduleUpdateState(updateTimeoutSeconds); } else if (this._previousState === BreakState.IN_BREAK) { - const durationSecs = this._manager.getDurationForBreakType(this._manager.currentBreakType); + const durationSecs = this._manager.getDurationForBreakType(nextBreakType); const [countdownText, countdownValue, updateTimeoutSeconds] = this._formatTimeSpan(durationSecs - breakDueAgo); const bodyText = Gettext.ngettext( /* %s will be replaced with a string that describes a time interval, such as “2 minutes”, “40 seconds” or “1 hour” */