Unity

Merge lp://staging/~azzar1/unity/fix-lp-931384 into lp://staging/unity

  1. fix-lp-931384
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3459
Proposed branch: lp://staging/~azzar1/unity/fix-lp-931384
Merge into: lp://staging/unity
Diff against target: 1794 lines (+769/-307)
25 files modified
launcher/EdgeBarrierController.cpp (+130/-48)
launcher/EdgeBarrierController.h (+10/-3)
launcher/EdgeBarrierControllerPrivate.h (+10/-2)
launcher/LauncherController.cpp (+8/-7)
launcher/LauncherController.h (+2/-1)
launcher/LauncherControllerPrivate.h (+2/-2)
launcher/PointerBarrier.cpp (+2/-1)
launcher/PointerBarrier.h (+9/-0)
launcher/StandaloneLauncher.cpp (+2/-1)
panel/PanelController.cpp (+15/-5)
panel/PanelController.h (+2/-1)
panel/PanelView.cpp (+8/-0)
panel/PanelView.h (+6/-1)
plugins/unityshell/src/unityshell.cpp (+4/-2)
tests/MockWindowManager.h (+1/-0)
tests/test_edge_barrier_controller.cpp (+467/-216)
tests/test_launcher_controller.cpp (+8/-6)
tests/test_panel_controller.cpp (+36/-8)
tests/test_panel_view.cpp (+18/-0)
unity-shared/PluginAdapter.cpp (+5/-0)
unity-shared/PluginAdapter.h (+2/-0)
unity-shared/StandaloneWindowManager.cpp (+11/-0)
unity-shared/StandaloneWindowManager.h (+4/-0)
unity-shared/WindowManager.h (+2/-0)
unity-standalone/StandaloneUnity.cpp (+5/-3)
To merge this branch: bzr merge lp://staging/~azzar1/unity/fix-lp-931384
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+179205@code.staging.launchpad.net

Commit message

Add edge barriers to unity::panel::PanelView.

Description of the change

== Problem ==
Bug #931384: Window management, Launcher, multi-monitor - Windows can't be maximized on the lower display in vertically-stacked configuration

== Fix ==
Add edge barriers to panels.

== Test ==
Unit tests added.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3459
http://jenkins.qa.ubuntu.com/job/unity-ci/294/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/181
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/182

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/294/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Code looks good, but I mentioned a clean up in IRC.

When testing, I couldn't actually get the horizontal edge to hit. It was just always passing through :(. The vertical ones were working.

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote :

You need to move a window, trying to activate the grid plugin.

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

O, I was under the impression it would work the same way as the vertical edge :). As I already have the window part working, soo yay

Revision history for this message
Andrea Azzarone (azzar1) wrote :

> O, I was under the impression it would work the same way as the vertical edge
> :). As I already have the window part working, soo yay

Done.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3460
http://jenkins.qa.ubuntu.com/job/unity-ci/299/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/187

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/299/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

New functions look good :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/208/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1347/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/164/console

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/212/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/1356/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/168/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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.