Still hunting for the right spot to tweak the padding for dash-scollbars... added debug-rects again

(bzr r2057.6.1)

3 files changed, 17 insertions, 2 deletions

diff --git a/plugins/unityshell/src/DashView.cpp b/plugins/unityshell/src/DashView.cpp
index 370809114..ef73d2f3d 100644
--- a/plugins/unityshell/src/DashView.cpp
+++ b/plugins/unityshell/src/DashView.cpp
@@ -288,6 +288,10 @@ void DashView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
 }
 
 renderer_.DrawInnerCleanup(gfx_context, content_geo_, GetAbsoluteGeometry(), GetGeometry());
+
+ nux::GetPainter().Paint2DQuadWireframe (gfx_context,
+ content_layout_->GetGeometry(),
+ nux::color::Orange);
 }
 
 void DashView::OnMouseButtonDown(int x, int y, unsigned long button, unsigned long key)
diff --git a/plugins/unityshell/src/LensView.cpp b/plugins/unityshell/src/LensView.cpp
index 42396bff3..625ba87cb 100644
--- a/plugins/unityshell/src/LensView.cpp
+++ b/plugins/unityshell/src/LensView.cpp
@@ -141,7 +141,9 @@ LensView::LensView(Lens::Ptr lens, nux::Area* show_filters)
 
 lens_->connected.changed.connect([&](bool is_connected) { if (is_connected) initial_activation_ = true; });
 search_string.changed.connect([&](std::string const& search) { lens_->Search(search); });
- filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded); QueueRelayout(); OnColumnsChanged(); });
+ filters_expanded.changed.connect([&](bool expanded) { fscroll_view_->SetVisible(expanded);
+ QueueRelayout();
+ OnColumnsChanged(); });
 view_type.changed.connect(sigc::mem_fun(this, &LensView::OnViewTypeChanged));
 
 ubus_.RegisterInterest(UBUS_RESULT_VIEW_KEYNAV_CHANGED, [this] (GVariant* data) {
@@ -416,6 +418,13 @@ void LensView::Draw(nux::GraphicsEngine& gfx_context, bool force_draw)
 gfx_context.PushClippingRectangle(geo);
 nux::GetPainter().PaintBackground(gfx_context, geo);
 gfx_context.PopClippingRectangle();
+
+ nux::GetPainter().Paint2DQuadWireframe (gfx_context,
+ scroll_layout_->GetGeometry(),
+ nux::color::Blue);
+ nux::GetPainter().Paint2DQuadWireframe (gfx_context,
+ fscroll_layout_->GetGeometry(),
+ nux::color::Green);
 }
 
 void LensView::DrawContent(nux::GraphicsEngine& gfx_context, bool force_draw)
@@ -482,7 +491,7 @@ void LensView::ActivateFirst()
 if (result.uri != "")
 {
 uri_activated(result.uri);
- lens_->Activate(result.uri);
+ lens_->Activate(result.uri);
 }
 }
 }
diff --git a/plugins/unityshell/src/PlacesVScrollBar.cpp b/plugins/unityshell/src/PlacesVScrollBar.cpp
index 6e0cef9ed..e4d2db1b2 100644
--- a/plugins/unityshell/src/PlacesVScrollBar.cpp
+++ b/plugins/unityshell/src/PlacesVScrollBar.cpp
@@ -88,6 +88,8 @@ PlacesVScrollBar::Draw(nux::GraphicsEngine& gfxContext, bool force_draw)
 gfxContext.GetRenderStates().SetBlend(false);
 gfxContext.PopClippingRectangle();
 gfxContext.GetRenderStates().SetBlend(true);
+
+ nux::GetPainter().Paint2DQuadWireframe (gfxContext, base, nux::color::Red);
 }
 
 void PlacesVScrollBar::UpdateTexture()