Merge with trunk

(bzr r3506.6.16)

11 files changed, 21 insertions, 19 deletions

diff --git a/launcher/BFBLauncherIcon.cpp b/launcher/BFBLauncherIcon.cpp
index 15fe55cd3..d73bcac5c 100644
--- a/launcher/BFBLauncherIcon.cpp
+++ b/launcher/BFBLauncherIcon.cpp
@@ -42,7 +42,7 @@ BFBLauncherIcon::BFBLauncherIcon(LauncherHideMode hide_mode)
 
 background_color_ = nux::color::White;
 
- mouse_enter.connect([&](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL); });
+ mouse_enter.connect([this](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL); });
 ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::bind(sigc::mem_fun(this, &BFBLauncherIcon::OnOverlayShown), true));
 ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::bind(sigc::mem_fun(this, &BFBLauncherIcon::OnOverlayShown), false));
 }
diff --git a/launcher/EdgeBarrierController.cpp b/launcher/EdgeBarrierController.cpp
index f310b24de..2c12e4610 100644
--- a/launcher/EdgeBarrierController.cpp
+++ b/launcher/EdgeBarrierController.cpp
@@ -87,7 +87,7 @@ EdgeBarrierController::Impl::Impl(EdgeBarrierController *parent)
 ResizeBarrierList(monitors);
 
 /* FIXME: Back to c++11 lambda once we get sigc::track_obj.
- uscreen->changed.connect(sigc::track_obj(([&](int primary, std::vector<nux::Geometry>& layout) {
+ uscreen->changed.connect(sigc::track_obj(([this](int primary, std::vector<nux::Geometry>& layout) {
 ResizeBarrierList(layout);
 SetupBarriers(layout);
 }));*/
@@ -106,9 +106,9 @@ EdgeBarrierController::Impl::Impl(EdgeBarrierController *parent)
 return false;
 });
 
- parent_->options.changed.connect([&](launcher::Options::Ptr options) {
+ parent_->options.changed.connect([this](launcher::Options::Ptr options) {
 /* FIXME: Back to c++11 lambda once we get sigc::track_obj.
- options->option_changed.connect([&]() {
+ options->option_changed.connect([this]() {
 SetupBarriers(UScreen::GetDefault()->GetMonitors());
 });*/
 options->option_changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnOptionsChanged));
diff --git a/launcher/EdgeBarrierController.h b/launcher/EdgeBarrierController.h
index d55ffb49d..eb91f7df7 100644
--- a/launcher/EdgeBarrierController.h
+++ b/launcher/EdgeBarrierController.h
@@ -36,6 +36,7 @@ struct EdgeBarrierSubscriber
 NEEDS_RELEASE
 };
 
+ virtual ~EdgeBarrierSubscriber() {}
 virtual Result HandleBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event) = 0;
 };
 
diff --git a/launcher/FavoriteStoreGSettings.cpp b/launcher/FavoriteStoreGSettings.cpp
index a9759917e..415a04bfe 100644
--- a/launcher/FavoriteStoreGSettings.cpp
+++ b/launcher/FavoriteStoreGSettings.cpp
@@ -49,7 +49,7 @@ FavoriteStoreGSettings::FavoriteStoreGSettings()
 : ignore_signals_(false)
 , settings_(g_settings_new(SETTINGS_NAME.c_str()))
 {
- favorites_changed_.Connect(settings_, "changed::"+SETTINGS_KEY, [&] (GSettings*, gchar*)
+ favorites_changed_.Connect(settings_, "changed::"+SETTINGS_KEY, [this] (GSettings*, gchar*)
 {
 Changed();
 });
diff --git a/launcher/Launcher.cpp b/launcher/Launcher.cpp
index 30f732bd9..f881703d3 100644
--- a/launcher/Launcher.cpp
+++ b/launcher/Launcher.cpp
@@ -1638,12 +1638,6 @@ void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 
 nux::Color clear_colour = nux::Color(0x00000000);
 
- if (Settings::Instance().GetLowGfxMode())
- {
- clear_colour = options()->background_color;
- clear_colour.alpha = 1.0f;
- }
-
 // clear region
 GfxContext.PushClippingRectangle(base);
 gPainter.PushDrawColorLayer(GfxContext, base, clear_colour, true, ROP);
@@ -1776,6 +1770,12 @@ void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
 gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
 }
 }
+ else
+ {
+ nux::Color color = options()->background_color;
+ color.alpha = 1.0f;
+ gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
+ }
 
 GfxContext.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
diff --git a/launcher/LauncherDragWindow.h b/launcher/LauncherDragWindow.h
index 0d561dd47..f7a37f952 100644
--- a/launcher/LauncherDragWindow.h
+++ b/launcher/LauncherDragWindow.h
@@ -42,7 +42,7 @@ public:
 typedef std::function<void(nux::GraphicsEngine&, nux::ObjectPtr<nux::IOpenGLBaseTexture> const&)> DeferredIconRenderer;
 
 LauncherDragWindow(unsigned size, DeferredIconRenderer const&);
