summaryrefslogtreecommitdiff
path: root/plugins/unityshell
diff options
authorChris Townsend <christopher.townsend@canonical.com>2014-03-12 14:20:51 -0400
committerChris Townsend <christopher.townsend@canonical.com>2014-03-12 14:20:51 -0400
commit712fc00c2bd830f82fc9238b783bdd9c27eb99b0 (patch)
tree41a52776df1fab336fa72cdd0ce99805b1a57f4f /plugins/unityshell
parented8894da66556be0f1063d7dd2ee3c83729641b0 (diff)
Fix where the new setting was not read and set upon Unity starting.
Fix a couple of unit tests based on the behavior. (bzr r3702.3.4)
Diffstat (limited to 'plugins/unityshell')
-rw-r--r--plugins/unityshell/src/unityshell.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index af09ebc3b..f81841f36 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3703,6 +3703,8 @@ void UnityScreen::initLauncher()
on_launcher_size_changed(launcher.GetPointer(), launcher->GetWidth(), launcher->GetHeight());
}
+ launcher_controller_->options()->scroll_inactive_icons = optionGetScrollInactiveIcons();
+
ScheduleRelayout(0);
}