Merge lp:~brandontschaefer/unity/alt-tab-mouse-fixes into lp:unity

Proposed by Brandon Schaefer
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3496
Proposed branch: lp:~brandontschaefer/unity/alt-tab-mouse-fixes
Merge into: lp:unity
Diff against target: 37 lines (+15/-0)
1 file modified
launcher/SwitcherView.cpp (+15/-0)
To merge this branch: bzr merge lp:~brandontschaefer/unity/alt-tab-mouse-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Christopher Townsend Approve
Review via email: mp+184690@code.launchpad.net

Commit message

Make sure we ignore mouse movement over detail icons if the mouse starts over it at start. Let the mouse take selection control once it moves outside of any icon, vs having to enter a different icon.

Description of the change

Couple small fixes:

- Make sure we ignore mouse movement over detail icons if the mouse starts over it at start.
- Let the mouse take selection control once it moves outside of any icon, vs having to enter a different icon.

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

I'm not sure we need to fix bug #1223037... While that was important for the normal mode (due to the accordion effect), the detail mode seems different. But I guess design has a better opinion for that.

Revision history for this message
Christopher Townsend (townsend) wrote :

I'm going to approve although I have an issue on start of Alt+Tab or Alt+Grave, but I'll open a new bug for that so we can discuss with design if the behavior should change, and if so, how.

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

Err... lets try again

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 :

Re-approving now that the Jenkins C-I failures are now fixed in trunk.

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
1=== modified file 'launcher/SwitcherView.cpp'
2--- launcher/SwitcherView.cpp 2013-09-05 16:51:12 +0000
3+++ launcher/SwitcherView.cpp 2013-09-09 23:20:22 +0000
4@@ -251,11 +251,22 @@
5 nux::Point const& mouse_pos = CalculateMouseMonitorOffset(x, y);
6 int detail_icon_index = DetailIconIdexAt(mouse_pos.x, mouse_pos.y);
7
8+ if (check_mouse_first_time_)
9+ {
10+ last_detail_icon_selected_ = detail_icon_index;
11+ check_mouse_first_time_ = false;
12+ return;
13+ }
14+
15 if (detail_icon_index >= 0 && detail_icon_index != last_detail_icon_selected_)
16 {
17 model_->detail_selection_index = detail_icon_index;
18 last_detail_icon_selected_ = detail_icon_index;
19 }
20+ else if (detail_icon_index < 0)
21+ {
22+ last_detail_icon_selected_ = -1;
23+ }
24 }
25
26 void SwitcherView::HandleMouseMove(int x, int y)
27@@ -283,6 +294,10 @@
28
29 switcher_mouse_move.emit(icon_index);
30 }
31+ else if (icon_index < 0)
32+ {
33+ last_icon_selected_ = -1;
34+ }
35 }
36
37 void SwitcherView::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long /*key_flags*/)