- ~LauncherDragWindow();
+ virtual ~LauncherDragWindow();
 
 void SetAnimationTarget(int x, int y);
 void StartQuickAnimation();
diff --git a/launcher/LauncherHideMachine.cpp b/launcher/LauncherHideMachine.cpp
index c057c2c05..f348778de 100644
--- a/launcher/LauncherHideMachine.cpp
+++ b/launcher/LauncherHideMachine.cpp
@@ -39,7 +39,7 @@ LauncherHideMachine::LauncherHideMachine()
 , _should_hide(false)
 , _latest_emit_should_hide(false)
 {
- decaymulator_.value.changed.connect([&](int value) { reveal_progress = value / static_cast<float>(reveal_pressure); });
+ decaymulator_.value.changed.connect([this](int value) { reveal_progress = value / static_cast<float>(reveal_pressure); });
 edge_decay_rate.changed.connect(sigc::mem_fun (this, &LauncherHideMachine::OnDecayRateChanged));
 }
 
@@ -68,7 +68,7 @@ void LauncherHideMachine::SetShouldHide(bool value, bool skip_delay)
 if (value && !skip_delay)
 {
 _hide_delay_timeout.reset(new glib::Timeout(HIDE_DELAY_TIMEOUT_LENGTH));
- _hide_delay_timeout->Run([&] () {
+ _hide_delay_timeout->Run([this] () {
 EnsureHideState(true);
 return false;
 });
diff --git a/launcher/LauncherIcon.cpp b/launcher/LauncherIcon.cpp
index 21930cc0b..7e5679ec9 100644
--- a/launcher/LauncherIcon.cpp
+++ b/launcher/LauncherIcon.cpp
@@ -124,7 +124,7 @@ void LauncherIcon::LoadQuicklist()
 _quicklist = new QuicklistView();
 AddChild(_quicklist.GetPointer());
 
- _quicklist->mouse_down_outside_pointer_grab_area.connect([&] (int x, int y, unsigned long button_flags, unsigned long key_flags)
+ _quicklist->mouse_down_outside_pointer_grab_area.connect([this] (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
 _allow_quicklist_to_show = false;
 });
diff --git a/launcher/SwitcherController.cpp b/launcher/SwitcherController.cpp
index 2b80e7fce..05ba0d7c2 100644
--- a/launcher/SwitcherController.cpp
+++ b/launcher/SwitcherController.cpp
@@ -301,7 +301,7 @@ Controller::Impl::Impl(Controller* obj,
 };
 
 // TODO We need to get actual timing data to suggest this is necessary.
- //sources_.AddTimeoutSeconds(construct_timeout_, [&] { ConstructWindow(); return false; }, LAZY_TIMEOUT);
+ //sources_.AddTimeoutSeconds(construct_timeout_, [this] { ConstructWindow(); return false; }, LAZY_TIMEOUT);
 
 fade_animator_.updated.connect([this] (double opacity) {
 if (view_window_)
@@ -345,8 +345,8 @@ void Controller::Impl::Show(ShowMode show, SortMode sort, std::vector<AbstractLa
 
 if (real_wait > 0)
 {
- sources_.AddIdle([&] { ConstructView(); return false; }, VIEW_CONSTRUCT_IDLE);
- sources_.AddTimeout(real_wait, [&] { ShowView(); return false; }, SHOW_TIMEOUT);
+ sources_.AddIdle([this] { ConstructView(); return false; }, VIEW_CONSTRUCT_IDLE);
+ sources_.AddTimeout(real_wait, [this] { ShowView(); return false; }, SHOW_TIMEOUT);
 }
 else
 {
diff --git a/launcher/SwitcherControllerImpl.h b/launcher/SwitcherControllerImpl.h
index 1088208c8..2bba90e99 100644
--- a/launcher/SwitcherControllerImpl.h
+++ b/launcher/SwitcherControllerImpl.h
@@ -44,6 +44,7 @@ struct Controller::Impl : public sigc::trackable
 Impl(Controller* obj,
 unsigned int load_timeout,
 Controller::WindowCreator const& create_window);
+ virtual ~Impl() {}
 
 void Show(ShowMode show, SortMode sort, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
 void Hide(bool accept_state);
diff --git a/launcher/TooltipManager.cpp b/launcher/TooltipManager.cpp
index 94044b0a4..3fab52457 100644
--- a/launcher/TooltipManager.cpp
+++ b/launcher/TooltipManager.cpp
@@ -86,7 +86,7 @@ void TooltipManager::Reset()
 void TooltipManager::ResetTimer(AbstractLauncherIcon::Ptr const& icon_under_mouse)
 {
 hover_timer_.reset(new glib::Timeout(TOOLTIPS_SHOW_TIMEOUT_LENGTH));
- hover_timer_->Run([&] () {
+ hover_timer_->Run([this, icon_under_mouse] () {
 skip_timeout_ = true;
 icon_under_mouse->ShowTooltip();
 return false;