Merge lp://qastaging/~3v1n0/unity/super-tab-switcher-shortcut-interaction into lp://qastaging/unity

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 1867
Proposed branch: lp://qastaging/~3v1n0/unity/super-tab-switcher-shortcut-interaction
Merge into: lp://qastaging/unity
Diff against target: 462 lines (+128/-97)
5 files modified
manual-tests/SuperTab.txt (+22/-0)
plugins/unityshell/src/ShortcutController.cpp (+52/-34)
plugins/unityshell/src/ShortcutController.h (+10/-5)
plugins/unityshell/src/unityshell.cpp (+39/-52)
plugins/unityshell/src/unityshell.h (+5/-6)
To merge this branch: bzr merge lp://qastaging/~3v1n0/unity/super-tab-switcher-shortcut-interaction
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Tim Penhey (community) Approve
Review via email: mp+88608@code.qastaging.launchpad.net

Description of the change

Fixed the logical interaction between lp:~3v1n0/unity/super-tab-switcher and lp:~andyrock/unity/shortcut-hint as defined by design.

Plus, some code improvements and fixed an issue that caused the shortcut hint to show when pressing Super and clicking over the BFB to show the dash.

I'm wondering if we should avoid the same also when pressing over the workspace switcher.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

>Plus, some code improvements and fixed an issue that caused the shortcut hint to show when pressing Super and clicking over the BFB to show the dash.

Which issue?

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

Never mind ;)

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

173 +bool Controller::IsEnabled()
174 +{
175 + return enabled_;
176 +}
177 +
178 +void Controller::SetEnabled(bool enabled)
179 +{
180 + enabled_ = enabled;
181 +}
182 +

Why not nux::Property enabled? What do you think?

+ optionSetShowMinimizedWindowsNotify (boost::bind(&UnityScreen::optionChanged, this, _1, _2));

Remove the space, please :)

271 +
272 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
273 + sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
274 +
275 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV,
276 + sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
277 +
278 + ubus_manager_.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV,
279 + sigc::mem_fun(this, &UnityScreen::OnQuicklistEndKeyNav));

Fix the indentation...

Btw it works well.

review: Needs Fixing
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

> 173 +bool Controller::IsEnabled()
> 174 +{
> 175 + return enabled_;
> 176 +}
> 177 +
> 178 +void Controller::SetEnabled(bool enabled)
> 179 +{
> 180 + enabled_ = enabled;
> 181 +}
> 182 +
>
> Why not nux::Property enabled? What do you think?

Mh... I'd prefer using this way, but let me know what you prefer.

> + optionSetShowMinimizedWindowsNotify
> (boost::bind(&UnityScreen::optionChanged, this, _1, _2));
>
> Remove the space, please :)
>
> 271 +
> 272 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
> 273 +
> sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
> 274 +
> 275 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV,
> 276 +
> sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
> 277 +
> 278 + ubus_manager_.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV,
> 279 +
> sigc::mem_fun(this, &UnityScreen::OnQuicklistEndKeyNav));
>
> Fix the indentation...

Damned you! :D
This was an Easter egg for you! ^_^

> Btw it works well.

Nice.
Do you have any design input about how the interaction with the expo? (Should the overlay be hidden when using mouse to activate it?)

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

> > 173 +bool Controller::IsEnabled()
> > 174 +{
> > 175 + return enabled_;
> > 176 +}
> > 177 +
> > 178 +void Controller::SetEnabled(bool enabled)
> > 179 +{
> > 180 + enabled_ = enabled;
> > 181 +}
> > 182 +
> >
> > Why not nux::Property enabled? What do you think?
>
> Mh... I'd prefer using this way, but let me know what you prefer.
>

I prefer nux::Property, but let decide Tim ;)

> > + optionSetShowMinimizedWindowsNotify
> > (boost::bind(&UnityScreen::optionChanged, this, _1, _2));
> >
> > Remove the space, please :)
> >
> > 271 +
> > 272 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
> > 273 +
> > sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
> > 274 +
> > 275 + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV,
> > 276 +
> > sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
> > 277 +
> > 278 + ubus_manager_.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV,
> > 279 +
> > sigc::mem_fun(this, &UnityScreen::OnQuicklistEndKeyNav));
> >
> > Fix the indentation...
>
> Damned you! :D
> This was an Easter egg for you! ^_^
>
> > Btw it works well.
>
> Nice.
> Do you have any design input about how the interaction with the expo? (Should
> the overlay be hidden when using mouse to activate it?)

No.

Revision history for this message
Tim Penhey (thumper) wrote :

I wouldn't get too hung up on it. Your indentation is still off in a few places, but not blocking.

Perhaps this is worth writing an autopilot test for?

You would need to expose the shortcut controller :)

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Well, I guess that the autopilot test could be included into the generic launcher switcher test...

Revision history for this message
Andrea Azzarone (azzar1) :
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.