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

Improve volume scale icons logic

Browse Source
This commit is contained in:
Rafostar
2020-09-01 12:10:55 +02:00
parent 80ac01706d
commit b401bc15ff
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
clapper_src/controls.js vendored
View File

@@ -26,10 +26,14 @@ class ClapperControls extends Gtk.HBox
value_pos: Gtk.PositionType.LEFT, value_pos: Gtk.PositionType.LEFT,
draw_value: false draw_value: false
}); });
this.positionAdjustment = this.positionScale.get_adjustment();
this.volumeButton = new Gtk.ScaleButton({ this.volumeButton = new Gtk.ScaleButton({
icons: ['audio-volume-muted-symbolic'],
size: Gtk.IconSize.SMALL_TOOLBAR size: Gtk.IconSize.SMALL_TOOLBAR
}); });
this.volumeButtonImage = this.volumeButton.get_child();
this.volumeAdjustment = this.volumeButton.get_adjustment();
this._prepareVolumeButton(); this._prepareVolumeButton();
this.toggleFullscreenButton = Gtk.Button.new_from_icon_name( this.toggleFullscreenButton = Gtk.Button.new_from_icon_name(
@@ -51,32 +55,14 @@ class ClapperControls extends Gtk.HBox
_prepareVolumeButton() _prepareVolumeButton()
{ {
this.volumeButtonAdjustment = this.volumeButton.get_adjustment(); this.volumeAdjustment.set_upper(2);
this.volumeAdjustment.set_step_increment(0.05);
this.volumeAdjustment.set_page_increment(0.05);
this.volumeButtonAdjustment.set_upper(2); this.volumeButton.connect(
this.volumeButtonAdjustment.set_step_increment(0.05); 'value-changed', this._onVolumeValueChanged.bind(this)
this.volumeButtonAdjustment.set_page_increment(0.05);
let basicIcons = [
"audio-volume-low-symbolic",
"audio-volume-medium-symbolic",
"audio-volume-medium-symbolic",
"audio-volume-high-symbolic"
];
let iconsArr = [
"audio-volume-muted-symbolic"
];
for(let icon of basicIcons)
iconsArr = this._addManyToArr(icon, iconsArr, 5);
iconsArr = this._addManyToArr(
"audio-volume-overamplified-symbolic", iconsArr, 18
); );
this.volumeButton.set_icons(iconsArr);
let popup = this.volumeButton.get_popup(); let popup = this.volumeButton.get_popup();
let box = popup.get_child(); let box = popup.get_child();
let boxChildren = box.get_children(); let boxChildren = box.get_children();
@@ -93,12 +79,22 @@ class ClapperControls extends Gtk.HBox
} }
} }
_addManyToArr(item, arr, count) _onVolumeValueChanged(widget, value)
{ {
for(let i = 0; i < count; i++) { if(value <= 0)
arr.push(item); return;
}
return arr; let iconName = (value <= 0.25)
? 'audio-volume-low-symbolic'
: (value <= 0.75)
? 'audio-volume-medium-symbolic'
: (value <= 1)
? 'audio-volume-high-symbolic'
: 'audio-volume-overamplified-symbolic';
if(this.volumeButtonImage.icon_name === iconName)
return;
this.volumeButtonImage.icon_name = iconName;
} }
}); });