Merge lp:~unity-team/unity/unity.fix-lp729715 into lp:unity

Proposed by Jason Smith on 2011-03-31
Status: Merged
Merged at revision: 1056
Proposed branch: lp:~unity-team/unity/unity.fix-lp729715
Merge into: lp:unity
Diff against target: 69 lines (+21/-9)
2 files modified
src/Launcher.cpp (+15/-1)
src/Launcher.h (+6/-8)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-lp729715
Reviewer Review Type Date Requested Status
Jay Taoko (community) 2011-03-31 Approve on 2011-03-31
Review via email: mp+55799@code.launchpad.net
To post a comment you must log in.
Jay Taoko (jaytaoko) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Launcher.cpp'
2--- src/Launcher.cpp 2011-03-31 07:08:44 +0000
3+++ src/Launcher.cpp 2011-03-31 17:45:48 +0000
4@@ -278,7 +278,6 @@
5 m_LastSpreadIcon = NULL;
6
7 _current_icon = NULL;
8- _last_selected_icon = NULL;
9 _current_icon_index = -1;
10 _last_icon_index = -1;
11
12@@ -2011,6 +2010,21 @@
13 if (icon->needs_redraw_connection.connected ())
14 icon->needs_redraw_connection.disconnect ();
15
16+ if (icon == _current_icon)
17+ _current_icon = 0;
18+ if (icon == m_ActiveTooltipIcon)
19+ m_ActiveTooltipIcon = 0;
20+ if (icon == m_ActiveMenuIcon)
21+ m_ActiveMenuIcon = 0;
22+ if (icon == m_LastSpreadIcon)
23+ m_LastSpreadIcon = 0;
24+ if (icon == _icon_under_mouse)
25+ _icon_under_mouse = 0;
26+ if (icon == _icon_mouse_down)
27+ _icon_mouse_down = 0;
28+ if (icon == _drag_icon)
29+ _drag_icon = 0;
30+
31 icon->UnReference ();
32 EnsureAnimation();
33 RemoveChild (icon);
34
35=== modified file 'src/Launcher.h'
36--- src/Launcher.h 2011-03-30 09:34:07 +0000
37+++ src/Launcher.h 2011-03-31 17:45:48 +0000
38@@ -382,13 +382,15 @@
39 nux::HLayout* m_Layout;
40 int m_ContentOffsetY;
41
42+ // used by keyboard/a11y-navigation
43+ LauncherIcon* _current_icon;
44 LauncherIcon* m_ActiveTooltipIcon;
45 LauncherIcon* m_ActiveMenuIcon;
46 LauncherIcon* m_LastSpreadIcon;
47+ LauncherIcon* _icon_under_mouse;
48+ LauncherIcon* _icon_mouse_down;
49+ LauncherIcon* _drag_icon;
50
51- // used by keyboard/a11y-navigation
52- LauncherIcon* _current_icon;
53- LauncherIcon* _last_selected_icon;
54 int _current_icon_index;
55 int _last_icon_index;
56
57@@ -413,11 +415,7 @@
58 LauncherActionState _launcher_action_state;
59 LaunchAnimation _launch_animation;
60 UrgentAnimation _urgent_animation;
61- AutoHideAnimation _autohide_animation;
62-
63- LauncherIcon* _icon_under_mouse;
64- LauncherIcon* _icon_mouse_down;
65- LauncherIcon* _drag_icon;
66+ AutoHideAnimation _autohide_animation;
67
68 int _space_between_icons;
69 int _icon_size;