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

Move event controllers to widget and add them to top revealer

Browse Source
This commit is contained in:
Rafał Dzięgiel
2021-02-17 16:31:37 +01:00
parent 192ccb379f
commit 12591e106f
5 changed files with 343 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls.js vendored
View File

@@ -478,13 +478,13 @@ class ClapperControls extends Gtk.Box
this.disconnect(this.realizeSignal);
this.realizeSignal = null;
const { player } = this.get_ancestor(Gtk.Grid);
const clapperWidget = this.get_ancestor(Gtk.Grid);
const scrollController = new Gtk.EventControllerScroll();
scrollController.set_flags(
Gtk.EventControllerScrollFlags.VERTICAL
| Gtk.EventControllerScrollFlags.DISCRETE
);
scrollController.connect('scroll', player._onScroll.bind(player));
scrollController.connect('scroll', clapperWidget._onScroll.bind(clapperWidget));
this.volumeButton.add_controller(scrollController);
const initialVolume = (settings.get_string('volume-initial') === 'custom')
@@ -541,8 +541,8 @@ class ClapperControls extends Gtk.Box
_onPositionScaleScroll(controller, dx, dy)
{
const { player } = this.get_ancestor(Gtk.Grid);
player._onScroll(controller, dx || dy, 0);
const clapperWidget = this.get_ancestor(Gtk.Grid);
clapperWidget._onScroll(controller, dx || dy, 0);
}
_onPositionScaleValueChanged(scale)
@@ -617,8 +617,8 @@ class ClapperControls extends Gtk.Box
/* Only happens when navigating through controls panel */
_onControlsKeyPressed(controller, keyval, keycode, state)
{
const { player } = this.get_ancestor(Gtk.Grid);
player._setHideControlsTimeout();
const clapperWidget = this.get_ancestor(Gtk.Grid);
clapperWidget._setHideControlsTimeout();
}
_onControlsKeyReleased(controller, keyval, keycode, state)