Patch for bringing back the MeeGo-style close gesture (swipe from top)
As the title suggests, after a little digging around I figured out a way to bring back the MeeGo-style closing gesture — swipe from any place of the top edge when there is an application on the foreground closes said application — to the Sailfish 3.
The Top Menu is still there unchanged and can be accessed by any other way (top to bottom swipe on the home screen, notifications area or lockscreen or just a tap on the status bar).
Since I'm too lazy to create openrepos package, I will just post the instructions here. All you need to do is edit /usr/share/lipstick-jolla-home-qt5/compositor.qml
The first line we're interested in is line 896
for 3.1.0:
update for 3.2 line number is 905
topAcceptMargin: Math.max(QtQuick.Screen.pixelDensity * 10, (largeScreen ? (SS.Screen.width - topMenuLayer.exposedArea.width) / 2 : Theme.itemSizeMedium))
What it does is set the areas dragging down from which triggers the closing gesture. So, as quick and dirty solution — just make it equal to the screen width.
topAcceptMargin: SS.Screen.width
And another line is 1279
for 3.1.0:
update for 3.2: line 1290
|| appLayerItem.active
If you scroll a bit higher you'll see that it is a single item in the list of possible variants for opening the top menu. Since we don't need it to open when trying to close the running app, that line can be just deleted.
And that's it.
Here are the diff file and the modified compositor.qml (it uploaded as .gz but it's actually .tar.gz). If anybody wants to create a full openrepos or patchmanager patch package — they're welcome.
thx for your work :) You can create a Patchamanger Patch very easy, no need to create rpms. Just rename your diff, zip it and upload it. Instructions are here: Patchmanager Web
jayki ( 2019-01-05 16:43:18 +0300 )editWas waiting for that! Thanks!
stephan ( 2019-01-05 21:50:33 +0300 )editAh - seems like my OS will become usable again... What a relief. ;)
ossi1967 ( 2019-01-06 12:17:05 +0300 )editCorresponding lines in Xperia X (F5122) seem to be 793 and 1163.
japsi ( 2019-01-06 14:59:51 +0300 )editErrr... I use Xperia X image too but it was exactly the lines i mentioned in my message. Maybe something to do with text wrapping?
Just in case — if you refer to the line numbering in the attached file, please note that the attached archive is actually .tar.gz, not just a .gz. Since tar just jams files together, if you open it as is, you'll just see the diff and the compositor.qml in a single file.
figgis-diggis ( 2019-01-06 15:21:58 +0300 )editThanks. Basically seek and destroy the wrong UI choice. Will try soon on Jolla Tablet, even if it's silly to have to edit the OS after that Jolla itself broke the gesture!
I published on december a Jt question about this (it's also a medium article) but there is not way to have an impact on UI choices.
minojolla ( 2019-01-06 16:09:29 +0300 )editYep, extra lines in my qml-file are from Alinas "Volume control" patch which stopped working after modification.So little bit extra work for me...
japsi ( 2019-01-06 18:42:48 +0300 )editNice. I'll try this soon. Thanks for the info!
Edit: Worked like a charm. Hopefully this also works after SFOS update Sipoonkorpi. This doesn't seem to be configurable in it...
Wizor ( 2019-01-06 22:35:21 +0300 )editdefinitely a missing option. thanks for the patch
NuklearFart ( 2019-01-09 10:27:14 +0300 )editThank you for the relieve!
deloptes ( 2019-01-11 00:19:37 +0300 )editthis workaround still works with SFOS 3.0.1.14 THANK YOU SO MUCH!!!
cg ( 2019-02-08 09:26:56 +0300 )editand still this works for SFOS 3.0.2.8 ...great!
cg ( 2019-03-29 18:53:22 +0300 )edit@cg thanks for letting us know
rozgwi ( 2019-03-29 21:37:07 +0300 )editthat means you were able to apply the patch without changes?
@rozgwi yes, I just edited the two lines as far as I remember the line numbers did not change or at least not much
cg ( 2019-04-07 13:36:10 +0300 )edit@rozgwi yes, it is still the same and it works just great
deloptes ( 2019-04-08 17:17:21 +0300 )editReally great fix and thanks for sharing. It makes the whole user experience much better for me (and it shows how annoying the recent solution really is, at least for my taste)
TrulloF ( 2019-04-23 19:31:12 +0300 )editso with 3.0.3.8 line numbers changed to 896 an 1281
cg ( 2019-04-29 23:48:02 +0300 )editMy .patch looks like this
--- /usr/share/lipstick-jolla-home-qt5/compositor.qml +++ /usr/share/lipstick-jolla-home-qt5/compositor.qml @@ -896,7 +896,7 @@ rightEnabled: Desktop.startupWizardRunning topEnabled: !Desktop.startupWizardRunning &&
!topMenuLayerItem.active // Minimum top accept margin is 10mm - topAcceptMargin: Math.max
(QtQuick.Screen.pixelDensity * 10, (largeScreen ? (SS.Screen.width -
topMenuLayer.exposedArea.width) / 2 : Theme.itemSizeMedium)) + topAcceptMargin: SS.Screen.width }
@@ -1281,7 +1281,6 @@ && DeviceLock.state <= DeviceLock.Locked && (topMenuLayerItem.active || homeLayer.active - || appLayerItem.active || alarmLayerItem.inCall || lockScreenLayerItem.active)
AND .json like this: { "name": "close-gesture", "display_name": "Close gesture revived", "description": "Bring back the classic (MeeGo/SFOS 2) close gesture for SFOS 3.0 with the new Top-Menu available only from Events View and Homescreen.\r\nOriginal work by figgis-diggis@TJC", "category": "homescreen", "sources":"", "version": "0.0.1", "compatible": ["3.0.1.11","3.0.1.14","3.0.2.8","3.0.3.8"] }
But still, patchmanager fails to install this custom made patch? any help?
peakki ( 2019-04-30 12:21:24 +0300 )editdid you regenerate the patch or have you just changed the line numbers?
rozgwi ( 2019-05-01 21:21:56 +0300 )editI don't know the syntax of diff files very well but for 3.0.1 I applied the necessary changes to a copy of the QML files an recreated the patch.
@rozgwi, I changed line numbers. I think that I have not done this all properly. Is something other needed than updated .json and .patch files located in /usr/share/patchmanager/patches/close-gesture?
peakki ( 2019-05-03 13:29:31 +0300 )edittl;dr: Sorry, no idea why it's not working.
In my experience a proper patch is important, with correct hunk references (the @'s you see in the code block).
rozgwi ( 2019-05-04 12:58:26 +0300 )editBUT for me the patch still works without changes after upgrading to Hossa.
I don't really understand all factors involved, maybe there are small differences depending on the used phone (mine is Xperia X).
yes I have also Xperia X. could you maybe send your files to me, so I can test it can I get it working
peakki ( 2019-05-05 10:52:58 +0300 )edit@peakki:
rozgwi ( 2019-05-13 14:55:39 +0300 )editI don't have time to validate it but if I remember correctly, the patch on my device is still unchanged from my post below.
But thankfully deloptes has already posted his version. does that work for you?
neat ptach - but I prefer the @cornerman's no home carousel to close app and @Ancelad's top menu control for everything else, like sending the phone to sleep.
danfin ( 2019-11-07 13:28:57 +0300 )edit