Merge lp:~3v1n0/unity/dash-scrollbars-scaling into lp:unity

[Marco Trevisan (Treviño)]

PlacesOverlayVScrollBar and VScrollBarOverlayWindow: add support for scaling

Add a new ScrollView class to create ScrollViews with an OverlayScrollbar and with scaling support.
Using them in dash Scopes and Previews.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3914
http://jenkins.qa.ubuntu.com/job/unity-ci/1025/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/112

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1025/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/ScopeView.cpp'
--- dash/ScopeView.cpp	2014-07-11 22:58:11 +0000
+++ dash/ScopeView.cpp	2014-07-11 22:58:11 +0000
@@ -29,7 +29,7 @@
 #include "ResultRendererHorizontalTile.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
+#include "unity-shared/OverlayScrollView.h"
 #include "unity-shared/GraphicsUtils.h"
 
 #include "config.h"
@@ -51,16 +51,14 @@
 }
 
 // This is so we can access some protected members in scrollview.
-class ScopeScrollView: public nux::ScrollView
+class ScopeScrollView: public dash::ScrollView
 {
 public:
-  ScopeScrollView(nux::VScrollBar* scroll_bar, NUX_FILE_LINE_DECL)
-    : nux::ScrollView(NUX_FILE_LINE_PARAM)
+  ScopeScrollView(NUX_FILE_LINE_DECL)
+    : ScrollView(NUX_FILE_LINE_PARAM)
     , right_area_(nullptr)
     , up_area_(nullptr)
   {
-    SetVScrollBar(scroll_bar);
-
     OnVisibleChanged.connect([this] (nux::Area* /*area*/, bool visible) {
       if (m_horizontal_scrollbar_enable)
         _hscrollbar->SetVisible(visible);
@@ -236,8 +234,8 @@
 {
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  scroll_view_ = new ScopeScrollView(new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION),
-                                    NUX_TRACKER_LOCATION);
+  scroll_view_ = new ScopeScrollView(NUX_TRACKER_LOCATION);
+  scroll_view_->scale = scale();
   scroll_view_->EnableVerticalScrollBar(true);
   scroll_view_->EnableHorizontalScrollBar(false);
   layout_->AddView(scroll_view_);
@@ -252,7 +250,8 @@
   no_results_->SetScale(scale);
   scroll_layout_->AddView(no_results_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
 
-  fscroll_view_ = new ScopeScrollView(new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION), NUX_TRACKER_LOCATION);
+  fscroll_view_ = new ScopeScrollView(NUX_TRACKER_LOCATION);
+  fscroll_view_->scale = scale();
   fscroll_view_->EnableVerticalScrollBar(true);
   fscroll_view_->EnableHorizontalScrollBar(false);
   fscroll_view_->SetVisible(false);
@@ -296,6 +295,8 @@
   for (auto& group : category_views_)
     group->scale = scale;
 
+  scroll_view_->scale = scale;
+  fscroll_view_->scale = scale;
   filter_bar_->scale = scale;
   no_results_->SetScale(scale);
 }

=== modified file 'dash/ScopeView.h'
--- dash/ScopeView.h	2014-03-20 04:05:39 +0000
+++ dash/ScopeView.h	2014-07-11 22:58:11 +0000
@@ -36,7 +36,6 @@
 #include "PlacesGroup.h"
 #include "ResultViewGrid.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/PlacesVScrollBar.h"
 
 namespace unity
 {

=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/ApplicationPreview.cpp	2014-07-11 22:58:11 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/IconTexture.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <UnityCore/ApplicationPreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
@@ -58,17 +57,6 @@
 
 DECLARE_LOGGER(logger, "unity.dash.preview.application");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(ApplicationPreview);
 
 ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)
@@ -80,6 +68,7 @@
 , app_data_layout_(nullptr)
 , app_updated_copywrite_layout_(nullptr)
 , app_info_layout_(nullptr)
+, app_info_scroll_(nullptr)
 , actions_layout_(nullptr)
 {
   SetupViews();
@@ -172,7 +161,8 @@
         app_icon_->mouse_click.connect(on_mouse_down);
         icon_layout_->AddView(app_icon_.GetPointer(), 0);
 
-        if (app_preview_model->rating >= 0) {
+        if (app_preview_model->rating >= 0)
+        {
           app_rating_ = new PreviewRatingsWidget();
           AddChild(app_rating_.GetPointer());
           app_rating_->scale = scale();
@@ -264,7 +254,9 @@
 
       /////////////////////
       // Description
-      nux::ScrollView* app_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* app_info = new ScrollView(NUX_TRACKER_LOCATION);
+      app_info_scroll_ = app_info; 
+      app_info->scale = scale();
       app_info->EnableHorizontalScrollBar(false);
       app_info->mouse_click.connect(on_mouse_down);
 
@@ -362,10 +354,15 @@
     app_icon_->ReLoadIcon();
   }
 
+  if (app_info_scroll_)
+    app_info_scroll_->scale = scale;
+
   if (license_)
     license_->SetScale(scale);
+
   if (last_update_)
     last_update_->SetScale(scale);
+
   if (copywrite_)
     copywrite_->SetScale(scale);
 

=== modified file 'dash/previews/ApplicationPreview.h'
--- dash/previews/ApplicationPreview.h	2014-06-16 09:16:53 +0000
+++ dash/previews/ApplicationPreview.h	2014-07-11 22:58:11 +0000
@@ -24,6 +24,7 @@
 #define APPLICATIONPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -64,6 +65,7 @@
   nux::VLayout* app_data_layout_;
   nux::VLayout* app_updated_copywrite_layout_;
   nux::VLayout* app_info_layout_;
+  ScrollView* app_info_scroll_;
   nux::Layout* actions_layout_;
 
   nux::ObjectPtr<IconTexture> app_icon_;

=== modified file 'dash/previews/ErrorPreview.cpp'
--- dash/previews/ErrorPreview.cpp	2014-06-17 11:13:42 +0000
+++ dash/previews/ErrorPreview.cpp	2014-07-11 22:58:11 +0000
@@ -26,7 +26,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/PlacesVScrollBar.h"
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
@@ -62,17 +61,6 @@
 const std::string ErrorPreview::CANCEL_ACTION = "cancel";
 const std::string ErrorPreview::GO_TO_U1_ACTION = "open_u1_link";
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(ErrorPreview)
 
 ErrorPreview::ErrorPreview(dash::Preview::Ptr preview_model)

=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/GenericPreview.cpp	2014-07-11 22:58:11 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 #include <Nux/VLayout.h>
@@ -49,23 +48,13 @@
 
 DECLARE_LOGGER(logger, "unity.dash.preview.generic");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(GenericPreview);
 
 GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
 , image_data_layout_(nullptr)
 , preview_info_layout_(nullptr)
+, preview_info_scroll_(nullptr)
 , preview_data_layout_(nullptr)
 , actions_layout_(nullptr)
 {
@@ -85,7 +74,7 @@
   gfx_engine.PushClippingRectangle(base);
   nux::GetPainter().PaintBackground(gfx_engine, base);
 
-  gfx_engine.PopClippingRectangle(); 
+  gfx_engine.PopClippingRectangle();
 }
 
 void GenericPreview::DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw)
@@ -169,7 +158,9 @@
 
       /////////////////////
       // Description
-      nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* preview_info = new ScrollView(NUX_TRACKER_LOCATION);
+      preview_info_scroll_ = preview_info;
+      preview_info->scale = scale();
       preview_info->EnableHorizontalScrollBar(false);
       preview_info->mouse_click.connect(on_mouse_down);
 
@@ -255,6 +246,9 @@
   if (image_)
     image_->scale = scale;
 
+  if (preview_info_scroll_)
+    preview_info_scroll_->scale = scale;
+
   if (preview_info_hints_)
     preview_info_hints_->scale = scale;
 

=== modified file 'dash/previews/GenericPreview.h'
--- dash/previews/GenericPreview.h	2014-06-16 17:10:45 +0000
+++ dash/previews/GenericPreview.h	2014-07-11 22:58:11 +0000
@@ -23,8 +23,9 @@
 #ifndef GENERICPREVIEW_H
 #define GENERICPREVIEW_H
 
+#include <UnityCore/GenericPreview.h>
 #include "Preview.h"
-#include <UnityCore/GenericPreview.h>
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -56,9 +57,9 @@
 
   nux::HLayout* image_data_layout_;
   nux::VLayout* preview_info_layout_;
+  ScrollView* preview_info_scroll_;
   nux::VLayout* preview_data_layout_;
   nux::Layout* actions_layout_;
-
 };
 
 }

=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/MoviePreview.cpp	2014-07-11 22:58:11 +0000
@@ -23,7 +23,6 @@
 #include "unity-shared/IntrospectableWrappers.h"
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <UnityCore/MoviePreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
@@ -50,23 +49,13 @@
 
 DECLARE_LOGGER(logger, "unity.dash.preview.movie");
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(MoviePreview);
 
 MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)
 : Preview(preview_model)
 , image_data_layout_(nullptr)
 , preview_info_layout_(nullptr)
+, preview_info_scroll_(nullptr)
 , actions_layout_(nullptr)
 {
   SetupViews();
@@ -187,7 +176,9 @@
 
       /////////////////////
       // Description
-      nux::ScrollView* preview_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* preview_info = new ScrollView(NUX_TRACKER_LOCATION);
+      preview_info_scroll_ = preview_info;
+      preview_info->scale = scale();
       preview_info->EnableHorizontalScrollBar(false);
       preview_info->mouse_click.connect(on_mouse_down);
 
@@ -296,6 +287,9 @@
     rating_->SetMinimumHeight(style.GetRatingWidgetHeight().CP(scale));
   }
 
+  if (preview_info_scroll_)
+    preview_info_scroll_->scale = scale;
+
   if (preview_info_layout_)
     preview_info_layout_->SetSpaceBetweenChildren(PREVIEW_INFO_CHILDREN_SPACE);
 

=== modified file 'dash/previews/MoviePreview.h'
--- dash/previews/MoviePreview.h	2014-06-17 16:55:33 +0000
+++ dash/previews/MoviePreview.h	2014-07-11 22:58:11 +0000
@@ -24,6 +24,7 @@
 #define MOVIEPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -62,6 +63,7 @@
 
   nux::HLayout* image_data_layout_;
   nux::VLayout* preview_info_layout_;
+  ScrollView* preview_info_scroll_;
   nux::Layout* actions_layout_;
 };
 

