Merge lp://staging/~smspillaz/unity/switcher_view_interface into lp://staging/unity

Proposed by Sam Spilsbury
Status: Rejected
Rejected by: Brandon Schaefer
Proposed branch: lp://staging/~smspillaz/unity/switcher_view_interface
Merge into: lp://staging/unity
Prerequisite: lp://staging/~smspillaz/unity/mock_switcher_controller
Diff against target: 1466 lines (+733/-139)
14 files modified
launcher/StandaloneSwitcher.cpp (+13/-13)
launcher/SwitcherController.cpp (+25/-18)
launcher/SwitcherController.h (+6/-4)
launcher/SwitcherView.cpp (+407/-32)
launcher/SwitcherView.h (+221/-41)
plugins/unityshell/src/GesturalWindowSwitcher.cpp (+9/-9)
plugins/unityshell/src/unity-switcher-accessible.cpp (+11/-11)
plugins/unityshell/src/unitya11y.cpp (+1/-1)
plugins/unityshell/src/unityshell.cpp (+1/-1)
tests/MockSwitcherController.h (+1/-1)
tests/StubSwitcherController.h (+3/-3)
tests/test-gestures/SwitcherControllerMock.h (+32/-3)
tests/test-gestures/sed_script_switcher (+2/-1)
tests/test-gestures/test_gestural_window_switcher.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~smspillaz/unity/switcher_view_interface
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) Disapprove
Brandon Schaefer (community) Needs Fixing
Review via email: mp+140683@code.staging.launchpad.net

Commit message

Pull an NVI out of SwitcherView so we can use it in testing purpose later.

Description of the change

Pull an NVI out of SwitcherView so we can use it in testing purpose later.

I know that the jury is still out on NVIs. I really don't care. I was asked to do it like this, and both virtual interfaces and nonvirtual interfaces have their merits.

Added convenience methods to replace direct access to properties within the NVI where it made sense.

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Bah.

Nux's insistence on its own pointer types actually makes this branch not-workable. WIP for now.

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

At the moment we're just using the nux view by composition then.

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

Text conflict in launcher/SwitcherController.cpp
Text conflict in launcher/SwitcherController.h
Text conflict in launcher/SwitcherView.cpp
Text conflict in launcher/SwitcherView.h
Text conflict in plugins/unityshell/src/GesturalWindowSwitcher.cpp
Text conflict in plugins/unityshell/src/unityshell.cpp
Contents conflict in tests/StubSwitcherController.h
Text conflict in tests/test-gestures/sed_script_switcher
8 conflicts encountered.

:(

review: Needs Fixing
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Not working on this as we're not putting any more substantial effort into UnityNux

review: Disapprove
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

(Someone please reject this)

Unmerged revisions

3006. By Sam Spilsbury

Use the nux view by composition

3005. By Sam Spilsbury

The object returned to use in the a11y handler is the nux one, use that

3004. By Sam Spilsbury

Pull a non-virtual interface out of SwitcherView

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.