* Merge Chris's branch

(bzr r3702.8.3)

2 files changed, 13 insertions, 0 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index f6cbdefaf..4ec6286ec 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -374,6 +374,8 @@ UnityScreen::UnityScreen(CompScreen* screen)
 optionSetNumLaunchersNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 optionSetLauncherCaptureMouseNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
+ optionSetScrollInactiveIconsNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+
 ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
 sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
 
@@ -3367,6 +3369,9 @@ void UnityScreen::optionChanged(CompOption* opt, UnityshellOptions::Options num)
 case UnityshellOptions::LauncherCaptureMouse:
 launcher_options->edge_resist = optionGetLauncherCaptureMouse();
 break;
+ case UnityshellOptions::ScrollInactiveIcons:
+ launcher_options->scroll_inactive_icons = optionGetScrollInactiveIcons();
+ break;
 case UnityshellOptions::BackgroundColor:
 {
 auto override_color = NuxColorFromCompizColor(optionGetBackgroundColor());
@@ -3703,6 +3708,8 @@ void UnityScreen::initLauncher()
 on_launcher_size_changed(launcher.GetPointer(), launcher->GetWidth(), launcher->GetHeight());
 });
 
+ launcher_controller_->options()->scroll_inactive_icons = optionGetScrollInactiveIcons();
+
 ScheduleRelayout(0);
 }
 
diff --git a/plugins/unityshell/unityshell.xml.in b/plugins/unityshell/unityshell.xml.in
index fd7e4ec6f..cefb87537 100644
--- a/plugins/unityshell/unityshell.xml.in
+++ b/plugins/unityshell/unityshell.xml.in
@@ -356,6 +356,12 @@
 <default>true</default>
 </option>
 
+ <option name="scroll_inactive_icons" type="bool">
+ <_short>Scroll Inactive Icon to Focus Application</_short>
+ <_long>Allows using the mouse scrollwheel to focus an application if the icon is inactive.</_long>
+ <default>true</default>
+ </option>
+
 <option name="edge_responsiveness" type="float">
 <_short>Launcher Reveal Edge Responsiveness</_short>
 <_long>A conglomerate setting that modifies the overall responsiveness of the Launcher reveal.</_long>