=== modified file 'dash/previews/MusicPaymentPreview.cpp'
--- dash/previews/MusicPaymentPreview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/MusicPaymentPreview.cpp	2014-07-11 22:58:11 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/StaticCairoText.h"
-#include "unity-shared/PlacesVScrollBar.h"
 #include "config.h"
 
 #include <glib/gi18n-lib.h>
@@ -75,17 +74,6 @@
 const std::string MusicPaymentPreview::CANCEL_PURCHASE_ACTION = "cancel_purchase";
 const std::string MusicPaymentPreview::PURCHASE_ALBUM_ACTION = "purchase_album";
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(MusicPaymentPreview)
 
 MusicPaymentPreview::MusicPaymentPreview(dash::Preview::Ptr preview_model)

=== modified file 'dash/previews/MusicPreview.h'
--- dash/previews/MusicPreview.h	2014-07-11 22:58:11 +0000
+++ dash/previews/MusicPreview.h	2014-07-11 22:58:11 +0000
@@ -24,6 +24,7 @@
 #define MUSICPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 #include "unity-shared/IconTexture.h"
 
 namespace unity

=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/Preview.cpp	2014-07-11 22:58:11 +0000
@@ -313,6 +313,6 @@
   QueueDraw();
 }
 
-}
-}
-}
+} // preview
+} // dash
+} // unity

