Merge lp://qastaging/~aacid/unity-2d/unity-2d-shell_rtl into lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell

Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 971
Merge reported by: Albert Astals Cid
Merged at revision: not available
Proposed branch: lp://qastaging/~aacid/unity-2d/unity-2d-shell_rtl
Merge into: lp://qastaging/~unity-2d-team/unity-2d/unity-2d-shell
Diff against target: 1009 lines (+446/-205)
16 files modified
libunity-2d-private/src/inputshaperectangle.cpp (+16/-1)
libunity-2d-private/src/inputshaperectangle.h (+4/-0)
shell/Shell.qml (+27/-9)
shell/app/shelldeclarativeview.cpp (+18/-5)
shell/app/shelldeclarativeview.h (+1/-0)
shell/common/utils.js (+8/-0)
shell/dash/HomeShortcuts.qml (+7/-0)
shell/launcher/IntelliHideBehavior.qml (+18/-4)
shell/launcher/Launcher.qml (+2/-6)
shell/launcher/LauncherLoader.qml (+8/-0)
tests/getshape/getshape.cpp (+33/-4)
tests/launcher/autohide_show_tests.rb (+2/-2)
tests/launcher/autohide_show_tests_rtl.rb (+15/-15)
tests/shell/input_shaping.rb (+15/-159)
tests/shell/input_shaping_common.rb (+180/-0)
tests/shell/input_shaping_rtl.rb (+92/-0)
To merge this branch: bzr merge lp://qastaging/~aacid/unity-2d/unity-2d-shell_rtl
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Michał Sawicz Abstain
Lohith D Shivamurthy (community) Needs Information
Review via email: mp+90455@code.qastaging.launchpad.net

Description of the change

[shell] Bring back shell to the level of RTL that current unity-2d has

Everything i can find that is missing RTL wise now seems to be fixed at https://code.launchpad.net/~haggai-eran/unity-2d/rtl-rebased/+merge/82151

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

The dash corner input mask needs to be moved and flipped horizontally.

review: Needs Fixing
942. By Albert Astals Cid

These comments were MIA for some reason D

Revision history for this message
Gerry Boland (gerboland) wrote :

Lots of your tests fail for people on MM setups, because the TmpWindow you open at (XDo::XWindow.display_geometry[0] - 10,100) is shoved to the next monitor by Metacity, and so don't overlap the Launcher.

Could you do the maths like in test "Move window positioning to check launcher action" as that one works perfectly.

Also some of your comments don't match what's going on, e.g.:

+ # Open Terminal with position 40x100
+ xid = TmpWindow.open_window_at(XDo::XWindow.display_geometry[0] - 40, 100)

Aside from these things, everything looks good!

review: Needs Fixing
943. By Albert Astals Cid

Use a different way to overlap the windows with the launcher, should work on multimonitor according to Gerry

944. By Albert Astals Cid

Return the image with the whole desktop size

945. By Albert Astals Cid

adapt to new getshape output

946. By Albert Astals Cid

merge

947. By Albert Astals Cid

Add a workaround for home shortcuts in rtl, need it so tests pass since need to click on the [x] button

948. By Albert Astals Cid

Implement mirroring

It can be made more performant but works for now

949. By Albert Astals Cid

Add the shaping rtl tests

950. By Albert Astals Cid

Use sut and other small other tools from xdotool

951. By Albert Astals Cid

Output the file in stdout if outputfilename is -

952. By Albert Astals Cid

Make getshape work in target/host divide

953. By Albert Astals Cid

Fix anchoring in rtl

954. By Albert Astals Cid

Abstract shaping tests, they are the same wheter rtl or not, just one extra if, no need to copy the code twice

955. By Albert Astals Cid

Tauler -> Dash home

956. By Albert Astals Cid

Add header

957. By Albert Astals Cid

abstract stuff so we don't have almost the same code twice

958. By Albert Astals Cid

Make it work from run-tests.rb

959. By Albert Astals Cid

Remove one space too many

Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok, i think it is ready to be reviewed again, all comments are fixed (i hope :D)

