Unity

Merge lp:~smspillaz/unity/unity.fix_764673 into lp:unity

  1. unity.fix_764673
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 1651
Proposed branch: lp:~smspillaz/unity/unity.fix_764673
Merge into: lp:unity
Diff against target: 40 lines (+7/-1)
3 files modified
plugins/unityshell/src/BamfLauncherIcon.h (+2/-0)
plugins/unityshell/src/LauncherIcon.cpp (+3/-1)
plugins/unityshell/src/LauncherIcon.h (+2/-0)
To merge this branch: bzr merge lp:~smspillaz/unity/unity.fix_764673
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+77215@code.launchpad.net

Description of the change

Fix bug 764673

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
2--- plugins/unityshell/src/BamfLauncherIcon.h 2011-09-27 03:41:15 +0000
3+++ plugins/unityshell/src/BamfLauncherIcon.h 2011-09-27 18:27:25 +0000
4@@ -76,6 +76,8 @@
5
6 const char* BamfName();
7
8+ bool HandlesSpread () { return true; }
9+
10 private:
11 BamfApplication* m_App;
12 Launcher* _launcher;
13
14=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
15--- plugins/unityshell/src/LauncherIcon.cpp 2011-09-15 17:20:21 +0000
16+++ plugins/unityshell/src/LauncherIcon.cpp 2011-09-27 18:27:25 +0000
17@@ -197,7 +197,9 @@
18 void
19 LauncherIcon::Activate(ActionArg arg)
20 {
21- if (WindowManager::Default()->IsScaleActive())
22+ /* Launcher Icons that handle spread will adjust the spread state
23+ * accordingly, for all other icons we should terminate spread */
24+ if (WindowManager::Default()->IsScaleActive() && !HandlesSpread ())
25 WindowManager::Default()->TerminateScale();
26
27 ActivateLauncherIcon(arg);
28
29=== modified file 'plugins/unityshell/src/LauncherIcon.h'
30--- plugins/unityshell/src/LauncherIcon.h 2011-09-27 03:41:15 +0000
31+++ plugins/unityshell/src/LauncherIcon.h 2011-09-27 18:27:25 +0000
32@@ -242,6 +242,8 @@
33
34 virtual void OpenInstanceLauncherIcon(ActionArg arg) {}
35
36+ virtual bool HandlesSpread () { return false; }
37+
38 nux::BaseTexture* TextureFromGtkTheme(const char* name, int size, bool update_glow_colors = true);
39
40 nux::BaseTexture* TextureFromSpecificGtkTheme(GtkIconTheme* theme, const char* name, int size, bool update_glow_colors = true, bool is_default_theme = false);