=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/SocialPreview.cpp	2014-07-11 22:58:11 +0000
@@ -24,7 +24,6 @@
 #include "unity-shared/PreviewStyle.h"
 #include "unity-shared/CoverArt.h"
 #include "unity-shared/IconTexture.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include <UnityCore/SocialPreview.h>
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
@@ -56,17 +55,6 @@
   const RawPixel SOCIAL_INFO_CHILDREN_SPACE = 12_em;
 }
 
-class DetailsScrollView : public nux::ScrollView
-{
-public:
-  DetailsScrollView(NUX_FILE_LINE_PROTO)
-  : ScrollView(NUX_FILE_LINE_PARAM)
-  {
-    SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
-  }
-
-};
-
 NUX_IMPLEMENT_OBJECT_TYPE(SocialPreview);
 
 SocialPreview::SocialPreview(dash::Preview::Ptr preview_model)
@@ -77,6 +65,7 @@
 , social_content_layout_(nullptr)
 , social_data_layout_(nullptr)
 , social_info_layout_(nullptr)
+, social_info_scroll_(nullptr)
 , icon_layout_(nullptr)
 , actions_layout_(nullptr)
 {
@@ -215,7 +204,9 @@
 
       /////////////////////
       // Details
-      nux::ScrollView* social_info = new DetailsScrollView(NUX_TRACKER_LOCATION);
+      auto* social_info = new ScrollView(NUX_TRACKER_LOCATION);
+      social_info_scroll_ = social_info;
+      social_info->scale = scale();
       social_info->EnableHorizontalScrollBar(false);
       social_info->mouse_click.connect(on_mouse_down);
 
@@ -345,6 +336,9 @@
   if (social_info_layout_)
     social_info_layout_->SetSpaceBetweenChildren(SOCIAL_INFO_CHILDREN_SPACE.CP(scale));
 
+  if (social_info_scroll_)
+    social_info_scroll_->scale = scale;
+
   if (actions_layout_)
     actions_layout_->SetLeftAndRightPadding(0, style.GetDetailsRightMargin().CP(scale));
 

=== modified file 'dash/previews/SocialPreview.h'
--- dash/previews/SocialPreview.h	2014-07-11 22:58:11 +0000
+++ dash/previews/SocialPreview.h	2014-07-11 22:58:11 +0000
@@ -24,6 +24,7 @@
 #define SOCIALPREVIEW_H
 
 #include "Preview.h"
+#include "unity-shared/OverlayScrollView.h"
 
 namespace unity
 {
@@ -68,6 +69,7 @@
   nux::VLayout* social_content_layout_;
   nux::VLayout* social_data_layout_;
   nux::VLayout* social_info_layout_;
+  ScrollView* social_info_scroll_;
   nux::VLayout* icon_layout_;
   nux::Layout* actions_layout_;
 

=== modified file 'dash/previews/Tracks.cpp'
--- dash/previews/Tracks.cpp	2014-07-11 22:58:11 +0000
+++ dash/previews/Tracks.cpp	2014-07-11 22:58:11 +0000
@@ -24,7 +24,6 @@
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include "unity-shared/IntrospectableWrappers.h"
-#include "unity-shared/PlacesOverlayVScrollBar.h"
 #include "unity-shared/PreviewStyle.h"
 #include <UnityCore/Track.h>
 
@@ -45,7 +44,6 @@
 
 Tracks::Tracks(dash::Tracks::Ptr tracks, NUX_FILE_LINE_DECL)
   : ScrollView(NUX_FILE_LINE_PARAM)
-  , scale(1.0)
   , tracks_(tracks)
 {
   SetupViews();
@@ -60,6 +58,7 @@
     for (std::size_t i = 0; i < tracks_->count.Get(); ++i)
       OnTrackAdded(tracks_->RowAtIndex(i));
   }
+
   UpdateScale(scale);
   scale.changed.connect(sigc::mem_fun(this, &Tracks::UpdateScale));
 }
@@ -77,7 +76,6 @@
 
 void Tracks::SetupViews()
 {
-  SetVScrollBar(new dash::PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION));
   EnableHorizontalScrollBar(false);
   layout_ = new nux::VLayout();
   layout_->SetPadding(0, previews::Style::Instance().GetDetailsRightMargin().CP(scale), 0, 0);

=== modified file 'dash/previews/Tracks.h'
--- dash/previews/Tracks.h	2014-07-11 22:58:11 +0000
+++ dash/previews/Tracks.h	2014-07-11 22:58:11 +0000
@@ -27,6 +27,7 @@
 #include <Nux/ScrollView.h>
 #include <UnityCore/Tracks.h>
 #include <UnityCore/ConnectionManager.h>
+#include "unity-shared/OverlayScrollView.h"
 #include "unity-shared/Introspectable.h"
 #include "Track.h"
 
@@ -44,7 +45,7 @@
 namespace previews
 {
 
-class Tracks : public debug::Introspectable, public nux::ScrollView
+class Tracks : public debug::Introspectable, public dash::ScrollView
 {
 public:
   typedef nux::ObjectPtr<Tracks> Ptr;
@@ -52,8 +53,6 @@
 
   Tracks(dash::Tracks::Ptr tracks, NUX_FILE_LINE_PROTO);
 
-  nux::Property<double> scale;
-
 protected:
   virtual bool AcceptKeyNavFocus() { return false; }
 

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2014-03-20 16:11:21 +0000
+++ unity-shared/CMakeLists.txt	2014-07-11 22:58:11 +0000
@@ -44,6 +44,7 @@
      LineSeparator.cpp
      MenuManager.cpp
      OverlayRenderer.cpp
+     OverlayScrollView.cpp
      OverlayWindowButtons.cpp
      PanelStyle.cpp
      PlacesVScrollBar.cpp

=== added file 'unity-shared/OverlayScrollView.cpp'
--- unity-shared/OverlayScrollView.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/OverlayScrollView.cpp	2014-07-11 22:58:11 +0000
@@ -0,0 +1,56 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#include "OverlayScrollView.h"
+#include "PlacesOverlayVScrollBar.h"
+#include "RawPixel.h"
+
+namespace unity
+{
+namespace dash
+{
+namespace
+{
+  const RawPixel MOUSE_WHEEL_SCROLL_SIZE = 32_em;
+}
+
+ScrollView::ScrollView(NUX_FILE_LINE_DECL)
+  : nux::ScrollView(NUX_FILE_LINE_PARAM)
+{
+  auto* scrollbar = new PlacesOverlayVScrollBar(NUX_TRACKER_LOCATION);
+  SetVScrollBar(scrollbar);
+
+  scale.SetGetterFunction([scrollbar] { return scrollbar->scale(); });
+  scale.SetSetterFunction([scrollbar] (double scale) {
+    if (scrollbar->scale() == scale)
+      return false;
+
+    scrollbar->scale = scale;
+    return true;
+  });
+
+  m_MouseWheelScrollSize = MOUSE_WHEEL_SCROLL_SIZE.CP(scale);
+
+  scale.changed.connect([this] (double scale) {
+    m_MouseWheelScrollSize = MOUSE_WHEEL_SCROLL_SIZE.CP(scale);
+  });
+}
+
+} // dash namespace
+} // unity namespace
\ No newline at end of file

=== added file 'unity-shared/OverlayScrollView.h'
--- unity-shared/OverlayScrollView.h	1970-01-01 00:00:00 +0000
+++ unity-shared/OverlayScrollView.h	2014-07-11 22:58:11 +0000
@@ -0,0 +1,43 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#ifndef _UNITY_SCROLL_VIEW_H_
+#define _UNITY_SCROLL_VIEW_H_
+
+#include <Nux/Nux.h>
+
+namespace unity
+{
+namespace dash
+{
+
+class ScrollView : public nux::ScrollView
+{
+public:
+  ScrollView(NUX_FILE_LINE_PROTO);
+
+  nux::RWProperty<double> scale;
+
+  using nux::ScrollView::SetVScrollBar;
+};
+
+} // dash namespace
+} // unity namespace
+
+#endif // _UNITY_SCROLL_VIEW_H_

=== modified file 'unity-shared/PlacesOverlayVScrollBar.cpp'
--- unity-shared/PlacesOverlayVScrollBar.cpp	2014-03-20 03:24:26 +0000
+++ unity-shared/PlacesOverlayVScrollBar.cpp	2014-07-11 22:58:11 +0000
@@ -19,33 +19,46 @@
 
 #include <Nux/Nux.h>
 
+#include "CairoTexture.h"
 #include "PlacesOverlayVScrollBar.h"
-#include "CairoTexture.h"
-
-namespace
-{
-  int const PROXIMITY = 7;
-  int const SCROLL_ANIMATION = 400;
-  int const MAX_CONNECTOR_ANIMATION = 200;
-}
+#include "RawPixel.h"
 
 namespace unity
 {
 namespace dash
 {
+namespace
+{
+  const RawPixel PROXIMITY = 7_em;
+  const int SCROLL_ANIMATION = 400;
+  const int MAX_CONNECTOR_ANIMATION = 200;
+  const nux::Color CONNECTOR_COLOR = nux::color::Gray;
+}
+
+class PlacesOverlayVScrollBar::ProximityArea : public nux::InputAreaProximity, public sigc::trackable
+{
+public:
+  ProximityArea(nux::InputArea* area, unsigned prox)
+    : nux::InputAreaProximity(area, prox)
+    , proximity([this] { return proximity_; }, [this] (unsigned px) { proximity_ = px; return false; })
+  {}
+
+  nux::RWProperty<unsigned> proximity;
+};
 
 PlacesOverlayVScrollBar::PlacesOverlayVScrollBar(NUX_FILE_LINE_DECL)
   : PlacesVScrollBar(NUX_FILE_LINE_PARAM)
   , overlay_window_(new VScrollBarOverlayWindow(_track->GetAbsoluteGeometry()))
-  , area_prox_(this, PROXIMITY)
+  , area_prox_(std::make_shared<ProximityArea>(this, PROXIMITY.CP(scale)))
   , thumb_above_slider_(false)
   , connector_height_(0)
   , mouse_down_offset_(0)
   , delta_update_(0)
 {
-  area_prox_.mouse_near.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseNear));
-  area_prox_.mouse_beyond.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseBeyond));
+  area_prox_->mouse_near.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseNear));
+  area_prox_->mouse_beyond.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseBeyond));
 
