Merge lp://staging/~3v1n0/compiz/scale-dndtarget-workarea-shape into lp://staging/compiz/0.9.11

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Christopher Townsend
Approved revision: 3859
Merged at revision: 3861
Proposed branch: lp://staging/~3v1n0/compiz/scale-dndtarget-workarea-shape
Merge into: lp://staging/compiz/0.9.11
Diff against target: 717 lines (+273/-106)
9 files modified
debian/compiz-core.install (+0/-1)
debian/compiz-plugins-default.install (+1/-0)
debian/compiz-plugins.install (+1/-0)
debian/compiz-plugins.install.armel (+1/-0)
debian/compiz-plugins.install.armhf (+1/-0)
plugins/scale/include/scale/scale.h (+0/-1)
plugins/scale/scale.xml.in (+14/-0)
plugins/scale/src/privates.h (+10/-4)
plugins/scale/src/scale.cpp (+245/-100)
To merge this branch: bzr merge lp://staging/~3v1n0/compiz/scale-dndtarget-workarea-shape
Reviewer Review Type Date Requested Status
Christopher Townsend (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+215992@code.staging.launchpad.net

Commit message

Scale: use XShape extension to exclude dnd input in the screen-parts outside workArea

This will work property also in multi-monitor, without requiring multiple X windows for
each output device. Also don't terminate the scale unless a drag-n-drop action is not
really over.

Add a spinner that shows up over a window, during the DnD timeout.

Plus, make sure we terminate the scale without focusing the selected icon when
cancelling it and some code cleanup

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3851. By Marco Trevisan (Treviño)

Scale: add a spinner that is animated during DnD timeout

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3852. By Marco Trevisan (Treviño)

Scale: No need to create a normalCursor, screen already has one

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3853. By Marco Trevisan (Treviño)

compiz-core: remove cube image, and move it to compiz-plugins

3854. By Marco Trevisan (Treviño)

compiz-plugins-default: install the scale files

3855. By Marco Trevisan (Treviño)

Scale: fix a typo on metadata file

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
3856. By Marco Trevisan (Treviño)

Scale: damage the spinner to make sure it animates properly

3857. By Marco Trevisan (Treviño)

scale: send XdndFinished message, refusing drop if we get a drop in a thumbnail

Update the dnd version protocol to 5, to make sure clients understand our refusal.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Looks good overall, but we have the CI failure on armhf. I'm thinking this line is what is messing this up:

7 -debian/tmp/usr/share/compiz/cube/images/*.png

since this is the error:

dh_install: usr/share/compiz/cube/images/freedesktop.png exists in debian/tmp but is not installed to anywhere

Must be something special about armhf since the other archs are fine with it. Once we get a clean CI run on all archs, then I'm good with this.

review: Needs Fixing
3858. By Marco Trevisan (Treviño)

Scale: emit compiz event on terminate scale as well

It might be duplicated, but it's not a big deal

3859. By Marco Trevisan (Treviño)

debian: install the cube files inside compiz-plugins for arm* archs as well

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Ok, looks good now. +1

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