dany/clapper
1
0
Fork 0
mirror of https://github.com/Rafostar/clapper.git synced 2025-08-30 16:02:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not show hours when duration is shorter #14

Browse Source
This commit is contained in:
Rafostar
2020-11-20 22:41:33 +01:00
parent 7ccd6ad424
commit c221f7cdb6
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
clapper_src/controls.js vendored
View File

@@ -27,8 +27,9 @@ class ClapperControls extends Gtk.Box
this.currentDuration = 0; this.currentDuration = 0;
this.isPositionDragging = false; this.isPositionDragging = false;
this.durationFormated = '00:00:00'; this.showHours = false;
this.elapsedInitial = '00:00:00/00:00:00'; this.durationFormatted = '00:00';
this.elapsedInitial = '00:00/00:00';
this.buttonsArr = []; this.buttonsArr = [];
this._addTogglePlayButton(); this._addTogglePlayButton();
@@ -98,8 +99,8 @@ class ClapperControls extends Gtk.Box
{ {
value = value || 0; value = value || 0;
let elapsed = Misc.getFormatedTime(value) let elapsed = Misc.getFormattedTime(value, this.showHours)
+ '/' + this.durationFormated; + '/' + this.durationFormatted;
this.elapsedButton.set_label(elapsed); this.elapsedButton.set_label(elapsed);
} }

11
clapper_src/misc.js
View File

@@ -68,13 +68,18 @@ function inhibitForState(state, window)
debug(`set prevent suspend to: ${isInhibited}`); debug(`set prevent suspend to: ${isInhibited}`);
} }
function getFormatedTime(time) function getFormattedTime(time, showHours)
{ {
let hours = ('0' + Math.floor(time / 3600)).slice(-2); let hours;
if(showHours || time >= 3600) {
hours = ('0' + Math.floor(time / 3600)).slice(-2);
time -= hours * 3600; time -= hours * 3600;
}
let minutes = ('0' + Math.floor(time / 60)).slice(-2); let minutes = ('0' + Math.floor(time / 60)).slice(-2);
time -= minutes * 60; time -= minutes * 60;
let seconds = ('0' + Math.floor(time)).slice(-2); let seconds = ('0' + Math.floor(time)).slice(-2);
return `${hours}:${minutes}:${seconds}`; let parsed = (hours) ? `${hours}:` : '';
return parsed + `${minutes}:${seconds}`;
} }

4
clapper_src/widget.js
View File

@@ -437,8 +437,10 @@ var Widget = GObject.registerClass({
return; return;
this.controls.currentDuration = duration; this.controls.currentDuration = duration;
this.controls.showHours = (duration >= 3600);
this.controls.positionAdjustment.set_upper(duration); this.controls.positionAdjustment.set_upper(duration);
this.controls.durationFormated = Misc.getFormatedTime(duration); this.controls.durationFormatted = Misc.getFormattedTime(duration);
this.controls.updateElapsedLabel(); this.controls.updateElapsedLabel();
} }