+  overlay_window_->scale = scale();
   overlay_window_->mouse_enter.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseEnter));
   overlay_window_->mouse_leave.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseLeave));
   overlay_window_->mouse_down.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnMouseDown));
@@ -58,6 +71,11 @@
   _track->geometry_changed.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnTrackGeometryChanged));
   OnVisibleChanged.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnVisibilityChanged));
   OnSensitiveChanged.connect(sigc::mem_fun(this, &PlacesOverlayVScrollBar::OnSensitivityChanged));
+
+  scale.changed.connect([this] (double scale) {
+    area_prox_->proximity = PROXIMITY.CP(scale);
+    overlay_window_->scale = scale;
+  });
 }
 
 void PlacesOverlayVScrollBar::OnTrackGeometryChanged(nux::Area* /*area*/, nux::Geometry& /*geo*/)
@@ -410,30 +428,25 @@
   if (connector_height_ < 0)
     return;
 
-  int width = 3;
+  int width = _slider->GetWidth();
   int height = connector_height_;
-  float const radius = 1.5f;
-  float const aspect = 1.0f;
-
-  cairo_t* cr = NULL;
-
-  nux::color::RedGreenBlue const& connector_bg = nux::color::Gray;
+
+  if (connector_texture_ && connector_texture_->GetWidth() == width && connector_texture_->GetHeight() == height)
+    return;
 
   nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cr = cairoGraphics.GetInternalContext();