Revision history for this message
Lohith D Shivamurthy (dyams) wrote :

Hey, In his branch Haggai has swapped the left-right cursor keys while navigating in Dash. It is RTL requirement i believe.

review: Needs Information
Revision history for this message
Lohith D Shivamurthy (dyams) wrote :

Hey, it works great overall. :)

Revision history for this message
Albert Astals Cid (aacid) wrote :

@Lohith: This does not try to fix ALL of the RTL issues, just makes the shell work as unity-2d non-shell was working, as I say in the description most of Haggai's patch is still needed.

Revision history for this message
Michał Sawicz (saviq) wrote :

Wow that's a huge work on the tests, kudos!

One thing I noticed from the diff - instead of commenting out the printf(), maybe you could write it to stderr? Or just drop that line completely.

review: Needs Fixing
960. By Albert Astals Cid

Drop the printf as suggested in the MR

Revision history for this message
Albert Astals Cid (aacid) wrote :

I've dropped the printf since execute_shell_command also returns what is written to stderr.

961. By Albert Astals Cid

merge

962. By Albert Astals Cid

merge

Revision history for this message
Gerry Boland (gerboland) wrote :

Could you please my name from the copyright notices please?

The input_shaping tests needs small fixes:
- please rename input_shaping_tests.rb to input_shaping_common.rb
- please fix the require path to shell/input_shaping_common.rb. It's currently pointing to autohide stuff for the launcher.
- could you also please change
verify_true(10, "The actual shape does not match the expected shape") { identical }
to assert statements? If identical is false, it will wait 10 seconds before throwing a fail.

review: Needs Fixing
Revision history for this message
Albert Astals Cid (aacid) wrote :

Removed the names of the copyright notices, except a few ones that will come once https://code.launchpad.net/~aacid/unity-2d/unity-2d_tests_for_rtl/+merge/90849 is merged (and this one will ultraconflict with it)

Also instead of changing to "assert" changed to "verify_true(0," that was an easier change, hope you're ok with that.

963. By Albert Astals Cid

Fixes comming for the MR discussion

Revision history for this message
Michał Sawicz (saviq) wrote :

* Launcher.qml
  * please move the monitoredArea Binding up into LauncherLoader.qml
* input_shaping.rb
  * you removed the Authors completely, was that on purpose?
  * we need to kill panel twice, too
  * @@panel args are not indented properly

review: Needs Fixing
Revision history for this message
Michał Sawicz (saviq) wrote :

* input_shaping.rb
  * wrong path to autohide_show_tests_common.rb

Revision history for this message
Michał Sawicz (saviq) wrote :

We need to wait for https://code.launchpad.net/~aacid/unity-2d/unity-2d_tests_for_rtl/+merge/90849 to be merged first and rebase this afterwards.

review: Abstain
964. By Albert Astals Cid

merge

965. By Albert Astals Cid

fix path

966. By Albert Astals Cid

Kill panel twice and indent second line of args for @@panel better

Revision history for this message
Albert Astals Cid (aacid) wrote :

Requested fixes implemented

967. By Albert Astals Cid

Move the monitoredArea binding up to LauncherLoader

968. By Albert Astals Cid

merge

Revision history for this message
Albert Astals Cid (aacid) wrote :

The merge for "tests/launcher/autohide_show_tests_common.rb" and the rtl version look crazy, something is getting confused here, have a look at the individual commits (i.e. r969) to see what is happening there.

969. By Albert Astals Cid

Merge

Revision history for this message
Albert Astals Cid (aacid) wrote :

Repushed a remerge to get a much nicer diff on tests/launcher/ files

970. By Albert Astals Cid

Make getshape still write to a file and copy it over

It is safer since execute_shell_command also returns stuff from stdout and Gerry was getting some warnings that "broke" his PNG file

971. By Albert Astals Cid

Merge

Revision history for this message
Gerry Boland (gerboland) wrote :

Ok, I'm happy to approve this for merging! Nice one

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches