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

Merge pull request #126 from Rafostar/gestures

Browse Source 
Add side double tap gesture and update shortcuts window
This commit is contained in:
Rafał Dzięgiel
2021-08-01 10:29:08 +02:00
committed by GitHub
parent eb60d036db b2005fd34f
commit c53cde4d78
3 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/misc.js
View File

@@ -219,6 +219,19 @@ function getUriProtocol(uri)
return (arr.length > 1) ? arr[0] : null;
}
function getIsTouch(gesture)
{
const { source } = gesture.get_device();
switch(source) {
case Gdk.InputSource.PEN:
case Gdk.InputSource.TOUCHSCREEN:
return true;
default:
return false;
}
}
function encodeHTML(text)
{
return text.replace(/&/g, '&')

42
src/widget.js
View File

@@ -676,6 +676,26 @@ class ClapperWidget extends Gtk.Grid
});
}
_handleDoublePress(gesture, x, y)
{
if(!this.isFullscreenMode || !Misc.getIsTouch(gesture))
return this.toggleFullscreen();
const fieldSize = this.layoutWidth / 6;
if(x < fieldSize) {
debug('left side double press');
this.player.playlistWidget.prevTrack();
}
else if(x > this.layoutWidth - fieldSize) {
debug('right side double press');
this.player.playlistWidget.nextTrack();
}
else {
this.toggleFullscreen();
}
}
_getClickGesture()
{
const clickGesture = new Gtk.GestureClick({
@@ -767,6 +787,7 @@ class ClapperWidget extends Gtk.Grid
{
const button = gesture.get_current_button();
const isDouble = (nPress % 2 == 0);
this.isDragAllowed = !isDouble;
this.isSwipePerformed = false;
this.isLongPressed = false;
@@ -774,7 +795,7 @@ class ClapperWidget extends Gtk.Grid
switch(button) {
case Gdk.BUTTON_PRIMARY:
if(isDouble)
this.toggleFullscreen();
this._handleDoublePress(gesture, x, y);
break;
case Gdk.BUTTON_SECONDARY:
this.player.toggle_play();
@@ -788,20 +809,11 @@ class ClapperWidget extends Gtk.Grid
{
/* Reveal if touch was not a swipe/long press or was already revealed */
if(
(!this.isSwipePerformed && !this.isLongPressed)
|| this.revealerBottom.child_revealed
) {
const { source } = gesture.get_device();
switch(source) {
case Gdk.InputSource.PEN:
case Gdk.InputSource.TOUCHSCREEN:
this.revealControls();
break;
default:
break;
}
}
((!this.isSwipePerformed && !this.isLongPressed)
|| this.revealerBottom.child_revealed)
&& Misc.getIsTouch(gesture)
)
this.revealControls();
}
_onLongPressed(gesture, x, y)

9
ui/help-overlay.ui
View File

@@ -17,6 +17,7 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Toggle fullscreen</property>
<property name="subtitle" translatable="yes">Double tap | Double click</property>
<property name="accelerator">F11 f</property>
</object>
</child>
@@ -29,6 +30,7 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Reveal OSD (fullscreen only)</property>
<property name="subtitle" translatable="yes">Tap</property>
<property name="accelerator">Return</property>
</object>
</child>
@@ -63,12 +65,14 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Next item</property>
<property name="subtitle" translatable="yes">Double tap (right side)</property>
<property name="accelerator">&lt;Ctrl&gt;Right</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Previous item</property>
<property name="subtitle" translatable="yes">Double tap (left side)</property>
<property name="accelerator">&lt;Ctrl&gt;Left</property>
</object>
</child>
@@ -92,30 +96,35 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Toggle play</property>
<property name="subtitle" translatable="yes">Long press | Right click</property>
<property name="accelerator">space</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Volume up</property>
<property name="subtitle" translatable="yes">Swipe up | Scroll up</property>
<property name="accelerator">Up</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Volume down</property>
<property name="subtitle" translatable="yes">Swipe down | Scroll down</property>
<property name="accelerator">Down</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Seek forward</property>
<property name="subtitle" translatable="yes">Swipe right | Scroll right</property>
<property name="accelerator">Right</property>
</object>
</child>
<child>
<object class="GtkShortcutsShortcut">
<property name="title" translatable="yes">Seek backward</property>
<property name="subtitle" translatable="yes">Swipe left | Scroll left</property>
<property name="accelerator">Left</property>
</object>
</child>