-  cairo_save(cr);
+  cairo_t* cr = cairoGraphics.GetInternalContext();
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-  cairo_save(cr);
-
-  cairo_set_source_rgba(cr, connector_bg.red, connector_bg.green, connector_bg.blue, 0.8);
-  cairoGraphics.DrawRoundedRectangle(cr, aspect, 0.0f, 0.0f, radius, width, height);
-  cairo_fill_preserve(cr);
-
-  connector_texture_.Adopt(texture_from_cairo_graphics(cairoGraphics));
+  cairo_set_source_rgba(cr, CONNECTOR_COLOR.red, CONNECTOR_COLOR.green, CONNECTOR_COLOR.blue, 0.8);
+  cairo_rectangle(cr, 0, 0, static_cast<double>(width)/scale(), static_cast<double>(height)/scale());
+  cairo_fill(cr);
+
+  connector_texture_ = texture_ptr_from_cairo_graphics(cairoGraphics);
 
   QueueDraw();
 }

=== modified file 'unity-shared/PlacesOverlayVScrollBar.h'
--- unity-shared/PlacesOverlayVScrollBar.h	2013-11-06 11:21:43 +0000
+++ unity-shared/PlacesOverlayVScrollBar.h	2014-07-11 22:58:11 +0000
@@ -80,7 +80,7 @@
 
   void UpdateConnectorPosition();
   void ResetConnector();
-  
+
   void UpdateStepY();
 
   void SetupAnimation(int start, int stop, int milliseconds);
@@ -93,7 +93,9 @@
   void UpdateConnectorTexture();
 
   nux::ObjectPtr<VScrollBarOverlayWindow> overlay_window_;
-  nux::InputAreaProximity area_prox_;
+
+  class ProximityArea;
+  std::shared_ptr<ProximityArea> area_prox_;
 
   nux::animation::AnimateValue<int> animation_;
   connection::Wrapper tweening_connection_;

=== modified file 'unity-shared/PlacesVScrollBar.cpp'
--- unity-shared/PlacesVScrollBar.cpp	2012-11-27 23:16:06 +0000
+++ unity-shared/PlacesVScrollBar.cpp	2014-07-11 22:58:11 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2011 Canonical Ltd
+ * Copyright (C) 2011-2014 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,44 +15,53 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Mirco Müller <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
 #include <Nux/Nux.h>
+#include <NuxGraphics/CairoGraphics.h>
 
 #include "unity-shared/CairoTexture.h"
+#include "unity-shared/RawPixel.h"
 #include "PlacesVScrollBar.h"
 
