mirror of
https://github.com/Rafostar/clapper.git
synced 2025-09-01 00:41:58 +02:00
Enable scroll on volume button
This commit is contained in:
@@ -149,9 +149,6 @@ var App = GObject.registerClass({
|
||||
this.player.connectWidget(
|
||||
'button-press-event', this._onPlayerButtonPressEvent.bind(this)
|
||||
);
|
||||
this.player.connectWidget(
|
||||
'scroll-event', this._onPlayerScrollEvent.bind(this)
|
||||
);
|
||||
this.player.connectWidget(
|
||||
'enter-notify-event', this._onPlayerEnterNotifyEvent.bind(this)
|
||||
);
|
||||
@@ -212,12 +209,12 @@ var App = GObject.registerClass({
|
||||
bool = true;
|
||||
case Gdk.KEY_Left:
|
||||
// disabled due to missing "seek on drop" support
|
||||
//this._handleScaleIncrement('position', bool);
|
||||
//this.interface.controls.handleScaleIncrement('position', bool);
|
||||
break;
|
||||
case Gdk.KEY_Up:
|
||||
bool = true;
|
||||
case Gdk.KEY_Down:
|
||||
this._handleScaleIncrement('volume', bool);
|
||||
this.interface.controls.handleScaleIncrement('volume', bool);
|
||||
break;
|
||||
case Gdk.KEY_F11:
|
||||
this.window.toggleFullscreen();
|
||||
@@ -340,46 +337,6 @@ var App = GObject.registerClass({
|
||||
}
|
||||
}
|
||||
|
||||
_onPlayerScrollEvent(self, event)
|
||||
{
|
||||
let [res, direction] = event.get_scroll_direction();
|
||||
if(!res) return;
|
||||
|
||||
let type = 'volume';
|
||||
|
||||
switch(direction) {
|
||||
case Gdk.ScrollDirection.RIGHT:
|
||||
case Gdk.ScrollDirection.LEFT:
|
||||
type = 'position';
|
||||
case Gdk.ScrollDirection.UP:
|
||||
case Gdk.ScrollDirection.DOWN:
|
||||
let isUp = (
|
||||
direction === Gdk.ScrollDirection.UP
|
||||
|| direction === Gdk.ScrollDirection.RIGHT
|
||||
);
|
||||
this._handleScaleIncrement(type, isUp);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
_handleScaleIncrement(type, isUp)
|
||||
{
|
||||
let value = this.interface.controls[`${type}Scale`].get_value();
|
||||
let maxValue = this.interface.controls[`${type}Adjustment`].get_upper();
|
||||
let increment = this.interface.controls[`${type}Adjustment`].get_page_increment();
|
||||
|
||||
value += (isUp) ? increment : -increment;
|
||||
value = (value < 0)
|
||||
? 0
|
||||
: (value > maxValue)
|
||||
? maxValue
|
||||
: value;
|
||||
|
||||
this.interface.controls[`${type}Scale`].set_value(value);
|
||||
}
|
||||
|
||||
_onPlayerEnterNotifyEvent(self, event)
|
||||
{
|
||||
this.isCursorInPlayer = true;
|
||||
|
Reference in New Issue
Block a user