Merge lp:~josharenson/unity8/fix-over-eager-scope-swipe into lp:unity8
- fix-over-eager-scope-swipe
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Albert Astals Cid | ||||
Approved revision: | 2401 | ||||
Merged at revision: | 2444 | ||||
Proposed branch: | lp:~josharenson/unity8/fix-over-eager-scope-swipe | ||||
Merge into: | lp:unity8 | ||||
Diff against target: |
19 lines (+8/-1) 1 file modified
qml/Shell.qml (+8/-1) |
||||
To merge this branch: | bzr merge lp:~josharenson/unity8/fix-over-eager-scope-swipe | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Unity8 CI Bot | continuous-integration | Approve | |
Albert Astals Cid (community) | Approve | ||
Review via email: mp+288589@code.launchpad.net |
Commit message
Disable showDash when it is already shown.
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
Not exactly...
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
Albert Astals Cid (aacid) wrote : | # |
This does not seem to affect the case the bug is about (i.e. being on a non favorited scope and showing the launcher).
I put a console.log in that function and it doesn't seem to be triggered in that scenario.
Albert Astals Cid (aacid) : | # |
Josh Arenson (josharenson) wrote : | # |
@Albert, really? I'm seeing it hit that code ever time I swipe the launcher, including on non-favorited scopes...
Albert Astals Cid (aacid) wrote : | # |
Ok, i'll try again, maybe i didn't do it right :D
Albert Astals Cid (aacid) wrote : | # |
I'm not sure we're testing the same thing you are, this is what i did:
* Flash phone
* edit /usr/share/
* add console.
* restart unity8-dash
* tailf .cache/
* go to app scope
* open the ubuntu store
* check it's not a favorite scope
* do a long left swipe
* check that onDashSwipeChanged wasn't printed to the log
Albert Astals Cid (aacid) wrote : | # |
Andrea pointed out that i need to restart unity8 and not unity8-dash, my bad.
Albert Astals Cid (aacid) wrote : | # |
This fixes the "over eager" swipe by totally removing it. I'd say that what should happen is that when unity8-dash is shown the distance to trigger trigger is a bit longer, but people should still be able to do what they do nowadays.
Josh Arenson (josharenson) wrote : | # |
I arrived at the value I chose, units.gu(12), by trial and error. It _should_ always be a reasonable value, but if you have other ideas, I'm open to them.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2228
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
I guess this is good enough for now.
Will have to reevaluate the whole thing when we move to the browser-like scopes
* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
Yes (except previously broken autopilot)
* Did you make sure that the branch does not contain spurious tags?
Yes
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2228
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2228
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2228
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
Text conflict in qml/Shell.qml
1 conflicts encountered.
Note to self: Was already top approved
- 2342. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2343. By Lukáš Tinkl
-
Hide the close button for dash Fixes: #1550056, #1564347
Approved by: Josh Arenson - 2344. By Lukáš Tinkl
-
Unity8 windows now cascade instead of opening all in the top left corner Fixes: #1513813
Approved by: Lukáš Tinkl - 2345. By Lukáš Tinkl
-
Notifications visual update, close button on mouse hover Fixes: #1564343
Approved by: Michael Zanetti - 2346. By Lukáš Tinkl
-
Shell visual update
Approved by: Albert Astals Cid - 2347. By Lukáš Tinkl
-
Drop OOBE wizard autopilot tests
Approved by: Michael Terry - 2348. By Lukáš Tinkl
-
Stabilize wizard tests
Approved by: Albert Astals Cid - 2349. By Lukáš Tinkl
-
Fix labels in desktop spread
- 2350. By Lukáš Tinkl
-
Fix upcoming event ETAs falling out of sync Fixes: #1557571
- 2351. By Albert Astals Cid
-
LVWPH: Account for contentHeight not really being "all" of the content height
m_minYExtent is also part of the content height Fixes: #1569976
Approved by: Michael Zanetti - 2352. By Albert Astals Cid
-
rootObject can be null for a small moment after setSource is called
Fixes: #1560501
Approved by: Daniel d'Andrada - 2353. By Albert Astals Cid
-
forceLayout before calling positionViewAtIndex
We need the list size to be correctly updated before positionViewAtIndex
This needs https:/
/bugs.launchpad .net/ubuntu/ +source/ qtdeclarative- opensource- src/+bug/ 1556842 to actually work Fixes: #1553475
Approved by: Michael Zanetti - 2354. By Albert Astals Cid
-
Compile with Qt 5.6
And actually emit the signal Fixes: #1565632
Approved by: Timo Jyrinki, Michael Zanetti - 2355. By Albert Astals Cid
-
Turn verify intro tryCompareFunction
Approved by: Michael Zanetti - 2356. By Albert Astals Cid
-
Better error message if the item does not exist
Instead of
Cannot read property 'width' of null
and a line pointing to UnityTestCase.qml, you get
No item given
and a line pointing to the offending code
Approved by: Michael Terry - 2357. By Albert Astals Cid
-
See all/less -> Show all/less
Fixes: #1349471
Approved by: Andrea Cimitan - 2358. By Albert Astals Cid
-
Add env var to enable js debugging/profiling even if not built on debug mode
Approved by: Michael Zanetti
- 2359. By Albert Astals Cid
-
CardCreator: Remove ShaderEffectSource
Seems we don't really need it (can't see any regression without it) and it fixes the weird flickering of the appstore card when changing departments Fixes: #1544875
Approved by: Josh Arenson - 2360. By Albert Astals Cid
-
Take into account that sectionItem height can change
Approved by: Josh Arenson
- 2361. By Albert Astals Cid
-
NotificationAudio: We don't need weird "ifdef" for multimedia 5.6 vs 5.0 roles anymore
Approved by: Michael Zanetti - 2362. By Albert Astals Cid
-
Stabilize test_superTabTo
CycleLauncher Approved by: Michael Terry
- 2363. By Michael Zanetti
-
install devices.conf by default
Approved by: Michael Terry - 2364. By Michael Zanetti
-
improve the pin lockscreen
On smallish screens, like the BQ E4.5, it frequently happens that one
misses a digit when quickly entering the pin. After a while of debugging
usage on my phone I noticed that the cause of this is actually that the
user keeps moving the finger while touching the buttons and so it
often happens that the touch events are not recognized as clicks.I've been using this patch for a while now and it increased the reliability
of the pin entry a lot. I've also asked other people who reported the issue
to test this and feedback has been rather good.
Approved by: Michael Terry - 2365. By Michael Zanetti
-
Drop the rotation lock for the dash Fixes: #1465331, #1574165
Approved by: Lukáš Tinkl - 2366. By Michael Terry
-
Fix some unreliable test code.
Approved by: Albert Astals Cid - 2367. By Michael Terry
-
Ignore Home Key presses when the greeter is up.
This avoids pocket presses / dialing on devices like the arale. Fixes: #1565818
Approved by: Daniel d'Andrada - 2368. By Josh Arenson
-
Change the color of the activity pulse to blue Fixes: #1568082
Approved by: Michael Terry - 2369. By Josh Arenson
-
Make scope filter settings button the same color as other foreground elements Fixes: #1563357
Approved by: Albert Astals Cid - 2370. By Ted Gould
-
Switch to using uid/pwdent for getting username
Approved by: Michael Terry - 2371. By Daniel van Vugt
-
Reinstate the touch performance/
smoothness fix
(LP: #1486341, LP: #1556763).It never really went away, but someone accidentally moved it out of
pre-start and into post-start where it has no effect. Fixes: #1556763
Approved by: Timo Jyrinki, Daniel d'Andrada - 2372. By CI Train Bot Account
-
Releasing 8.12+16.
04.20160427. 3-0ubuntu1 - 2373. By CI Train Bot Account
-
Resync trunk.
- 2374. By Gerry Boland
-
Indicators: set menu height binding while fully open/closed, fixes dynamic grid unit bug.
Before this, if the grid units changed, the menu "height" remained fixed, but minimizedPanelH
eight and openedHeight would adapt. This would mean for case phone (GU 22) to desktop (GU8):
a. if the menu was closed, it would remain at the old height (3*22=66pixels), while the panel would shrink (3*8 = 24). This would mean the menu was technically open, and would block input to windows
b. if the menu was opened, it would remain open at the old phone height, and not grow to the new screen height.
Approved by: Michael Terry - 2375. By Michael Zanetti
-
Temporary means to override GUs on the internal screen
Approved by: Lukáš Tinkl - 2376. By Daniel d'Andrada
-
Refactor screenshotting code and make it work in multimonitor scenarios
+ Workaround bug in QWindow regrading "visible" property when moving a window between screens.
+ Implement snapshotting the focused window with Alt+PrtScn
Approved by: Lukáš Tinkl - 2377. By Daniel d'Andrada
-
Make shell rotation animation work on multimonitor scenarios.
Fixes the Shell snapshotting code, used in ninety-degrees rotation animations, to work on multimonitor scenarios.
Approved by: Lukáš Tinkl - 2378. By Daniel d'Andrada
-
Ensure shell transformations use bindings as OrientedShell can get resized
Approved by: Michael Zanetti - 2379. By Michael Zanetti
-
reduce some paint layers.
This will reduce overdraw by 2 layers when apps are focused, by 1 layer when
in spread.
Approved by: Michael Terry - 2380. By Michael Zanetti
-
Call the dash sizing hack when units.gu changes
Approved by: Gerry Boland - 2381. By CI Train Bot Account
-
Releasing 8.12+16.
04.20160429. 2-0ubuntu1 - 2382. By CI Train Bot Account
-
Resync trunk.
- 2383. By Andrea Cimitan
-
Add social actions to cards
Approved by: Josh Arenson - 2384. By Albert Astals Cid
-
Pass the category correctly
Approved by: Pawel Stolowski
- 2385. By Albert Astals Cid
-
Make the previewActions react to the actions model changing
i.e. use a binding instead of a direct assingment Fixes: #1485887
Approved by: Andrea Cimitan - 2386. By Albert Astals Cid
-
Update the icon also to the original one if that's what the scope wants
Approved by: Andrea Cimitan
- 2387. By Albert Astals Cid
-
Reload Preview Zoomable Image source if it gets updated
Approved by: Michael Zanetti
- 2388. By CI Train Bot Account
-
Make the previewActions react to the actions model changing
i.e. use a binding instead of a direct assingment Fixes: #1485887
Approved by: Andrea Cimitan - 2389. By CI Train Bot Account
-
Update the icon also to the original one if that's what the scope wants
Approved by: Andrea Cimitan
- 2390. By CI Train Bot Account
-
Reload Preview Zoomable Image source if it gets updated
Approved by: Michael Zanetti
- 2391. By Albert Astals Cid
-
Expandable Filter Widget
Approved by: Andrea Cimitan, Pawel Stolowski - 2392. By CI Train Bot Account
-
Releasing 8.12+16.
04.20160504. 2-0ubuntu1 - 2393. By CI Train Bot Account
-
Resync trunk.
- 2394. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2395. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2396. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2397. By Daniel d'Andrada
-
Move prompt surfaces from MirSurface to Application
prompt surfaces can show up even before an application creates its first surface
- 2398. By CI Train Bot Account
-
Releasing 8.12+16.
04.20160518. 1-0ubuntu1 - 2399. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
- 2400. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2230
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 2401. By Josh Arenson
-
Fix mess
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2401
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Albert Astals Cid (aacid) wrote : | # |
Merges fine again.
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2401
https:/
Executed test runs:
UNSTABLE: https:/
SUCCESS: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2401
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2401
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file 'qml/Shell.qml' |
2 | --- qml/Shell.qml 2016-04-29 20:06:54 +0000 |
3 | +++ qml/Shell.qml 2016-05-23 16:20:43 +0000 |
4 | @@ -552,7 +552,14 @@ |
5 | id: launcher |
6 | objectName: "launcher" |
7 | |
8 | - readonly property bool dashSwipe: progress > 0 |
9 | + /* |
10 | + * Since the Dash doesn't have the same controll over surfaces that the |
11 | + * Shell does, it can't slowly move the scope out of the way, as the shell |
12 | + * does with apps, and the dash is show instantly. This allows for some |
13 | + * leeway and prevents accidental home swipes. |
14 | + */ |
15 | + readonly property real offset: shell.focusedApplicationId == "unity8-dash" ? units.gu(12) : 0 |
16 | + readonly property bool dashSwipe: progress > offset |
17 | |
18 | anchors.top: parent.top |
19 | anchors.topMargin: inverted ? 0 : panel.panelHeight |
FAILED: Continuous integration, rev:2226 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/643/ /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= vivid+overlay, testname= qmluitests. sh/365 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= xenial, testname= qmluitests. sh/365 /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= autopilot. sh/365 /unity8- jenkins. ubuntu. com/job/ build-0- fetch/848 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 864 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 864 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 862/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 862/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 862/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 862/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 862/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 862 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 862/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
UNSTABLE: https:/
UNSTABLE: https:/
UNSTABLE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/643/ rebuild
https:/