-using unity::texture_from_cairo_graphics;
-
 namespace unity
 {
 namespace dash
 {
+namespace
+{
+const RawPixel BUTTONS_HEIGHT = 15_em;
+const RawPixel WIDTH = 3_em;
+}
 
 PlacesVScrollBar::PlacesVScrollBar(NUX_FILE_LINE_DECL)
-  : VScrollBar(NUX_FILE_LINE_PARAM),
-    _slider_texture(NULL)
-{
-  _scroll_up_button->SetMaximumHeight(15);
-  _scroll_up_button->SetMinimumHeight(15);
-
-  _scroll_down_button->SetMaximumHeight(15);
-  _scroll_down_button->SetMinimumHeight(15);
-
-  _slider->SetMinimumWidth(3);
-  _slider->SetMaximumWidth(3);
-  SetMinimumWidth(3);
-  SetMaximumWidth(3);
-}
-
-PlacesVScrollBar::~PlacesVScrollBar()
-{
-  if (_slider_texture)
-    _slider_texture->UnReference();
-}
-
-void
-PlacesVScrollBar::PreLayoutManagement()
+  : nux::VScrollBar(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
+{
+  UpdateSize();
+  scale.changed.connect([this] (double scale) {
+    UpdateSize();
+    QueueRelayout();
+    QueueDraw();
+  });
+}
+
+void PlacesVScrollBar::UpdateSize()
+{
+  _scroll_up_button->SetMaximumHeight(BUTTONS_HEIGHT.CP(scale));
+  _scroll_up_button->SetMinimumHeight(BUTTONS_HEIGHT.CP(scale));
+
+  _scroll_down_button->SetMaximumHeight(BUTTONS_HEIGHT.CP(scale));
+  _scroll_down_button->SetMinimumHeight(BUTTONS_HEIGHT.CP(scale));
+
+  _slider->SetMinimumWidth(WIDTH.CP(scale));
+  _slider->SetMaximumWidth(WIDTH.CP(scale));
+  SetMinimumWidth(WIDTH.CP(scale));
+  SetMaximumWidth(WIDTH.CP(scale));
+}
+
+void PlacesVScrollBar::PreLayoutManagement()
 {
   nux::VScrollBar::PreLayoutManagement();
 }
@@ -69,8 +78,8 @@
 void
 PlacesVScrollBar::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  if(!RedirectedAncestor())
-  {  
+  if (!RedirectedAncestor())
+  {
     DrawScrollbar(graphics_engine);
   }
 }
@@ -78,15 +87,19 @@
 void
 PlacesVScrollBar::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  if(RedirectedAncestor())
-  {   
-    DrawScrollbar(graphics_engine); 
+  if (RedirectedAncestor())
+  {
+    DrawScrollbar(graphics_engine);
   }
 }
 
 void
 PlacesVScrollBar::DrawScrollbar(nux::GraphicsEngine& graphics_engine)
 {
+  // check if textures have been computed... if they haven't, exit function
+  if (!slider_texture_)
+    return;
+
   nux::Color color = nux::color::White;
   nux::Geometry const& base  = GetGeometry();
   nux::TexCoordXForm texxform;
@@ -95,9 +108,6 @@
   unsigned int alpha = 0, src = 0, dest = 0;
   graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
 
-  // check if textures have been computed... if they haven't, exit function
-  if (!_slider_texture)
-    return;
 
   texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_SCALE_COORD);
 
@@ -112,7 +122,7 @@
                         slider_geo.y,
                         slider_geo.width,
                         slider_geo.height,
-                        _slider_texture->GetDeviceTexture(),
+                        slider_texture_->GetDeviceTexture(),
                         texxform,
                         color);
   }
@@ -123,35 +133,26 @@
 
 void PlacesVScrollBar::UpdateTexture()
 {
-  nux::CairoGraphics* cairoGraphics = NULL;
-  cairo_t*            cr            = NULL;
-
   // update texture of slider
   int width  = _slider->GetBaseWidth();
   int height = _slider->GetBaseHeight();
-  cairoGraphics = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cr = cairoGraphics->GetContext();
+
+  if (slider_texture_ && slider_texture_->GetWidth() == width && slider_texture_->GetHeight() == height)
+    return;
+
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
+  auto* cr = cg.GetContext();
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
   cairo_set_source_rgba(cr, 1.0f, 1.0f, 1.0f, 1.0f);
-  cairoGraphics->DrawRoundedRectangle(cr,
-                                      1.0f,
-                                      0.0,
-                                      0.0,
-                                      1.5,
-                                      3.0,
-                                      (double) height - 3.0);
+  cg.DrawRoundedRectangle(cr, 1.0f, 0.0, 0.0, 1.5, 3.0, static_cast<double>(height)/scale() - 3.0);
   cairo_fill(cr);
 
-  if (_slider_texture)
-    _slider_texture->UnReference();
-  _slider_texture = texture_from_cairo_graphics(*cairoGraphics);
-
-  cairo_destroy(cr);
-  delete cairoGraphics;
+  slider_texture_ = texture_ptr_from_cairo_graphics(cg);
 }
 
 } // namespace dash

=== modified file 'unity-shared/PlacesVScrollBar.h'
--- unity-shared/PlacesVScrollBar.h	2013-11-06 11:21:43 +0000
+++ unity-shared/PlacesVScrollBar.h	2014-07-11 22:58:11 +0000
@@ -20,12 +20,7 @@
 #ifndef PLACES_VSCROLLBAR_H
 #define PLACES_VSCROLLBAR_H
 
-#include <Nux/Nux.h>
-#include <Nux/View.h>
-#include <Nux/ScrollView.h>
-#include <Nux/BaseWindow.h>
 #include <Nux/VScrollBar.h>
-#include <NuxGraphics/CairoGraphics.h>
 
 namespace unity
 {
@@ -36,23 +31,23 @@
 {
 public:
   PlacesVScrollBar(NUX_FILE_LINE_PROTO);
-  virtual ~PlacesVScrollBar();
+
+  nux::Property<double> scale;
 
 protected:
   virtual void PreLayoutManagement();
   virtual long PostLayoutManagement(long LayoutResult);
 
-  void Draw(nux::GraphicsEngine& gfxContext,
-            bool                 forceDraw);
-  void DrawContent(nux::GraphicsEngine& gfxContext,
-            bool                 forceDraw);
+  void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
+  void DrawContent(nux::GraphicsEngine& gfxContext, bool forceDraw);
 
 private:
+  void UpdateSize();
   void UpdateTexture();
   void DrawScrollbar(nux::GraphicsEngine& graphics_engine);
 
 private:
-  nux::BaseTexture* _slider_texture;
+  nux::ObjectPtr<nux::BaseTexture> slider_texture_;
 };
 
 } // namespace dash

=== modified file 'unity-shared/VScrollBarOverlayWindow.cpp'
--- unity-shared/VScrollBarOverlayWindow.cpp	2014-02-25 03:35:17 +0000
+++ unity-shared/VScrollBarOverlayWindow.cpp	2014-07-11 22:58:11 +0000
@@ -31,15 +31,15 @@
 
 namespace
 {
-  int const THUMB_WIDTH = 21;
-  int const THUMB_HEIGHT = 68;
-  int const THUMB_RADIUS = 3;
-  int const ANIMATION_DURATION = 90;
+  const RawPixel THUMB_WIDTH = 21_em;
+  const RawPixel THUMB_HEIGHT = 68_em;
+  const int THUMB_RADIUS = 3;
+  const int ANIMATION_DURATION = 90;
 }
 
-
 VScrollBarOverlayWindow::VScrollBarOverlayWindow(nux::Geometry const& geo)
   : nux::BaseWindow("")
+  , scale(1.0)
   , content_size_(geo)
   , content_offset_x_(0)
   , mouse_offset_y_(0)
@@ -47,7 +47,7 @@
   , current_action_(ThumbAction::NONE)
   , show_animator_(ANIMATION_DURATION)
 {
-  Area::SetGeometry(content_size_.x, content_size_.y, THUMB_WIDTH, content_size_.height);
+  Area::SetGeometry(content_size_.x, content_size_.y, THUMB_WIDTH.CP(scale), content_size_.height);
   SetBackgroundColor(nux::color::Transparent);
 
   show_animator_.updated.connect(sigc::mem_fun(this, &BaseWindow::SetOpacity));
@@ -58,6 +58,17 @@
 
   SetOpacity(0.0f);
   UpdateTexture();
+
+  scale.changed.connect([this] (double scale) {
+    UpdateContentGeometry();
+    UpdateTexture();
+  });
+}
+
+void VScrollBarOverlayWindow::UpdateContentGeometry()
+{
+  UpdateMouseOffsetX();
+  Area::SetGeometry(content_size_.x + content_offset_x_, content_size_.y, THUMB_WIDTH.CP(scale), content_size_.height);
 }
 
 void VScrollBarOverlayWindow::UpdateGeometry(nux::Geometry const& geo)
@@ -67,9 +78,7 @@
       content_size_.height != geo.height)
   {
     content_size_ = geo;
-    UpdateMouseOffsetX();
-
-    Area::SetGeometry(content_size_.x + content_offset_x_, content_size_.y, THUMB_WIDTH, content_size_.height);
+    UpdateContentGeometry();
   }
 }
 
@@ -91,8 +100,8 @@
 {
   if (new_offset < 0)
     return 0;
-  else if (new_offset > content_size_.height - THUMB_HEIGHT)
-    return content_size_.height - THUMB_HEIGHT;
+  else if (new_offset > content_size_.height - THUMB_HEIGHT.CP(scale))
+    return content_size_.height - THUMB_HEIGHT.CP(scale);
 
   return new_offset;
 }
@@ -102,15 +111,15 @@
   int monitor = unity::UScreen::GetDefault()->GetMonitorWithMouse();
   nux::Geometry const& geo = unity::UScreen::GetDefault()->GetMonitorGeometry(monitor);
 
-  if (content_size_.x + THUMB_WIDTH > geo.x + geo.width)
-    content_offset_x_ = geo.x + geo.width - (content_size_.x + THUMB_WIDTH);
+  if (content_size_.x + THUMB_WIDTH.CP(scale) > geo.x + geo.width)
+    content_offset_x_ = geo.x + geo.width - (content_size_.x + THUMB_WIDTH.CP(scale));
   else
     content_offset_x_ = 0;
 }
 
 bool VScrollBarOverlayWindow::IsMouseInsideThumb(int y) const
 {
-  nux::Geometry const thumb(0, mouse_offset_y_, THUMB_WIDTH, THUMB_HEIGHT);
+  nux::Geometry const thumb(0, mouse_offset_y_, THUMB_WIDTH.CP(scale), THUMB_HEIGHT.CP(scale));
   return thumb.IsPointInside(0,y);
 }
 
@@ -121,7 +130,7 @@
 
 int VScrollBarOverlayWindow::GetThumbHeight() const
 {
-  return THUMB_HEIGHT;
+  return THUMB_HEIGHT.CP(scale);
 }
 
 int VScrollBarOverlayWindow::GetThumbOffsetY() const
@@ -133,7 +142,7 @@
 {
   return nux::Geometry(content_size_.x + content_offset_x_,
                        content_size_.y + mouse_offset_y_,
-                       THUMB_WIDTH, THUMB_HEIGHT);
+                       THUMB_WIDTH.CP(scale), THUMB_HEIGHT.CP(scale));
 }
 
 void VScrollBarOverlayWindow::MouseDown()
@@ -267,7 +276,7 @@
   if (!thumb_texture_)
     return;
 
-  nux::Geometry base(0, mouse_offset_y_, THUMB_WIDTH, THUMB_HEIGHT);
+  nux::Geometry base(0, mouse_offset_y_, THUMB_WIDTH.CP(scale), THUMB_HEIGHT.CP(scale));
   nux::TexCoordXForm texxform;
 
   graphics_engine.QRP_1Tex(base.x,
@@ -372,7 +381,7 @@
 }
 
 
-void DrawArrow (cairo_t* cr, nux::color::RedGreenBlue const& rgb, double x, double y, double width, double height)
+void DrawArrow(cairo_t* cr, nux::color::RedGreenBlue const& rgb, double x, double y, double width, double height)
 {
   cairo_save (cr);
 
@@ -417,37 +426,30 @@
 {
   int width  = THUMB_WIDTH;
   int height = THUMB_HEIGHT;
-  int radius = THUMB_RADIUS;
 
   float const aspect = 1.0f;
   float current_x = 0.0f;
   float current_y = 0.0f;
 
-  cairo_t*            cr            = NULL;
-  cairo_pattern_t*    pat           = NULL;
-
-  nux::color::RedGreenBlue const& bg = nux::color::WhiteSmoke;
-  nux::color::RedGreenBlue const& bg_selected = nux::color::White;
-  nux::color::RedGreenBlue const& bg_active = nux::color::Gray;
-  nux::color::RedGreenBlue const& arrow_color = nux::color::DarkSlateGray;
-
-  nux::color::RedGreenBlue const& bg_arrow_up = ProduceColorShade(bg, 0.86);
-  nux::color::RedGreenBlue const& bg_arrow_down = ProduceColorShade(bg, 1.1);
-  nux::color::RedGreenBlue const& bg_shadow = ProduceColorShade(bg, 0.2);
-
-  nux::color::RedGreenBlue const& bg_dark_line = ProduceColorShade(bg, 0.4);
-  nux::color::RedGreenBlue const& bg_bright_line = ProduceColorShade(bg, 1.2);
-
-  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  cr = cairoGraphics.GetInternalContext();
-
-  cairo_save(cr);
+  auto const& bg = nux::color::WhiteSmoke;
+  auto const& bg_selected = nux::color::White;
+  auto const& bg_active = nux::color::Gray;
+  auto const& arrow_color = nux::color::DarkSlateGray;
+
+  auto const& bg_arrow_up = ProduceColorShade(bg, 0.86);
+  auto const& bg_arrow_down = ProduceColorShade(bg, 1.1);
+  auto const& bg_shadow = ProduceColorShade(bg, 0.2);
+
+  auto const& bg_dark_line = ProduceColorShade(bg, 0.4);
+  auto const& bg_bright_line = ProduceColorShade(bg, 1.2);
+
+  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, THUMB_WIDTH.CP(scale), THUMB_HEIGHT.CP(scale));
+  cairo_t* cr = cairoGraphics.GetInternalContext();
+  cairo_surface_set_device_scale(cairo_get_target(cr), scale, scale);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
-  cairo_save(cr);
-
   cairo_translate (cr, 0.5, 0.5);
   width--;
   height--;
@@ -455,15 +457,14 @@
   cairo_set_line_width (cr, 1.0);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-  cairo_save(cr);
 
   // Draw backgound
   SetSourceRGB(cr, bg, 1.0);
-  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, radius, width, height);
+  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, THUMB_RADIUS, width, height);
   cairo_fill_preserve(cr);
 
   // Draw shaded background
-  pat = cairo_pattern_create_linear(0, 0, 0, height);
+  cairo_pattern_t* pat = cairo_pattern_create_linear(0, 0, 0, height);
 
   PatternAddRGBStop(pat, bg_arrow_up, 0.0, 0.8);
   PatternAddRGBStop(pat, bg_arrow_down, 1.0, 0.8);
@@ -502,7 +503,7 @@
 
   current_x += 0.5;
   current_y += 0.5;
-  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, radius - 1, width - 1, height - 1);
+  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, THUMB_RADIUS - 1, width - 1, height - 1);
 
   if (HasState(ThumbState::INSIDE_SLIDER))
     SetSourceRGB(cr, bg_selected, 1.0);
@@ -545,12 +546,12 @@
 
   current_x += 0.5;
   current_y += 0.5;
-  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, radius, width- 2, height - 2);
+  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, THUMB_RADIUS, width- 2, height - 2);
   cairo_stroke(cr);
 
   current_x += 1.0;
   current_y += 1.0;
-  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, radius - 1, width - 4, height- 4);
+  cairoGraphics.DrawRoundedRectangle(cr, aspect, current_x, current_y, THUMB_RADIUS - 1, width - 4, height- 4);
   SetSourceRGB(cr, bg_bright_line, 0.6);
   cairo_stroke(cr);
 
@@ -558,7 +559,7 @@
   DrawLineSeperator(cr, bg_dark_line, bg_bright_line, width, height);
   DrawBothArrows(cr, arrow_color, width, height);
 
-  thumb_texture_.Adopt(unity::texture_from_cairo_graphics(cairoGraphics));
+  thumb_texture_ = texture_ptr_from_cairo_graphics(cairoGraphics);
 
   QueueDraw();
 }

=== modified file 'unity-shared/VScrollBarOverlayWindow.h'
--- unity-shared/VScrollBarOverlayWindow.h	2013-11-06 11:21:43 +0000
+++ unity-shared/VScrollBarOverlayWindow.h	2014-07-11 22:58:11 +0000
@@ -32,7 +32,8 @@
 {
 public:
   VScrollBarOverlayWindow(nux::Geometry const& geo);
-  virtual ~VScrollBarOverlayWindow() {}
+
+  nux::Property<double> scale;
 
   void UpdateGeometry(nux::Geometry const& geo);
   void SetThumbOffsetY(int y);
@@ -85,6 +86,7 @@
 
   void MouseDragging();
   void UpdateMouseOffsetX();
+  void UpdateContentGeometry();
   int GetValidOffsetYValue(int y) const;
 
   void ShouldShow();