Merge lp:~3v1n0/unity/hidpi-better-scaling into lp:unity

[Marco Trevisan (Treviño)]

Panel, Decorations, Launcher, Quicklist, Tooltip: correctly scale items based on the monitor settings

Adapt elements to match their monitor DPI scale settings.
We mostly use cairo_surface_set_device_scale to easily scale cairo-generated textures.

Lots of fixes around... Things should scale properly now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3726
http://jenkins.qa.ubuntu.com/job/unity-ci/713/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/245/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/247/console

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

We should just use RawPixels in:
992 === modified file 'launcher/QuicklistMenuItemSeparator.cpp'

That way we can each hard coded pixel to the correct Converter vs <number> * scale.

1659 + SetMinMaxSize(std::ceil(width * dpi_scale), std::ceil(height * dpi_scale));

Same here, as there is a valid cv_ here, we could jsut do width.CP(cv_) etc.

[Brandon Schaefer (brandontschaefer)]

Seeing offset issues with tooltips and quicklists. The only needs fixing issue i see. Unless you want to push those fixes later. Theres quite a bit of clean up in the tooltip/ql code so either way works for me.

As well as SVG panel indicator icon issues (Ill look into fixing this in a different branch so not a blocker for that).

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Nice. Changes look good to me. We did doubles before with the EMConverter to cater to Cairo, but now we use DPIScale() plus Cairos built in scale method. So we don't need double anymore, and best to round it in a smarter way. :).

Awesome!

review: Approve

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3727
http://jenkins.qa.ubuntu.com/job/unity-ci/715/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/247/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/249/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3731
http://jenkins.qa.ubuntu.com/job/unity-ci/716/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/250/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3735
http://jenkins.qa.ubuntu.com/job/unity-ci/717/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/251/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3736
http://jenkins.qa.ubuntu.com/job/unity-ci/718/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/252

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3737
http://jenkins.qa.ubuntu.com/job/unity-ci/719/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/253

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3744
http://jenkins.qa.ubuntu.com/job/unity-ci/720/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/254

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

New changes look good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3747
http://jenkins.qa.ubuntu.com/job/unity-ci/726/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/262
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/260

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/727/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/261

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3752
http://jenkins.qa.ubuntu.com/job/unity-ci/728/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/262

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3753
http://jenkins.qa.ubuntu.com/job/unity-ci/729/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/263

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3757
http://jenkins.qa.ubuntu.com/job/unity-ci/730/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/264/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3761
http://jenkins.qa.ubuntu.com/job/unity-ci/731/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/267/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/265/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3765
http://jenkins.qa.ubuntu.com/job/unity-ci/732/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/266/console

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Looks good, been testing it for a day or so now. Besides the tests not compiling, which is needs fixing, which i've already poked you about in IRC :).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3766
http://jenkins.qa.ubuntu.com/job/unity-ci/736/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/272
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/270

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3769
http://jenkins.qa.ubuntu.com/job/unity-ci/737/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/271/console

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

New failure in compiling :) (looks like panel_style something about nux object? strange error)

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Looks like a forward declaration error :(, now it doesn't know where Object/TEXT is defined. Possibly you'll need to be explicit with a few headers (that don't include all of Nux/Nux.h)

[Marco Trevisan (Treviño) (3v1n0)]

> Looks like a forward declaration error :(, now it doesn't know where
> Object/TEXT is defined. Possibly you'll need to be explicit with a few headers
> (that don't include all of Nux/Nux.h)

Ok, this should build now, to get high-resolution indicators (and faster as well) you also need lp:~3v1n0/libindicator/reduce-image-serialization

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3775
http://jenkins.qa.ubuntu.com/job/unity-ci/738/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/272

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3777
http://jenkins.qa.ubuntu.com/job/unity-ci/739/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/275
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/273

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3783
http://jenkins.qa.ubuntu.com/job/unity-ci/742/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/276

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3784
http://jenkins.qa.ubuntu.com/job/unity-ci/747/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/281

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-23 09:44:40 +0000
+++ CMakeLists.txt	2014-03-03 11:01:22 +0000
@@ -219,6 +219,7 @@
     ${UNITY_PROTOCOL_PRIVATE_DEPS}
     atk
     atk-bridge-2.0
+    cairo>=1.13.1
     dbusmenu-glib-0.4
     dee-1.0
     gio-2.0>=2.30.0

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2014-02-11 03:11:47 +0000
+++ UnityCore/DBusIndicators.cpp	2014-03-03 11:01:22 +0000
@@ -59,6 +59,7 @@
   void OnDisconnected();
 
   void OnReSync(GVariant* parameters);
+  void OnIconsPathChanged(GVariant* parameters);
   void OnEntryActivated(GVariant* parameters);
   void OnEntryActivatedRequest(GVariant* parameters);
   void OnEntryShowNowChanged(GVariant* parameters);
@@ -74,6 +75,7 @@
   glib::Source::UniquePtr reconnect_timeout_;
   glib::Source::UniquePtr show_entry_idle_;
   glib::Source::UniquePtr show_appmenu_idle_;
+  std::vector<std::string> icon_paths_;
   std::map<std::string, EntryLocationMap> cached_locations_;
 };
 
@@ -85,6 +87,7 @@
             G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES)
 {
   gproxy_.Connect("ReSync", sigc::mem_fun(this, &DBusIndicators::Impl::OnReSync));
+  gproxy_.Connect("IconPathsChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnIconsPathChanged));
   gproxy_.Connect("EntryActivated", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivated));
   gproxy_.Connect("EntryActivateRequest", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivatedRequest));
   gproxy_.Connect("EntryShowNowChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryShowNowChanged));
@@ -126,6 +129,7 @@
 
 void DBusIndicators::Impl::OnConnected()
 {
+  OnIconsPathChanged(nullptr);
   RequestSyncAll();
 }
 
@@ -156,6 +160,50 @@
   }
 }
 
+void DBusIndicators::Impl::OnIconsPathChanged(GVariant*)
+{
+  gproxy_.CallBegin("GetIconPaths", nullptr, [this] (GVariant* paths, glib::Error const& e) {
+    if (e || !paths)
+    {
+      LOG_ERROR(logger) << "Something went wrong on GetIconPaths: " << e;
+      return;
+    }
+
+    bool changed = false;
+    gsize length;
+    glib::Variant array(g_variant_get_child_value(paths, 0));
+    const gchar** icon_paths = g_variant_get_strv(array, &length);
+
+    if (icon_paths_.size() != length)
+    {
+      changed = true;
+    }
+    else
+    {
+      for (unsigned i = 0; i < length; ++i)
+      {
+        if (icon_paths_[i] != glib::gchar_to_string(icon_paths[i]))
+        {
+          changed = true;
+          break;
+        }
+      }
+    }
+
+    if (changed)
+    {
+      icon_paths_.resize(length);
+
+      for (unsigned i = 0; i < length; ++i)
+        icon_paths_[i] = glib::gchar_to_string(icon_paths[i]);
+
+      owner_->icon_paths_changed.emit();
+    }
+
+    g_free(icon_paths);
+  });
+}
+
 void DBusIndicators::Impl::OnEntryActivated(GVariant* parameters)
 {
   glib::String panel;
@@ -458,5 +506,10 @@
   pimpl->OnShowAppMenu(xid, x, y);
 }
 
+std::vector<std::string> const& DBusIndicators::IconPaths() const
+{
+  return pimpl->icon_paths_;
+}
+
 } // namespace indicator
 } // namespace unity

=== modified file 'UnityCore/DBusIndicators.h'
--- UnityCore/DBusIndicators.h	2014-01-28 11:50:02 +0000
+++ UnityCore/DBusIndicators.h	2014-03-03 11:01:22 +0000
@@ -38,6 +38,7 @@
   DBusIndicators();
   ~DBusIndicators();
 
+  std::vector<std::string> const& IconPaths() const;
   void ShowEntriesDropdown(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y);
   void SyncGeometries(std::string const& name, EntryLocationMap const& locations);
 

=== modified file 'UnityCore/GTKWrapper.h'
--- UnityCore/GTKWrapper.h	2013-05-17 16:52:19 +0000
+++ UnityCore/GTKWrapper.h	2014-03-03 11:01:22 +0000
@@ -29,13 +29,7 @@
 
 #if GTK_CHECK_VERSION(3, 8, 0)
 
-class IconInfo : public glib::Object<GtkIconInfo>
-{
-public:
-  IconInfo(GtkIconInfo *info = nullptr)
-    : glib::Object<GtkIconInfo>(info)
-  {}
-};
+typedef glib::Object<GtkIconInfo> IconInfo;
 
 #else
 

=== modified file 'UnityCore/Indicators.h'
--- UnityCore/Indicators.h	2014-02-12 23:37:24 +0000
+++ UnityCore/Indicators.h	2014-03-03 11:01:22 +0000
@@ -40,6 +40,7 @@
   virtual ~Indicators();
 
   IndicatorsList GetIndicators() const;
+  virtual std::vector<std::string> const& IconPaths() const = 0;
 
   virtual void SyncGeometries(std::string const& panel, EntryLocationMap const&) = 0;
   virtual void ShowEntriesDropdown(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y) = 0;
@@ -47,6 +48,7 @@
   // Signals
   sigc::signal<void, Indicator::Ptr const&> on_object_added;
   sigc::signal<void, Indicator::Ptr const&> on_object_removed;
+  sigc::signal<void> icon_paths_changed;
 
   /**
    * Service wants the view to activate an entry.

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2014-01-16 00:24:04 +0000
+++ dash/DashController.cpp	2014-03-03 11:01:22 +0000
@@ -92,7 +92,7 @@
   }
 
   SetupWindow();
-  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry>&) { Relayout(true); });
+  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); });
 
   Settings::Instance().form_factor.changed.connect([this](FormFactor)
   {
@@ -249,8 +249,7 @@
   nux::Geometry geo = GetIdealWindowGeometry();
   view_->Relayout();
   window_->SetGeometry(geo);
-  panel::Style &panel_style = panel::Style::Instance();
-  view_->SetMonitorOffset(launcher_width, panel_style.PanelHeight(monitor_));
+  view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_));
 }
 
 void Controller::OnMouseDownOutsideWindow(int x, int y,
@@ -299,9 +298,8 @@
   }
 
   monitor_ = GetIdealMonitor();
-
+  view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_));
   view_->AboutToShow();
-
   FocusWindow();
 
   need_show_ = false;

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-02-20 21:37:37 +0000
+++ dash/DashView.cpp	2014-03-03 11:01:22 +0000
@@ -36,7 +36,6 @@
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/KeyboardUtil.h"
 #include "unity-shared/PreviewStyle.h"
-#include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/WindowManager.h"
@@ -169,6 +168,8 @@
 {
   renderer_.x_offset = x;
   renderer_.y_offset = y;
+
+  top_space_->SetMinMaxSize(0, y);
 }
 
 bool DashView::IsCommandLensOpen() const
@@ -518,14 +519,14 @@
 void DashView::SetupViews()
 {
   dash::Style& style = dash::Style::Instance();
-  panel::Style &panel_style = panel::Style::Instance();
-  int panel_height = panel_style.PanelHeight();
 
   layout_ = new nux::VLayout();
   layout_->SetLeftAndRightPadding(style.GetVSeparatorSize(), 0);
   layout_->SetTopAndBottomPadding(style.GetHSeparatorSize(), 0);
   SetLayout(layout_);
-  layout_->AddLayout(new nux::SpaceLayout(0, 0, panel_height, panel_height), 0);
+
+  top_space_ = new nux::SpaceLayout(0, 0, renderer_.y_offset(), renderer_.y_offset());
+  layout_->AddLayout(top_space_, 0);
 
   content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);
   content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding(), 0);
@@ -611,8 +612,7 @@
 nux::Geometry DashView::GetBestFitGeometry(nux::Geometry const& for_geo)
 {
   dash::Style& style = dash::Style::Instance();
-  panel::Style &panel_style = panel::Style::Instance();
-  int panel_height = panel_style.PanelHeight();
+  int panel_height = renderer_.y_offset;
 
   int width = 0, height = 0;
   int tile_width = style.GetTileWidth();
@@ -649,29 +649,25 @@
 
 void DashView::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  panel::Style &panel_style = panel::Style::Instance();
   nux::Geometry const& renderer_geo_abs(GetRenderAbsoluteGeometry());
   nux::Geometry renderer_geo(GetGeometry());
-  int panel_height = panel_style.PanelHeight();
-
-  renderer_geo.y += panel_height;
-  renderer_geo.height += panel_height;
+  renderer_geo.y += renderer_.y_offset;
+  renderer_geo.height += renderer_.y_offset;
 
   renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, false);
 }
 
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
-  panel::Style& panel_style = panel::Style::Instance();
-  int panel_height = panel_style.PanelHeight();
+  int renderer_y_offset = renderer_.y_offset();
 
   nux::Geometry renderer_geo_abs(GetAbsoluteGeometry());
-  renderer_geo_abs.y += panel_height;
-  renderer_geo_abs.height -= panel_height;
+  renderer_geo_abs.y += renderer_y_offset;
+  renderer_geo_abs.height -= renderer_y_offset;
 
   nux::Geometry renderer_geo(GetGeometry());
-  renderer_geo.y += panel_height;
-  renderer_geo.height += panel_height;
+  renderer_geo.y += renderer_y_offset;
+  renderer_geo.height += renderer_y_offset;
 
   renderer_.DrawInner(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo);
 
@@ -1692,12 +1688,9 @@
 
 nux::Geometry DashView::GetRenderAbsoluteGeometry() const
 {
-  panel::Style &panel_style = panel::Style::Instance();
-  int panel_height = panel_style.PanelHeight();
-
   nux::Geometry renderer_geo_abs(GetAbsoluteGeometry());
-  renderer_geo_abs.y += panel_height;
-  renderer_geo_abs.height -= panel_height;
+  renderer_geo_abs.y += renderer_.y_offset;
+  renderer_geo_abs.height -= renderer_.y_offset;
   return renderer_geo_abs;
 }
 

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-11-20 21:39:40 +0000
+++ dash/DashView.h	2014-03-03 11:01:22 +0000
@@ -152,6 +152,7 @@
   SearchBar* search_bar_;
   nux::VLayout* scopes_layout_;
   ScopeBar* scope_bar_;
+  nux::SpaceLayout* top_space_;
 
   nux::ObjectPtr<ScopeView> active_scope_view_;
   nux::ObjectPtr<ScopeView> preview_scope_view_;

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2014-02-20 16:24:43 +0000
+++ decorations/DecoratedWindow.cpp	2014-03-03 11:01:22 +0000
@@ -25,7 +25,6 @@
 #include "DecorationsTitle.h"
 #include "DecorationsSlidingLayout.h"
 #include "DecorationsMenuLayout.h"
-#include "RawPixel.h"
 #include "WindowManager.h"
 #include "UnitySettings.h"
 
@@ -93,6 +92,7 @@
     return true;
   });
 
+  parent->dpi_scale.SetGetterFunction([this] { return cv_->DPIScale(); });
   parent->scaled.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::Update)));
 
   if (win_->isViewable() || win_->shaded())
@@ -141,16 +141,16 @@
     return;
 
   auto const& sb = Style::Get()->Border();
-  CompWindowExtents border(RawPixel(sb.left).CP(cv_),
-                           RawPixel(sb.right).CP(cv_),
-                           RawPixel(sb.top).CP(cv_),
-                           RawPixel(sb.bottom).CP(cv_));
+  CompWindowExtents border(cv_->CP(sb.left),
+                           cv_->CP(sb.right),
+                           cv_->CP(sb.top),
+                           cv_->CP(sb.bottom));
 
   auto const& ib = Style::Get()->InputBorder();
-  CompWindowExtents input(RawPixel(sb.left + ib.left).CP(cv_),
-                          RawPixel(sb.right + ib.right).CP(cv_),
-                          RawPixel(sb.top + ib.top).CP(cv_),
-                          RawPixel(sb.bottom + ib.bottom).CP(cv_));
+  CompWindowExtents input(cv_->CP(sb.left + ib.left),
+                          cv_->CP(sb.right + ib.right),
+                          cv_->CP(sb.top + ib.top),
+                          cv_->CP(sb.bottom + ib.bottom));
 
   if (win_->border() != border || win_->input() != input)
     win_->setWindowFrameExtents(&border, &input);
@@ -292,6 +292,11 @@
     Decorate();
   });
 
+  dpi_changed_ = Settings::Instance().dpi_changed.connect([this] {
+    Update();
+    top_layout_->scale = cv_->DPIScale();
+  });
+
   input_mixer_ = std::make_shared<InputMixer>();
 
   if (win_->actions() & CompWindowActionResizeMask)
@@ -314,7 +319,7 @@
   top_layout_->right_padding = padding.right;
   top_layout_->top_padding = padding.top;
   top_layout_->focused = active();
-  top_layout_->scale = Settings::Instance().em(monitor_)->DPIScale();
+  top_layout_->scale = cv_->DPIScale();
 
   if (win_->actions() & CompWindowActionCloseMask)
     top_layout_->Append(std::make_shared<WindowButton>(win_, WindowButtonType::CLOSE));
@@ -353,6 +358,7 @@
 
   UnsetAppMenu();
   theme_changed_->disconnect();
+  dpi_changed_->disconnect();
   top_layout_.reset();
   input_mixer_.reset();
   edge_borders_.reset();
@@ -413,9 +419,10 @@
 
   if (deco_tex.quad.box.width() != geo.width || deco_tex.quad.box.height() != geo.height)
   {
-    cu::CairoContext ctx(geo.width, geo.height);
+    double scale = top_layout_->scale();
+    cu::CairoContext ctx(geo.width, geo.height, scale);
     auto ws = active() ? WidgetState::NORMAL : WidgetState::BACKDROP;
-    Style::Get()->DrawSide(s, ws, ctx, geo.width, geo.height);
+    Style::Get()->DrawSide(s, ws, ctx, geo.width / scale, geo.height / scale);
     deco_tex.SetTexture(ctx);
   }
 
@@ -763,7 +770,7 @@
   .add("active", impl_->active())
   .add("scaled", scaled())
   .add("monitor", impl_->monitor_)
-  .add("dpi_scale", impl_->cv_->DPIScale())
+  .add("dpi_scale", dpi_scale())
   .add("xid", impl_->win_->id())
   .add("fully_decorable", cu::IsWindowFullyDecorable(impl_->win_))
   .add("shadow_decorable", cu::IsWindowShadowDecorable(impl_->win_))

=== modified file 'decorations/DecoratedWindow.h'
--- decorations/DecoratedWindow.h	2014-02-19 02:16:22 +0000
+++ decorations/DecoratedWindow.h	2014-03-03 11:01:22 +0000
@@ -43,6 +43,7 @@
 
   nux::RWProperty<std::string> title;
   nux::Property<bool> scaled;
+  nux::ROProperty<double> dpi_scale;
 
   void Update();
   void Undecorate();

=== modified file 'decorations/DecorationsDataPool.cpp'
--- decorations/DecorationsDataPool.cpp	2014-01-16 17:43:36 +0000
+++ decorations/DecorationsDataPool.cpp	2014-03-03 11:01:22 +0000
@@ -22,6 +22,8 @@
 #include <sigc++/adaptors/hide.h>
 #include "glow_texture.h"
 #include "DecorationsDataPool.h"
+#include "UnitySettings.h"
+#include "UScreen.h"
 
 namespace unity
 {
@@ -69,8 +71,12 @@
   SetupCursors();
   SetupTextures();
 
-  auto cb = sigc::hide(sigc::mem_fun(this, &DataPool::SetupTextures));
-  Style::Get()->theme.changed.connect(cb);
+  CompSize glow_size(texture::GLOW_SIZE, texture::GLOW_SIZE);
+  glow_texture_ = std::make_shared<cu::SimpleTexture>(GLTexture::imageDataToTexture(texture::GLOW, glow_size, GL_RGBA, GL_UNSIGNED_BYTE));
+
+  auto cb = sigc::mem_fun(this, &DataPool::SetupTextures);
+  Style::Get()->theme.changed.connect(sigc::hide(cb));
+  unity::Settings::Instance().dpi_changed.connect(cb);
 }
 
 DataPool::~DataPool()
@@ -98,37 +104,63 @@
 
 void DataPool::SetupTextures()
 {
-  CompSize size;
-  CompString plugin_name(PLUGIN_NAME);
   auto const& style = Style::Get();
-
-  for (unsigned button = 0; button < window_buttons_.size(); ++button)
+  unsigned monitors = UScreen::GetDefault()->GetPluggedMonitorsNumber();
+  auto& settings = Settings::Instance();
+  bool found_normal = false;
+  nux::Size size;
+
+  scaled_window_buttons_.clear();
+
+  for (unsigned monitor = 0; monitor < monitors; ++monitor)
   {
-    for (unsigned state = 0; state < window_buttons_[button].size(); ++state)
-    {
-      auto file = style->WindowButtonFile(WindowButtonType(button), WidgetState(state));
-      auto const& tex_list = GLTexture::readImageToTexture(file, plugin_name, size);
-
-      if (!tex_list.empty())
-      {
-        LOG_DEBUG(logger) << "Loading texture " << file;
-        window_buttons_[button][state] = std::make_shared<cu::SimpleTexture>(tex_list);
-      }
-      else
-      {
-        LOG_WARN(logger) << "Impossible to load local button texture file; "
-                         << "falling back to cairo generated one";
-
-        cu::CairoContext ctx(BUTTONS_SIZE + BUTTONS_PADDING*2, BUTTONS_SIZE + BUTTONS_PADDING*2);
-        cairo_translate(ctx, BUTTONS_PADDING, BUTTONS_PADDING);
-        style->DrawWindowButton(WindowButtonType(button), WidgetState(state), ctx, BUTTONS_SIZE, BUTTONS_SIZE);
-        window_buttons_[button][state] = ctx;
+    double scale = settings.em(monitor)->DPIScale();
+    bool scaled = (scale != 1.0f);
+
+    if (!scaled)
+    {
+      if (found_normal)
+        continue;
+
+      found_normal = true;
+    }
+
+    auto& destination = scaled ? scaled_window_buttons_[scale] : window_buttons_;
+
+    for (unsigned button = 0; button < window_buttons_.size(); ++button)
+    {
+      for (unsigned state = 0; state < window_buttons_[button].size(); ++state)
+      {
+        glib::Error error;
+        auto const& file = style->WindowButtonFile(WindowButtonType(button), WidgetState(state));
+        gdk_pixbuf_get_file_info(file.c_str(), &size.width, &size.height);
+
+        size.width = std::round(size.width * scale);
+        size.height = std::round(size.height * scale);
+        glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_size(file.c_str(), size.width, size.height, &error));
+
+        if (pixbuf)
+        {
+          LOG_DEBUG(logger) << "Loading texture " << file;
+          cu::CairoContext ctx(size.width, size.height);
+          gdk_cairo_set_source_pixbuf(ctx, pixbuf, 0, 0);
+          cairo_paint(ctx);
+          destination[button][state] = ctx;
+        }
+        else
+        {
+          LOG_WARN(logger) << "Impossible to load local button texture file: "
+                           << error << "; falling back to cairo generated one.";
+
+          int button_size = std::round((BUTTONS_SIZE + BUTTONS_PADDING * 2) * scale);
+          cu::CairoContext ctx(button_size, button_size, scale);
+          cairo_translate(ctx, BUTTONS_PADDING, BUTTONS_PADDING);
+          style->DrawWindowButton(WindowButtonType(button), WidgetState(state), ctx, BUTTONS_SIZE, BUTTONS_SIZE);
+          destination[button][state] = ctx;
+        }
       }
     }
   }
-
-  CompSize glow_size(texture::GLOW_SIZE, texture::GLOW_SIZE);
-  glow_texture_ = std::make_shared<cu::SimpleTexture>(GLTexture::imageDataToTexture(texture::GLOW, glow_size, GL_RGBA, GL_UNSIGNED_BYTE));
 }
 
 cu::SimpleTexture::Ptr const& DataPool::GlowTexture() const
@@ -149,5 +181,26 @@
   return window_buttons_[unsigned(wbt)][unsigned(ws)];
 }
 
+cu::SimpleTexture::Ptr const& DataPool::ButtonTexture(double scale, WindowButtonType wbt, WidgetState ws) const
+{
+  if (wbt >= WindowButtonType::Size || ws >= WidgetState::Size)
+  {
+    LOG_ERROR(logger) << "It has been requested an invalid button texture "
+                      << "WindowButtonType: " << unsigned(wbt) << ", WidgetState: "
+                      << unsigned(ws);
+    return EMPTY_BUTTON;
+  }
+
+  if (scale == 1.0f)
+    return window_buttons_[unsigned(wbt)][unsigned(ws)];
+
+  auto it = scaled_window_buttons_.find(scale);
+
+  if (it == scaled_window_buttons_.end())
+    return EMPTY_BUTTON;
+
+  return it->second[unsigned(wbt)][unsigned(ws)];
+}
+
 } // decoration namespace
 } // unity namespace

=== modified file 'decorations/DecorationsDataPool.h'
--- decorations/DecorationsDataPool.h	2014-01-16 17:43:36 +0000
+++ decorations/DecorationsDataPool.h	2014-03-03 11:01:22 +0000
@@ -20,6 +20,7 @@
 #ifndef UNITY_DECORATIONS_DATA_POOL
 #define UNITY_DECORATIONS_DATA_POOL
 
+#include <unordered_map>
 #include "DecorationStyle.h"
 #include "DecorationsEdge.h"
 
@@ -39,6 +40,7 @@
   Cursor EdgeCursor(Edge::Type) const;
   cu::SimpleTexture::Ptr const& GlowTexture() const;
   cu::SimpleTexture::Ptr const& ButtonTexture(WindowButtonType, WidgetState) const;
+  cu::SimpleTexture::Ptr const& ButtonTexture(double scale, WindowButtonType, WidgetState) const;
 
 private:
   DataPool();
@@ -50,7 +52,10 @@
 
   std::array<Cursor, size_t(Edge::Type::Size)> edge_cursors_;
   cu::SimpleTexture::Ptr glow_texture_;
-  std::array<std::array<cu::SimpleTexture::Ptr, size_t(WidgetState::Size)>, size_t(WindowButtonType::Size)> window_buttons_;
+
+  typedef std::array<std::array<cu::SimpleTexture::Ptr, size_t(WidgetState::Size)>, size_t(WindowButtonType::Size)> WindowButtonsArray;
+  WindowButtonsArray window_buttons_;
+  std::unordered_map<double, WindowButtonsArray> scaled_window_buttons_;
 };
 
 } // decoration namespace

=== modified file 'decorations/DecorationsMenuDropdown.cpp'
--- decorations/DecorationsMenuDropdown.cpp	2014-02-13 00:48:21 +0000
+++ decorations/DecorationsMenuDropdown.cpp	2014-03-03 11:01:22 +0000
@@ -75,15 +75,12 @@
   if (std::find(children_.begin(), children_.end(), child) != children_.end())
     return;
 
-  if (children_.empty())
+  int size_diff = (child->GetNaturalHeight() - GetNaturalHeight()) / scale();
+
+  if (size_diff > 0)
   {
-    int size_diff = child->GetNaturalHeight() - GetNaturalHeight();
-
-    if (size_diff > 0)
-    {
-      natural_.height += (size_diff % 2);
-      vertical_padding = vertical_padding() + (size_diff / 2);
-    }
+    natural_.height += (size_diff % 2);
+    vertical_padding = vertical_padding() + (size_diff / 2);
   }
 
   children_.push_front(child);
@@ -122,14 +119,17 @@
 void MenuDropdown::RenderTexture()
 {
   WidgetState state = active() ? WidgetState::PRELIGHT : WidgetState::NORMAL;
-  cu::CairoContext icon_ctx(GetNaturalWidth(), GetNaturalHeight());
+  cu::CairoContext icon_ctx(GetNaturalWidth(), GetNaturalHeight(), scale());
 
   if (state == WidgetState::PRELIGHT)
-    Style::Get()->DrawMenuItem(state, icon_ctx, icon_ctx.width(), icon_ctx.height());
+    Style::Get()->DrawMenuItem(state, icon_ctx, icon_ctx.width() / scale(), icon_ctx.height() / scale());
 
   cairo_save(icon_ctx);
   cairo_translate(icon_ctx, horizontal_padding(), vertical_padding());
-  Style::Get()->DrawMenuItemIcon(ICON_NAME, state, icon_ctx, ICON_SIZE);
+  cairo_save(icon_ctx);
+  cairo_scale(icon_ctx, 1.0f/scale(), 1.0f/scale());
+  Style::Get()->DrawMenuItemIcon(ICON_NAME, state, icon_ctx, ICON_SIZE * scale());
+  cairo_restore(icon_ctx);
   cairo_restore(icon_ctx);
   SetTexture(icon_ctx);
 }

=== modified file 'decorations/DecorationsMenuEntry.cpp'
--- decorations/DecorationsMenuEntry.cpp	2014-02-14 19:01:49 +0000
+++ decorations/DecorationsMenuEntry.cpp	2014-03-03 11:01:22 +0000
@@ -41,6 +41,7 @@
   entry_->updated.connect(sigc::mem_fun(this, &MenuEntry::EntryUpdated));
   horizontal_padding.changed.connect(sigc::hide(sigc::mem_fun(this, &MenuEntry::RenderTexture)));
   vertical_padding.changed.connect(sigc::hide(sigc::mem_fun(this, &MenuEntry::RenderTexture)));
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &MenuEntry::RenderTexture)));
   in_dropdown.changed.connect([this] (bool in) { visible = entry_->visible() && !in; });
   EntryUpdated();
 }
@@ -71,10 +72,10 @@
     state = WidgetState::PRELIGHT;
 
   natural_ = Style::Get()->MenuItemNaturalSize(entry_->label());
-  cu::CairoContext text_ctx(GetNaturalWidth(), GetNaturalHeight());
+  cu::CairoContext text_ctx(GetNaturalWidth(), GetNaturalHeight(), scale());
 
   if (state == WidgetState::PRELIGHT)
-    Style::Get()->DrawMenuItem(state, text_ctx, text_ctx.width(), text_ctx.height());
+    Style::Get()->DrawMenuItem(state, text_ctx, text_ctx.width() / scale(), text_ctx.height() / scale());
 
   cairo_save(text_ctx);
   cairo_translate(text_ctx, horizontal_padding(), vertical_padding());
@@ -95,12 +96,12 @@
 
 int MenuEntry::GetNaturalWidth() const
 {
-  return natural_.width + horizontal_padding() * 2;
+  return (natural_.width + horizontal_padding() * 2) * scale();
 }
 
 int MenuEntry::GetNaturalHeight() const
 {
-  return natural_.height + vertical_padding() * 2;
+  return (natural_.height + vertical_padding() * 2) * scale();
 }
 
 void MenuEntry::ButtonDownEvent(CompPoint const& p, unsigned button, Time timestamp)

=== modified file 'decorations/DecorationsMenuLayout.cpp'
--- decorations/DecorationsMenuLayout.cpp	2014-02-13 03:33:02 +0000
+++ decorations/DecorationsMenuLayout.cpp	2014-03-03 11:01:22 +0000
@@ -63,6 +63,7 @@
     menu->active.changed.connect(active_cb);
     menu->show_now.changed.connect(show_now_cb);
     menu->focused = focused();
+    menu->scale = scale();
     menu->SetParent(shared_from_this());
     items_.push_back(menu);
   }
@@ -185,8 +186,13 @@
 
 void MenuLayout::DoRelayout()
 {
+  float scale = this->scale();
+  int inner_padding = this->inner_padding().CP(scale);
+  int left_padding = this->left_padding().CP(scale);
+  int right_padding = this->right_padding().CP(scale);
+
   int dropdown_width = dropdown_->GetNaturalWidth();
-  int accumolated_width = dropdown_width + left_padding() + right_padding() - inner_padding();
+  int accumolated_width = dropdown_width + left_padding + right_padding - inner_padding;
   int max_width = max_.width;
   std::list<MenuEntry::Ptr> to_hide;
 
@@ -195,7 +201,7 @@
     if (!item->visible() || item == dropdown_)
       continue;
 
-    accumolated_width += item->GetNaturalWidth() + inner_padding();
+    accumolated_width += item->GetNaturalWidth() + inner_padding;
 
     if (accumolated_width > max_width)
       to_hide.push_front(std::static_pointer_cast<MenuEntry>(item));

=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2014-02-19 02:16:22 +0000
+++ decorations/DecorationsPriv.h	2014-03-03 11:01:22 +0000
@@ -126,6 +126,7 @@
   nux::Geometry frame_geo_;
   CompRegion frame_region_;
   connection::Wrapper theme_changed_;
+  connection::Wrapper dpi_changed_;
   connection::Wrapper grab_mouse_changed_;
   std::string last_title_;
   std::vector<cu::SimpleTextureQuad> bg_textures_;

=== modified file 'decorations/DecorationsSlidingLayout.cpp'
--- decorations/DecorationsSlidingLayout.cpp	2014-02-19 00:01:16 +0000
+++ decorations/DecorationsSlidingLayout.cpp	2014-03-03 11:01:22 +0000
@@ -88,6 +88,7 @@
   {
     input_item_->SetParent(shared_from_this());
     input_item_->focused = focused();
+    input_item_->scale = scale();
   }
 
   Relayout();

=== modified file 'decorations/DecorationsTitle.cpp'
--- decorations/DecorationsTitle.cpp	2014-01-20 18:10:44 +0000
+++ decorations/DecorationsTitle.cpp	2014-03-03 11:01:22 +0000
@@ -30,6 +30,7 @@
 {
   text.changed.connect(sigc::mem_fun(this, &Title::OnTextChanged));
   focused.changed.connect(sigc::hide(sigc::mem_fun(this, &Title::RenderTexture)));
+  scale.changed.connect([this] (double) { text.changed.emit(text()); });
   Style::Get()->title_font.changed.connect(sigc::mem_fun(this, &Title::OnFontChanged));
 }
 
@@ -37,6 +38,8 @@
 {
   bool damaged = false;
   auto real_size = Style::Get()->TitleNaturalSize(new_text);
+  real_size.width *= scale();
+  real_size.height *= scale();
 
   if (GetNaturalWidth() > real_size.width || GetNaturalHeight() > real_size.height)
   {
@@ -59,8 +62,8 @@
 void Title::RenderTexture()
 {
   auto state = focused() ? WidgetState::NORMAL : WidgetState::BACKDROP;
-  cu::CairoContext text_ctx(texture_size_.width, texture_size_.height);
-  Style::Get()->DrawTitle(text(), state, text_ctx, texture_size_.width, texture_size_.height);
+  cu::CairoContext text_ctx(texture_size_.width, texture_size_.height, scale());
+  Style::Get()->DrawTitle(text(), state, text_ctx, texture_size_.width / scale(), texture_size_.height / scale());
   SetTexture(text_ctx);
 }
 

=== modified file 'decorations/DecorationsWidgets.cpp'
--- decorations/DecorationsWidgets.cpp	2014-02-19 00:01:16 +0000
+++ decorations/DecorationsWidgets.cpp	2014-03-03 11:01:22 +0000
@@ -226,17 +226,6 @@
 
 //
 
-TexturedItem::TexturedItem()
-{
-  scale.changed.connect([this] (float s) {
-    if (texture_.SetScale(s))
-    {
-      geo_parameters_changed.emit();
-      Damage();
-    }
-  });
-}
-
 void TexturedItem::SetTexture(cu::SimpleTexture::Ptr const& tex)
 {
   auto prev_geo = Geometry();
@@ -274,12 +263,12 @@
 
 int TexturedItem::GetNaturalWidth() const
 {
-  return (texture_) ? texture_.st->width() * scale() : Item::GetNaturalWidth();
+  return (texture_) ? texture_.st->width() : Item::GetNaturalWidth();
 }
 
 int TexturedItem::GetNaturalHeight() const
 {
-  return (texture_) ? texture_.st->height() * scale() : Item::GetNaturalHeight();
+  return (texture_) ? texture_.st->height() : Item::GetNaturalHeight();
 }
 
 CompRect& TexturedItem::InternalGeo()
@@ -387,8 +376,14 @@
 
 CompRect Layout::ContentGeometry() const
 {
-  return CompRect(rect_.x() + min(left_padding(), rect_.width()),
-                  rect_.y() + min(top_padding(), rect_.height()),
+  float scale = this->scale();
+  int left_padding = this->left_padding().CP(scale);
+  int right_padding = this->right_padding().CP(scale);
+  int top_padding = this->top_padding().CP(scale);
+  int bottom_padding = this->bottom_padding().CP(scale);
+
+  return CompRect(rect_.x() + min(left_padding, rect_.width()),
+                  rect_.y() + min(top_padding, rect_.height()),
                   clamp_size(rect_.width() - left_padding - right_padding),
                   clamp_size(rect_.height() - top_padding - bottom_padding));
 }
@@ -396,13 +391,19 @@
 void Layout::DoRelayout()
 {
   int loop = 0;
+  float scale = this->scale();
+  int inner_padding = this->inner_padding().CP(scale);
+  int left_padding = this->left_padding().CP(scale);
+  int right_padding = this->right_padding().CP(scale);
+  int top_padding = this->top_padding().CP(scale);
+  int bottom_padding = this->bottom_padding().CP(scale);
 
   nux::Size available_space(clamp_size(max_.width - left_padding - right_padding),
                             clamp_size(max_.height - top_padding - bottom_padding));
 
   do
   {
-    nux::Size content(min(left_padding(), max_.width), 0);
+    nux::Size content(min(left_padding, max_.width), 0);
 
     for (auto const& item : items_)
     {
@@ -428,7 +429,7 @@
     if (!items_.empty() && content.width > inner_padding)
       content.width -= inner_padding;
 
-    int actual_right_padding = max(0, min(right_padding(), max_.width - content.width));
+    int actual_right_padding = max(0, min(right_padding, max_.width - content.width));
     int vertical_padding = top_padding + bottom_padding;
 
     content.width += actual_right_padding;
@@ -490,7 +491,7 @@
   }
 }
 
-bool Layout::SetPadding(int& target, int new_value)
+bool Layout::SetPadding(RawPixel& target, RawPixel const& new_value)
 {
   int padding = clamp_size(new_value);
 

=== modified file 'decorations/DecorationsWidgets.h'
--- decorations/DecorationsWidgets.h	2014-02-19 00:01:16 +0000
+++ decorations/DecorationsWidgets.h	2014-03-03 11:01:22 +0000
@@ -26,6 +26,7 @@
 #include <UnityCore/UWeakPtr.h>
 #include "Introspectable.h"
 #include "CompizUtils.h"
+#include "RawPixel.h"
 
 namespace unity
 {
@@ -49,7 +50,7 @@
   nux::Property<bool> focused;
   nux::Property<bool> sensitive;
   nux::Property<bool> mouse_owner;
-  nux::Property<float> scale;
+  nux::Property<double> scale;
 
   CompRect const& Geometry() const;
   virtual int GetNaturalWidth() const;
@@ -120,8 +121,6 @@
 public:
   typedef std::shared_ptr<TexturedItem> Ptr;
 
-  TexturedItem();
-
   void SetTexture(cu::SimpleTexture::Ptr const&);
   void Draw(GLWindow*, GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
   void SetCoords(int x, int y);
@@ -171,11 +170,11 @@
 
   Layout();
 
-  nux::Property<int> inner_padding;
-  nux::Property<int> left_padding;
-  nux::Property<int> right_padding;
-  nux::Property<int> top_padding;
-  nux::Property<int> bottom_padding;
+  nux::Property<RawPixel> inner_padding;
+  nux::Property<RawPixel> left_padding;
+  nux::Property<RawPixel> right_padding;
+  nux::Property<RawPixel> top_padding;
+  nux::Property<RawPixel> bottom_padding;
 
   void Append(Item::Ptr const&);
   void Remove(Item::Ptr const&);
@@ -189,7 +188,7 @@
   void DoRelayout();
 
 private:
-  bool SetPadding(int& target, int new_value);
+  bool SetPadding(RawPixel& target, RawPixel const& new_value);
 };
 
 } // decoration namespace

=== modified file 'decorations/DecorationsWindowButton.cpp'
--- decorations/DecorationsWindowButton.cpp	2014-02-19 02:16:22 +0000
+++ decorations/DecorationsWindowButton.cpp	2014-03-03 11:01:22 +0000
@@ -38,12 +38,13 @@
   auto cb = sigc::hide(sigc::mem_fun(this, &WindowButton::UpdateTexture));
   mouse_owner.changed.connect(cb);
   focused.changed.connect(cb);
+  scale.changed.connect(cb);
   UpdateTexture();
 }
 
 void WindowButton::UpdateTexture()
 {
-  SetTexture(DataPool::Get()->ButtonTexture(type_, GetCurrentState()));
+  SetTexture(DataPool::Get()->ButtonTexture(scale(), type_, GetCurrentState()));
 }
 
 WidgetState WindowButton::GetCurrentState() const

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2014-02-17 17:55:29 +0000
+++ hud/HudController.cpp	2014-03-03 11:01:22 +0000
@@ -76,7 +76,7 @@
   }
 
   SetupWindow();
-  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry>&) { Relayout(true); });
+  UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const&) { Relayout(true); });
 
   ubus.RegisterInterest(UBUS_HUD_CLOSE_REQUEST, sigc::mem_fun(this, &Controller::OnExternalHideHud));
 

=== modified file 'launcher/CairoBaseWindow.cpp'
--- launcher/CairoBaseWindow.cpp	2014-02-19 14:01:02 +0000
+++ launcher/CairoBaseWindow.cpp	2014-03-03 11:01:22 +0000
@@ -54,7 +54,10 @@
   fade_animator_.updated.connect(sigc::mem_fun(this, &BaseWindow::SetOpacity));
   fade_animator_.finished.connect([this] {
     if (animation::GetDirection(fade_animator_) == animation::Direction::BACKWARD)
+    {
       ShowWindow(false);
+      hidden.emit();
+    }
   });
 }
 

=== modified file 'launcher/CairoBaseWindow.h'
--- launcher/CairoBaseWindow.h	2014-02-19 14:01:02 +0000
+++ launcher/CairoBaseWindow.h	2014-03-03 11:01:22 +0000
@@ -32,7 +32,6 @@
   NUX_DECLARE_OBJECT_TYPE(CairoBaseWindow, nux::BaseWindow);
 public:
   CairoBaseWindow(int monitor = 0);
-  virtual ~CairoBaseWindow() = default;
 
   virtual void Show();
   virtual void Hide();
@@ -40,6 +39,8 @@
   void RedrawBlur();
   bool HasBlurredBackground() const;
 
+  sigc::signal<void> hidden;
+
 protected:
   void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
 

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2013-11-14 03:00:29 +0000
+++ launcher/EdgeBarrierController.cpp	2014-03-03 11:01:22 +0000
@@ -87,7 +87,7 @@
   ResizeBarrierList(monitors);
 
   /* FIXME: Back to c++11 lambda once we get sigc::track_obj.
-  uscreen->changed.connect(sigc::track_obj(([this](int primary, std::vector<nux::Geometry>& layout) {
+  uscreen->changed.connect(sigc::track_obj(([this](int primary, std::vector<nux::Geometry> const& layout) {
     ResizeBarrierList(layout);
     SetupBarriers(layout);
   }));*/
@@ -123,7 +123,7 @@
   nux::GetGraphicsDisplay()->RemoveEventFilter(this);
 }
 
-void EdgeBarrierController::Impl::OnUScreenChanged(int primary, std::vector<nux::Geometry>& layout)
+void EdgeBarrierController::Impl::OnUScreenChanged(int primary, std::vector<nux::Geometry> const& layout)
 {
   ResizeBarrierList(layout);
   SetupBarriers(layout);

=== modified file 'launcher/EdgeBarrierControllerPrivate.h'
--- launcher/EdgeBarrierControllerPrivate.h	2013-09-23 20:07:45 +0000
+++ launcher/EdgeBarrierControllerPrivate.h	2014-03-03 11:01:22 +0000
@@ -41,7 +41,7 @@
   void ResizeBarrierList(std::vector<nux::Geometry> const& layout);
   void SetupBarriers(std::vector<nux::Geometry> const& layout);
 
-  void OnUScreenChanged(int primary, std::vector<nux::Geometry>& layout);
+  void OnUScreenChanged(int primary, std::vector<nux::Geometry> const& layout);
   void OnOptionsChanged();
 
   void OnPointerBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr const& event);

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-02-18 20:41:58 +0000
+++ launcher/Launcher.cpp	2014-03-03 11:01:22 +0000
@@ -145,9 +145,8 @@
   , cv_(unity::Settings::Instance().em(monitor))
 {
   icon_renderer_->monitor = monitor();
-  icon_renderer_->SetTargetSize(icon_size_.CP(cv_),
-                                DEFAULT_ICON_SIZE.CP(cv_),
-                                SPACE_BETWEEN_ICONS.CP(cv_));
+  icon_renderer_->scale = cv_->DPIScale();
+  icon_renderer_->SetTargetSize(icon_size_.CP(cv_), DEFAULT_ICON_SIZE.CP(cv_), SPACE_BETWEEN_ICONS.CP(cv_));
 
   CaptureMouseDownAnyWhereElse(true);
   SetAcceptKeyNavFocusOnMouseDown(false);
@@ -254,7 +253,7 @@
   .add("quicklist-open", hide_machine_.GetQuirk(LauncherHideMachine::QUICKLIST_OPEN))
   .add("hide-quirks", hide_machine_.DebugHideQuirks())
   .add("hover-quirks", hover_machine_.DebugHoverQuirks())
-  .add("icon-size", icon_size_)
+  .add("icon-size", icon_size_.CP(cv_))
   .add("shortcuts_shown", shortcuts_shown_)
   .add("tooltip-shown", active_tooltip_ != nullptr);
 }
@@ -330,7 +329,7 @@
 
 void Launcher::OnDPIChanged()
 {
-  UpdateOptions(options());
+  monitor.changed.emit(monitor());
 }
 
 void Launcher::SetDndDelta(float x, float y, nux::Geometry const& geo)
@@ -1200,11 +1199,11 @@
   unity::panel::Style &panel_style = panel::Style::Instance();
   int panel_height = panel_style.PanelHeight(new_monitor);
 
-  Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_height),
-         monitor_geo.height - panel_height);
+  cv_ = unity::Settings::Instance().em(monitor);
+  Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_height), monitor_geo.height - panel_height);
+
   icon_renderer_->monitor = new_monitor;
-
-  cv_ = unity::Settings::Instance().em(monitor);
+  SetIconSize(options()->tile_size, options()->icon_size);
 }
 
 void Launcher::UpdateOptions(Options::Ptr options)
@@ -1492,11 +1491,9 @@
   ui::IconRenderer::DestroyShortcutTextures();
 
   icon_size_ = tile_size;
-  icon_renderer_->SetTargetSize(icon_size_.CP(cv_),
-                                RawPixel(icon_size).CP(cv_),
-                                SPACE_BETWEEN_ICONS.CP(cv_));
-
-  AbstractLauncherIcon::icon_size = icon_size_.CP(cv_);
+  icon_renderer_->scale = cv_->DPIScale();
+  icon_renderer_->SetTargetSize(icon_size_.CP(cv_), RawPixel(icon_size).CP(cv_), SPACE_BETWEEN_ICONS.CP(cv_));
+  AbstractLauncherIcon::icon_size = icon_size_;
 
   nux::Geometry const& parent_geo = parent_->GetGeometry();
   Resize(nux::Point(parent_geo.x, parent_geo.y), parent_geo.height);

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2014-02-26 21:27:13 +0000
+++ launcher/LauncherController.cpp	2014-03-03 11:01:22 +0000
@@ -127,7 +127,7 @@
 
   UScreen* uscreen = UScreen::GetDefault();
   EnsureLaunchers(uscreen->GetPrimaryMonitor(), uscreen->GetMonitors());
-
+  uscreen->changed.connect(sigc::mem_fun(this, &Controller::Impl::EnsureLaunchers));
   SetupIcons();
 
   remote_model_.entry_added.connect(sigc::mem_fun(this, &Impl::OnLauncherEntryRemoteAdded));
@@ -149,8 +149,6 @@
     hud->SetHideMode(mode);
   });
 
-  uscreen->changed.connect(sigc::mem_fun(this, &Controller::Impl::OnScreenChanged));
-
   WindowManager& wm = WindowManager::Default();
   wm.window_focus_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnWindowFocusChanged));
   wm.viewport_layout_changed.connect(sigc::group(sigc::mem_fun(this, &Controller::Impl::UpdateNumWorkspaces), sigc::_1 * sigc::_2));
@@ -171,8 +169,6 @@
     }
   });
 
-  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnDPIChanged));
-
   parent_->AddChild(model_.get());
 
   xdnd_manager_->dnd_started.connect(sigc::mem_fun(this, &Impl::OnDndStarted));
@@ -254,11 +250,6 @@
   launchers.resize(num_launchers);
 }
 
-void Controller::Impl::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)
-{
-  EnsureLaunchers(primary_monitor, monitors);
-}
-
 void Controller::Impl::OnWindowFocusChanged(guint32 xid)
 {
   static bool keynav_first_focus = false;
@@ -553,22 +544,6 @@
   }
 }
 
-void Controller::Impl::OnDPIChanged()
-{
-  for (auto const& launcher_ptr : launchers)
-  {
-    if (launcher_ptr)
-    {
-      nux::Geometry const& parent_geo = launcher_ptr->GetParent()->GetGeometry();
-      int monitor = launcher_ptr->monitor();
-      int height  = panel::Style::Instance().PanelHeight(monitor);
-      int diff    = height - parent_geo.y;
-
-      launcher_ptr->Resize(nux::Point(parent_geo.x, parent_geo.y + diff), parent_geo.height - diff);
-    }
-  }
-}
-
 void Controller::Impl::OnIconRemoved(AbstractLauncherIcon::Ptr const& icon)
 {
   SortAndUpdate();

=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2014-02-18 20:22:05 +0000
+++ launcher/LauncherControllerPrivate.h	2014-03-03 11:01:22 +0000
@@ -98,8 +98,6 @@
 
   void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
 
-  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
-
   void OnWindowFocusChanged (guint32 xid);
 
   void OnApplicationStarted(ApplicationPtr const& app);
@@ -119,8 +117,6 @@
   void OnDndMonitorChanged(std::string const& data, int old_monitor, int new_monitor);
   GVariant* OnDBusMethodCall(std::string const& method, GVariant *parameters);
 
-  void OnDPIChanged();
-
   Controller* parent_;
   LauncherModel::Ptr model_;
   nux::ObjectPtr<Launcher> launcher_;

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2014-02-19 02:16:22 +0000
+++ launcher/LauncherIcon.cpp	2014-03-03 11:01:22 +0000
@@ -99,9 +99,6 @@
   mouse_up.connect(sigc::mem_fun(this, &LauncherIcon::RecvMouseUp));
   mouse_click.connect(sigc::mem_fun(this, &LauncherIcon::RecvMouseClick));
 
-  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &LauncherIcon::LoadTooltip));
-  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &LauncherIcon::LoadQuicklist));
-
   for (unsigned i = 0; i < monitors::MAX; ++i)
   {
     for (unsigned j = 0; j < static_cast<unsigned>(Quirk::LAST); ++j)
@@ -124,6 +121,7 @@
   _tooltip = new Tooltip(monitor);
   _tooltip->SetOpacity(0.0f);
   _tooltip->text = tooltip_text();
+  _tooltip->hidden.connect([this] { _tooltip.Release(); });
   debug::Introspectable::AddChild(_tooltip.GetPointer());
 }
 
@@ -134,6 +132,7 @@
     monitor = 0;
 
   _quicklist = new QuicklistView(monitor);
+  _quicklist->hidden.connect([this] { _quicklist.Release(); });
   debug::Introspectable::AddChild(_quicklist.GetPointer());
 
   _quicklist->mouse_down_outside_pointer_grab_area.connect([this] (int x, int y, unsigned long button_flags, unsigned long key_flags)
@@ -478,7 +477,8 @@
 
 nux::Point LauncherIcon::GetTipPosition(int monitor) const
 {
-  return nux::Point(_center[monitor].x + icon_size()/2 + 1, _center[monitor].y);
+  auto const& converter = Settings::Instance().em(monitor);
+  return nux::Point(_center[monitor].x + converter->CP(icon_size()) / 2 + 1, _center[monitor].y);
 }
 
 void LauncherIcon::ShowTooltip()
@@ -514,20 +514,17 @@
 {
   MenuItemsVector const& menus = Menus();
 
-  if (!_quicklist)
-    LoadQuicklist();
-
   if (menus.empty())
     return false;
 
+  LoadQuicklist();
+
   if (_tooltip)
   {
     // Hide the tooltip without fade animation
     _tooltip->ShowWindow(false);
   }
 
-  _quicklist->RemoveAllMenuItem();
-
   for (auto const& menu_item : menus)
   {
     QuicklistMenuItem* ql_item = nullptr;

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2014-02-13 10:14:20 +0000
+++ launcher/QuicklistMenuItem.cpp	2014-03-03 11:01:22 +0000
@@ -41,6 +41,7 @@
   , _menu_item(item)
   , _activate_timestamp(0)
   , _prelight(false)
+  , _scale(1.0f)
 {
   mouse_up.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseUp));
   mouse_click.connect(sigc::mem_fun(this, &QuicklistMenuItem::RecvMouseClick));
@@ -198,15 +199,21 @@
   sigMouseLeave.emit(this);
 }
 
+void QuicklistMenuItem::UpdateTexture()
+{
+  auto const& geo = GetGeometry();
+  nux::CairoGraphics cairo(CAIRO_FORMAT_ARGB32, geo.width * _scale, geo.height * _scale);
+  cairo_surface_set_device_scale(cairo.GetSurface(), _scale, _scale);
+  UpdateTexture(cairo, geo.width / _scale, geo.height / _scale);
+}
+
 void QuicklistMenuItem::PreLayoutManagement()
 {
   _pre_layout_width = GetBaseWidth();
   _pre_layout_height = GetBaseHeight();
 
   if (!_normalTexture[0])
-  {
     UpdateTexture();
-  }
 
   View::PreLayoutManagement();
 }
@@ -277,7 +284,7 @@
   return _text_extents;
 }
 
-void QuicklistMenuItem::DrawText(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color)
+void QuicklistMenuItem::DrawText(nux::CairoGraphics& cairo, double width, double height, nux::Color const& color)
 {
   if (_text.empty())
     return;
@@ -288,8 +295,7 @@
   glib::String font_name;
   g_object_get(settings, "gtk-font-name", &font_name, nullptr);
 
-  std::shared_ptr<cairo_t> cairo_context(cairo.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairo.GetInternalContext();
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, color.red, color.blue, color.green, color.alpha);
   cairo_set_font_options(cr, gdk_screen_get_font_options(screen));
@@ -297,6 +303,7 @@
   glib::Object<PangoLayout> layout(pango_cairo_create_layout(cr));
   std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
   pango_layout_set_font_description(layout, desc.get());
+  pango_layout_set_height(layout, -1);
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
 
   if (IsMarkupAccelEnabled())
@@ -334,8 +341,8 @@
   int text_width  = log_rect.width / PANGO_SCALE;
   int text_height = log_rect.height / PANGO_SCALE;
 
-  _text_extents.width = text_width + ITEM_INDENT_ABS + 3 * ITEM_MARGIN;
-  _text_extents.height = text_height + 2 * ITEM_MARGIN;
+  _text_extents.width = std::ceil((text_width + ITEM_INDENT_ABS + 3 * ITEM_MARGIN) * _scale);
+  _text_extents.height = std::ceil((text_height + 2 * ITEM_MARGIN) * _scale);
 
   SetMinimumSize(_text_extents.width, _text_extents.height);
 
@@ -343,10 +350,9 @@
   pango_cairo_show_layout(cr, layout);
 }
 
-void QuicklistMenuItem::DrawPrelight(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color)
+void QuicklistMenuItem::DrawPrelight(nux::CairoGraphics& cairo, double width, double height, nux::Color const& color)
 {
-  std::shared_ptr<cairo_t> cairo_context(cairo.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairo.GetInternalContext();
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, color.red, color.blue, color.green, color.alpha);
@@ -414,7 +420,7 @@
   if (!_menu_item)
     return -1;
 
-  return dbusmenu_menuitem_property_get_int(_menu_item, MAXIMUM_LABEL_WIDTH_PROPERTY);
+  return std::ceil(dbusmenu_menuitem_property_get_int(_menu_item, MAXIMUM_LABEL_WIDTH_PROPERTY) * _scale);
 }
 
 bool QuicklistMenuItem::IsOverlayQuicklist() const
@@ -434,6 +440,22 @@
   return _normalTexture[0]->GetWidth();
 }
 
+double QuicklistMenuItem::GetScale() const
+{
+  return _scale;
+}
+
+void QuicklistMenuItem::SetScale(double scale)
+{
+  if (scale == _scale)
+    return;
+
+  _scale = scale;
+  InitializeText();
+  UpdateTexture();
+  QueueDraw();
+}
+
 // Introspection
 
 std::string QuicklistMenuItem::GetName() const

=== modified file 'launcher/QuicklistMenuItem.h'
--- launcher/QuicklistMenuItem.h	2014-02-13 10:14:20 +0000
+++ launcher/QuicklistMenuItem.h	2014-03-03 11:01:22 +0000
@@ -49,6 +49,8 @@
 {
   NUX_DECLARE_OBJECT_TYPE(QuicklistMenuItem, nux::View);
 public:
+  typedef nux::ObjectPtr<QuicklistMenuItem> Ptr;
+
   QuicklistMenuItem(QuicklistMenuItemType type, glib::Object<DbusmenuMenuitem> const& item, NUX_FILE_LINE_PROTO);
   virtual ~QuicklistMenuItem();
 
@@ -68,6 +70,9 @@
   void SetMaxLabelWidth(int max_width);
   int GetMaxLabelWidth() const;
 
+  virtual void SetScale(double);
+  double GetScale() const;
+
   bool IsOverlayQuicklist() const;
 
   void Activate() const;
@@ -76,7 +81,7 @@
   bool IsSelected() const;
 
   nux::Size const& GetTextExtents() const;
-  virtual void UpdateTexture() = 0;
+  void UpdateTexture();
   unsigned GetCairoSurfaceWidth() const;
 
   sigc::signal<void, QuicklistMenuItem*> sigTextChanged;
@@ -117,9 +122,11 @@
 
   void PreLayoutManagement();
   long PostLayoutManagement(long layoutResult);
+
+  virtual void UpdateTexture(nux::CairoGraphics&, double width, double height) = 0;
   void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
-  void DrawText(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color);
-  void DrawPrelight(nux::CairoGraphics& cairo, int width, int height, nux::Color const& color);
+  void DrawText(nux::CairoGraphics& cairo, double width, double height, nux::Color const& color);
+  void DrawPrelight(nux::CairoGraphics& cairo, double width, double height, nux::Color const& color);
 
   nux::ObjectPtr<nux::BaseTexture> _normalTexture[2];
   nux::ObjectPtr<nux::BaseTexture> _prelightTexture[2];
@@ -129,6 +136,7 @@
   bool _prelight;
   int _pre_layout_width;
   int _pre_layout_height;
+  double _scale;
   nux::Size _text_extents;
   std::string _text;
 };

=== modified file 'launcher/QuicklistMenuItemCheckmark.cpp'
--- launcher/QuicklistMenuItemCheckmark.cpp	2012-08-30 18:14:19 +0000
+++ launcher/QuicklistMenuItemCheckmark.cpp	2014-03-03 11:01:22 +0000
@@ -41,14 +41,9 @@
   return "QuicklistMenuItemCheckmark";
 }
 
-void QuicklistMenuItemCheckmark::UpdateTexture()
+void QuicklistMenuItemCheckmark::UpdateTexture(nux::CairoGraphics& cairoGraphics, double width, double height)
 {
-  int width = GetBaseWidth();
-  int height = GetBaseHeight();
-
-  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairoGraphics.GetInternalContext();
 
   // draw normal, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);

=== modified file 'launcher/QuicklistMenuItemCheckmark.h'
--- launcher/QuicklistMenuItemCheckmark.h	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistMenuItemCheckmark.h	2014-03-03 11:01:22 +0000
@@ -36,7 +36,7 @@
   std::string GetName() const;
 
   virtual std::string GetDefaultText() const;
-  virtual void UpdateTexture();
+  virtual void UpdateTexture(nux::CairoGraphics&, double width, double height);
 };
 
 } // NAMESPACE

=== modified file 'launcher/QuicklistMenuItemLabel.cpp'
--- launcher/QuicklistMenuItemLabel.cpp	2012-08-30 18:14:19 +0000
+++ launcher/QuicklistMenuItemLabel.cpp	2014-03-03 11:01:22 +0000
@@ -41,14 +41,9 @@
   return "QuicklistMenuItemLabel";
 }
 
-void QuicklistMenuItemLabel::UpdateTexture()
+void QuicklistMenuItemLabel::UpdateTexture(nux::CairoGraphics& cairoGraphics, double width, double height)
 {
-  int width = GetBaseWidth();
-  int height = GetBaseHeight();
-
-  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairoGraphics.GetInternalContext();
 
   // draw normal, unchecked version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);

=== modified file 'launcher/QuicklistMenuItemLabel.h'
--- launcher/QuicklistMenuItemLabel.h	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistMenuItemLabel.h	2014-03-03 11:01:22 +0000
@@ -36,7 +36,7 @@
   std::string GetName() const;
 
   virtual std::string GetDefaultText() const;
-  virtual void UpdateTexture();
+  virtual void UpdateTexture(nux::CairoGraphics&, double width, double height);
 };
 
 } // NAMESPACE

=== modified file 'launcher/QuicklistMenuItemRadio.cpp'
--- launcher/QuicklistMenuItemRadio.cpp	2012-08-30 18:14:19 +0000
+++ launcher/QuicklistMenuItemRadio.cpp	2014-03-03 11:01:22 +0000
@@ -40,14 +40,9 @@
   return "QuicklistMenuItemRadio";
 }
 
-void QuicklistMenuItemRadio::UpdateTexture()
+void QuicklistMenuItemRadio::UpdateTexture(nux::CairoGraphics& cairoGraphics, double width, double height)
 {
-  int width = GetBaseWidth();
-  int height = GetBaseHeight();
-
-  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairoGraphics.GetInternalContext();
 
   // draw normal, disabled version
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);

=== modified file 'launcher/QuicklistMenuItemRadio.h'
--- launcher/QuicklistMenuItemRadio.h	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistMenuItemRadio.h	2014-03-03 11:01:22 +0000
@@ -35,7 +35,7 @@
   std::string GetName() const;
 
   virtual std::string GetDefaultText() const;
-  virtual void UpdateTexture();
+  virtual void UpdateTexture(nux::CairoGraphics&, double width, double height);
 };
 
 } //NAMESPACE

=== modified file 'launcher/QuicklistMenuItemSeparator.cpp'
--- launcher/QuicklistMenuItemSeparator.cpp	2012-08-30 18:14:19 +0000
+++ launcher/QuicklistMenuItemSeparator.cpp	2014-03-03 11:01:22 +0000
@@ -19,18 +19,24 @@
  */
 
 #include "unity-shared/CairoTexture.h"
+#include "unity-shared/RawPixel.h"
 #include "QuicklistMenuItemSeparator.h"
 
 namespace unity
 {
+namespace
+{
+const RawPixel WIDTH = 64_em;
+const RawPixel HEIGHT = 7_em;
+}
 
 QuicklistMenuItemSeparator::QuicklistMenuItemSeparator(glib::Object<DbusmenuMenuitem> const& item, NUX_FILE_LINE_DECL)
   : QuicklistMenuItem(QuicklistMenuItemType::SEPARATOR, item, NUX_FILE_LINE_PARAM)
   , _color(1.0f, 1.0f, 1.0f, 0.5f)
   , _premultiplied_color(0.5f, 0.5f, 0.5f, 0.5f)
 {
-  SetMinimumHeight(7);
-  SetBaseSize(64, 7);
+  SetMinimumWidth(WIDTH.CP(_scale));
+  SetMinimumHeight(HEIGHT.CP(_scale));
 }
 
 std::string QuicklistMenuItemSeparator::GetName() const
@@ -43,6 +49,13 @@
   return false;
 }
 
+void QuicklistMenuItemSeparator::SetScale(double scale)
+{
+  QuicklistMenuItem::SetScale(scale);
+  SetMinimumWidth(WIDTH.CP(scale));
+  SetMinimumHeight(HEIGHT.CP(scale));
+}
+
 void QuicklistMenuItemSeparator::Draw(nux::GraphicsEngine& gfxContext, bool forceDraw)
 {
   // Check if the texture have been computed. If they haven't, exit the function.
@@ -67,22 +80,17 @@
   gfxContext.PopClippingRectangle();
 }
 
-void QuicklistMenuItemSeparator::UpdateTexture()
+void QuicklistMenuItemSeparator::UpdateTexture(nux::CairoGraphics& cairoGraphics, double width, double height)
 {
-  int width = GetBaseWidth();
-  int height = GetBaseHeight();
-
-  nux::CairoGraphics cairoGraphics(CAIRO_FORMAT_ARGB32, width, height);
-  std::shared_ptr<cairo_t> cairo_context(cairoGraphics.GetContext(), cairo_destroy);
-  cairo_t* cr = cairo_context.get();
+  cairo_t* cr = cairoGraphics.GetInternalContext();
 
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.0f);
   cairo_paint(cr);
   cairo_set_source_rgba(cr, _color.red, _color.green, _color.blue, _color.alpha);
   cairo_set_line_width(cr, 1.0f);
-  cairo_move_to(cr, 0.0f, 3.5f);
-  cairo_line_to(cr, width, 3.5f);
+  cairo_move_to(cr, 0.0f, height/2.0f);
+  cairo_line_to(cr, width, height/2.0f);
   cairo_stroke(cr);
 
   _normalTexture[0].Adopt(texture_from_cairo_graphics(cairoGraphics));

=== modified file 'launcher/QuicklistMenuItemSeparator.h'
--- launcher/QuicklistMenuItemSeparator.h	2012-08-15 02:51:33 +0000
+++ launcher/QuicklistMenuItemSeparator.h	2014-03-03 11:01:22 +0000
@@ -37,7 +37,8 @@
   void Draw(nux::GraphicsEngine& gfxContext, bool forceDraw);
   std::string GetName() const;
 
-  virtual void UpdateTexture();
+  virtual void SetScale(double);
+  virtual void UpdateTexture(nux::CairoGraphics&, double width, double height);
 
 private:
   nux::Color _color;

=== modified file 'launcher/QuicklistView.cpp'
--- launcher/QuicklistView.cpp	2014-02-19 14:01:02 +0000
+++ launcher/QuicklistView.cpp	2014-03-03 11:01:22 +0000
@@ -40,6 +40,7 @@
 
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/DecorationStyle.h"
 #include "unity-shared/UnitySettings.h"
 
 #include "unity-shared/UBusWrapper.h"
@@ -320,18 +321,6 @@
   }
 }
 
-QuicklistView::~QuicklistView()
-{
-  for (auto item : _item_list)
-  {
-    // Remove from introspection
-    RemoveChild(item);
-    item->UnReference();
-  }
-
-  _item_list.clear();
-}
-
 void
 QuicklistView::EnableQuicklistForTesting(bool enable_testing)
 {
@@ -423,7 +412,7 @@
 
   gfxContext.PushClippingRectangle(base);
 
-  for (auto item : _item_list)
+  for (auto const& item : _item_list)
   {
     if (item->GetVisible())
       item->ProcessDraw(gfxContext, forceDraw);
@@ -440,17 +429,17 @@
   int MaxItemWidth = 0;
   int TotalItemHeight = 0;
 
-  for (auto item : _item_list)
+  for (auto const& item : _item_list)
   {
     // Make sure item is in layout if it should be
     if (!item->GetVisible())
     {
-      _item_layout->RemoveChildObject(item);
+      _item_layout->RemoveChildObject(item.GetPointer());
       continue;
     }
     else if (!item->GetParentObject())
     {
-      _item_layout->AddView(item, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+      _item_layout->AddView(item.GetPointer(), 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
     }
 
     nux::Size const& text_extents = item->GetTextExtents();
@@ -495,7 +484,7 @@
   int x = RawPixel(_padding + _anchor_width + _corner_radius + _offset_correction).CP(cv_);
   int y = _top_space->GetMinimumHeight();
 
-  for (auto item : _item_list)
+  for (auto const& item : _item_list)
   {
     if (!item->GetVisible())
       continue;
@@ -513,7 +502,7 @@
   // has bee set correctly during the layout cycle, but the cairo rendering still need to be adjusted.
   unsigned separator_width = _item_layout->GetBaseWidth();
 
-  for (auto item : _item_list)
+  for (auto const& item : _item_list)
   {
     if (item->GetVisible() && item->GetCairoSurfaceWidth() != separator_width)
     {
@@ -550,7 +539,7 @@
 void QuicklistView::CheckAndEmitItemSignal(int x, int y)
 {
   nux::Geometry geo;
-  for (auto item : _item_list)
+  for (auto const& item : _item_list)
   {
     if (!item->GetVisible())
       continue;
@@ -561,7 +550,7 @@
     if (geo.IsPointInside(x, y))
     {
       // An action is performed: send the signal back to the application
-      ActivateItem(item);
+      ActivateItem(item.GetPointer());
     }
   }
 }
@@ -590,18 +579,16 @@
 
 void QuicklistView::CancelItemsPrelightStatus()
 {
-  for (auto item : _item_list)
-  {
+  for (auto const& item : _item_list)
     item->Select(false);
-  }
 }
 
 void QuicklistView::RecvItemMouseDrag(QuicklistMenuItem* item, int x, int y)
 {
   nux::Geometry geo;
-  for (auto it : _item_list)
+  for (auto const& it : _item_list)
   {
-    int item_index = GetItemIndex(it);
+    int item_index = GetItemIndex(it.GetPointer());
 
     if (!IsMenuItemSelectable(item_index))
       continue;
@@ -673,24 +660,15 @@
 
 void QuicklistView::RemoveAllMenuItem()
 {
-  for (auto item : _item_list)
-  {
-    // Remove from introspection
-    RemoveChild(item);
-    item->UnReference();
-  }
-
-
-  _item_list.clear();
-
   _item_layout->Clear();
+  _item_list.clear();
   _cairo_text_has_changed = true;
-  nux::GetWindowThread()->QueueObjectLayout(this);
+  QueueRelayout();
 }
 
 void QuicklistView::AddMenuItem(QuicklistMenuItem* item)
 {
-  if (item == 0)
+  if (!item)
     return;
 
   item->sigTextChanged.connect(sigc::mem_fun(this, &QuicklistView::RecvCairoTextChanged));
@@ -700,15 +678,12 @@
   item->sigMouseEnter.connect(sigc::mem_fun(this, &QuicklistView::RecvItemMouseEnter));
   item->sigMouseLeave.connect(sigc::mem_fun(this, &QuicklistView::RecvItemMouseLeave));
   item->sigMouseDrag.connect(sigc::mem_fun(this, &QuicklistView::RecvItemMouseDrag));
+  item->SetScale(cv_->DPIScale());
 
-  _item_list.push_back(item);
-  item->Reference();
-  // Add to introspection
-  AddChild(item);
+  _item_list.push_back(QuicklistMenuItem::Ptr(item));
 
   _cairo_text_has_changed = true;
-  nux::GetWindowThread()->QueueObjectLayout(this);
-  NeedRedraw();
+  QueueRelayout();
 }
 
 void QuicklistView::RenderQuicklistView()
@@ -726,10 +701,10 @@
   if (index < (int)_item_list.size())
   {
     int i = 0;
-    for (auto item : _item_list)
+    for (auto const& item : _item_list)
     {
       if (i++ == index)
-        return item;
+        return item.GetPointer();
     }
   }
 
@@ -740,7 +715,7 @@
 {
   int index = -1;
 
-  for (auto it : _item_list)
+  for (auto const& it : _item_list)
   {
     ++index;
 
@@ -760,7 +735,7 @@
   return QuicklistMenuItemType::UNKNOWN;
 }
 
-std::list<QuicklistMenuItem*> QuicklistView::GetChildren()
+std::list<QuicklistMenuItem::Ptr> QuicklistView::GetChildren()
 {
   return _item_list;
 }
@@ -771,23 +746,23 @@
 }
 
 void ql_tint_dot_hl(cairo_t* cr,
+                    gfloat  scale,
                     gint    width,
                     gint    height,
                     gfloat  hl_x,
                     gfloat  hl_y,
                     gfloat  hl_size,
-                    gfloat* rgba_tint,
-                    gfloat* rgba_hl,
-                    gfloat* rgba_dot)
+                    nux::Color const& tint_color,
+                    nux::Color const& hl_color,
+                    nux::Color const& dot_color)
 {
-  cairo_surface_t* dots_surf    = NULL;
-  cairo_t*         dots_cr      = NULL;
   cairo_pattern_t* dots_pattern = NULL;
   cairo_pattern_t* hl_pattern   = NULL;
 
   // create context for dot-pattern
-  dots_surf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 4, 4);
-  dots_cr = cairo_create(dots_surf);
+  nux::CairoGraphics dots_surf(CAIRO_FORMAT_ARGB32, 4 * scale, 4 * scale);
+  cairo_surface_set_device_scale(dots_surf.GetSurface(), scale, scale);
+  cairo_t* dots_cr = dots_surf.GetInternalContext();
 
   // clear normal context
   cairo_scale(cr, 1.0f, 1.0f);
@@ -803,10 +778,10 @@
 
   // fill path of normal context with tint
   cairo_set_source_rgba(cr,
-                        rgba_tint[0],
-                        rgba_tint[1],
-                        rgba_tint[2],
-                        rgba_tint[3]);
+                        tint_color.red,
+                        tint_color.green,
+                        tint_color.blue,
+                        tint_color.alpha);
   cairo_fill_preserve(cr);
 
   // create pattern in dot-context
@@ -815,15 +790,15 @@
   cairo_scale(dots_cr, 1.0f, 1.0f);
   cairo_set_operator(dots_cr, CAIRO_OPERATOR_OVER);
   cairo_set_source_rgba(dots_cr,
-                        rgba_dot[0],
-                        rgba_dot[1],
-                        rgba_dot[2],
-                        rgba_dot[3]);
+                        dot_color.red,
+                        dot_color.green,
+                        dot_color.blue,
+                        dot_color.alpha);
   cairo_rectangle(dots_cr, 0.0f, 0.0f, 1.0f, 1.0f);
   cairo_fill(dots_cr);
   cairo_rectangle(dots_cr, 2.0f, 2.0f, 1.0f, 1.0f);
   cairo_fill(dots_cr);
-  dots_pattern = cairo_pattern_create_for_surface(dots_surf);
+  dots_pattern = cairo_pattern_create_for_surface(dots_surf.GetSurface());
 
   // fill path of normal context with dot-pattern
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
@@ -831,8 +806,6 @@
   cairo_pattern_set_extend(dots_pattern, CAIRO_EXTEND_REPEAT);
   cairo_fill_preserve(cr);
   cairo_pattern_destroy(dots_pattern);
-  cairo_surface_destroy(dots_surf);
-  cairo_destroy(dots_cr);
 
   // draw highlight
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
@@ -844,10 +817,10 @@
                                            hl_size);
   cairo_pattern_add_color_stop_rgba(hl_pattern,
                                     0.0f,
-                                    rgba_hl[0],
-                                    rgba_hl[1],
-                                    rgba_hl[2],
-                                    rgba_hl[3]);
+                                    hl_color.red,
+                                    hl_color.green,
+                                    hl_color.blue,
+                                    hl_color.alpha);
   cairo_pattern_add_color_stop_rgba(hl_pattern, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f);
   cairo_set_source(cr, hl_pattern);
   cairo_fill(cr);
@@ -857,17 +830,8 @@
 void ql_setup(cairo_surface_t** surf,
               cairo_t**         cr,
               gboolean          outline,
-              gint              width,
-              gint              height,
               gboolean          negative)
 {
-//     // create context
-//     if (outline)
-//       *surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
-//     else
-//       *surf = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
-//     *cr = cairo_create (*surf);
-
   // clear context
   cairo_scale(*cr, 1.0f, 1.0f);
   if (outline)
@@ -889,8 +853,8 @@
 void ql_compute_full_mask_path(cairo_t* cr,
                                gfloat   anchor_width,
                                gfloat   anchor_height,
-                               gint     width,
-                               gint     height,
+                               gfloat   width,
+                               gfloat   height,
                                gint     upper_size,
                                gfloat   radius,
                                guint    pad)
@@ -1009,7 +973,7 @@
 
 void ql_compute_outline(cairo_t* cr,
                         gfloat   line_width,
-                        gfloat*  rgba_line,
+                        nux::Color const& line_color,
                         gfloat   size)
 {
   cairo_pattern_t* pattern = NULL;
@@ -1021,25 +985,25 @@
 
   pattern = cairo_pattern_create_linear(x, y, size, y);
   cairo_pattern_add_color_stop_rgba(pattern, 0.0f,
-                                    rgba_line[0],
-                                    rgba_line[1],
-                                    rgba_line[2],
-                                    rgba_line[3]);
+                                    line_color.red,
+                                    line_color.green,
+                                    line_color.blue,
+                                    line_color.alpha);
   cairo_pattern_add_color_stop_rgba(pattern, offset,
-                                    rgba_line[0],
-                                    rgba_line[1],
-                                    rgba_line[2],
-                                    rgba_line[3]);
+                                    line_color.red,
+                                    line_color.green,
+                                    line_color.blue,
+                                    line_color.alpha);
   cairo_pattern_add_color_stop_rgba(pattern, 1.1f * offset,
-                                    rgba_line[0] * 0.65f,
-                                    rgba_line[1] * 0.65f,
-                                    rgba_line[2] * 0.65f,
-                                    rgba_line[3]);
+                                    line_color.red * 0.65f,
+                                    line_color.green * 0.65f,
+                                    line_color.blue * 0.65f,
+                                    line_color.alpha);
   cairo_pattern_add_color_stop_rgba(pattern, 1.0f,
-                                    rgba_line[0] * 0.65f,
-                                    rgba_line[1] * 0.65f,
-                                    rgba_line[2] * 0.65f,
-                                    rgba_line[3]);
+                                    line_color.red * 0.65f,
+                                    line_color.green * 0.65f,
+                                    line_color.blue * 0.65f,
+                                    line_color.alpha);
   cairo_set_source(cr, pattern);
   cairo_set_line_width(cr, line_width);
   cairo_stroke(cr);
@@ -1049,7 +1013,7 @@
 void ql_draw(cairo_t* cr,
              gboolean outline,
              gfloat   line_width,
-             gfloat*  rgba,
+             nux::Color const& color,
              gboolean negative,
              gboolean stroke)
 {
@@ -1060,7 +1024,7 @@
   if (outline)
   {
     cairo_set_line_width(cr, line_width);
-    cairo_set_source_rgba(cr, rgba[0], rgba[1], rgba[2], rgba[3]);
+    cairo_set_source_rgba(cr, color.red, color.green, color.blue, color.alpha);
   }
   else
   {
@@ -1080,7 +1044,7 @@
 void ql_finalize(cairo_t** cr,
                  gboolean  outline,
                  gfloat    line_width,
-                 gfloat*   rgba,
+                 nux::Color const& color,
                  gboolean  negative,
                  gboolean  stroke)
 {
@@ -1091,7 +1055,7 @@
   if (outline)
   {
     cairo_set_line_width(*cr, line_width);
-    cairo_set_source_rgba(*cr, rgba[0], rgba[1], rgba[2], rgba[3]);
+    cairo_set_source_rgba(*cr, color.red, color.green, color.blue, color.alpha);
   }
   else
   {
@@ -1112,19 +1076,19 @@
 ql_compute_full_outline_shadow(
   cairo_t* cr,
   cairo_surface_t* surf,
-  gint    width,
-  gint    height,
+  gfloat  width,
+  gfloat  height,
   gfloat  anchor_width,
   gfloat  anchor_height,
   gint    upper_size,
   gfloat  corner_radius,
   guint   blur_coeff,
-  gfloat* rgba_shadow,
+  nux::Color const& rgba_shadow,
   gfloat  line_width,
   gint    padding_size,
-  gfloat* rgba_line)
+  nux::Color const& rgba_line)
 {
-  ql_setup(&surf, &cr, TRUE, width, height, FALSE);
+  ql_setup(&surf, &cr, TRUE, FALSE);
   ql_compute_full_mask_path(cr,
                             anchor_width,
                             anchor_height,
@@ -1144,10 +1108,9 @@
 void ql_compute_full_mask(
   cairo_t* cr,
   cairo_surface_t* surf,
-  gint     width,
-  gint     height,
+  gfloat   width,
+  gfloat   height,
   gfloat   radius,
-  guint    shadow_radius,
   gfloat   anchor_width,
   gfloat   anchor_height,
   gint     upper_size,
@@ -1155,9 +1118,9 @@
   gboolean outline,
   gfloat   line_width,
   gint     padding_size,
-  gfloat*  rgba)
+  nux::Color const&  rgba)
 {
-  ql_setup(&surf, &cr, outline, width, height, negative);
+  ql_setup(&surf, &cr, outline, negative);
   ql_compute_full_mask_path(cr,
                             anchor_width,
                             anchor_height,
@@ -1210,26 +1173,33 @@
     }
   }
 
-  float blur_coef         = 6.0f;
+  auto const& deco_style = decoration::Style::Get();
+  float dpi_scale = cv_->DPIScale();
+  float blur_coef = std::round(deco_style->ActiveShadowRadius() * dpi_scale / 2.0f);
 
   nux::CairoGraphics cairo_bg(CAIRO_FORMAT_ARGB32, width, height);
   nux::CairoGraphics cairo_mask(CAIRO_FORMAT_ARGB32, width, height);
   nux::CairoGraphics cairo_outline(CAIRO_FORMAT_ARGB32, width, height);
 
-  cairo_t* cr_bg      = cairo_bg.GetContext();
-  cairo_t* cr_mask    = cairo_mask.GetContext();
-  cairo_t* cr_outline = cairo_outline.GetContext();
-
-  float   tint_color[4]    = {0.0f, 0.0f, 0.0f, HasBlurredBackground() ? 0.60f : 1.0f};
-  float   hl_color[4]      = {1.0f, 1.0f, 1.0f, 0.35f};
-  float   dot_color[4]     = {1.0f, 1.0f, 1.0f, 0.03f};
-  float   shadow_color[4]  = {0.0f, 0.0f, 0.0f, 1.00f};
-  float   outline_color[4] = {1.0f, 1.0f, 1.0f, 0.40f};
-  float   mask_color[4]    = {1.0f, 1.0f, 1.0f, 1.00f};
+  cairo_surface_set_device_scale(cairo_bg.GetSurface(), dpi_scale, dpi_scale);
+  cairo_surface_set_device_scale(cairo_mask.GetSurface(), dpi_scale, dpi_scale);
+  cairo_surface_set_device_scale(cairo_outline.GetSurface(), dpi_scale, dpi_scale);
+
+  cairo_t* cr_bg      = cairo_bg.GetInternalContext();
+  cairo_t* cr_mask    = cairo_mask.GetInternalContext();
+  cairo_t* cr_outline = cairo_outline.GetInternalContext();
+
+  nux::Color tint_color(0.0f, 0.0f, 0.0f, HasBlurredBackground() ? 0.60f : 1.0f);
+  nux::Color hl_color(1.0f, 1.0f, 1.0f, 0.35f);
+  nux::Color dot_color(1.0f, 1.0f, 1.0f, 0.03f);
+  nux::Color shadow_color(deco_style->ActiveShadowColor());
+  nux::Color outline_color(1.0f, 1.0f, 1.0f, 0.40f);
+  nux::Color mask_color(1.0f, 1.0f, 1.0f, 1.00f);
 
   ql_tint_dot_hl(cr_bg,
-                 width,
-                 height,
+                 dpi_scale,
+                 width / dpi_scale,
+                 height / dpi_scale,
                  width / 2.0f,
                  0,
                  nux::Max<float>(width / 1.6f, height / 1.6f),
@@ -1241,38 +1211,33 @@
   (
     cr_outline,
     cairo_outline.GetSurface(),
-    width,
-    height,
-    _anchor_width.CP(cv_),
-    _anchor_height.CP(cv_),
-    size_above_anchor.CP(cv_),
-    _corner_radius.CP(cv_),
+    width / dpi_scale,
+    height / dpi_scale,
+    _anchor_width,
+    _anchor_height,
+    size_above_anchor,
+    _corner_radius,
     blur_coef,
     shadow_color,
-    1.0f,
-    _padding.CP(cv_),
+    1.0f * dpi_scale,
+    _padding,
     outline_color);
 
   ql_compute_full_mask(
     cr_mask,
     cairo_mask.GetSurface(),
-    width,
-    height,
-    _corner_radius.CP(cv_),    // radius,
-    RawPixel(16).CP(cv_),      // shadow_radius,
-    _anchor_width.CP(cv_),     // anchor_width,
-    _anchor_height.CP(cv_),    // anchor_height,
-    size_above_anchor.CP(cv_), // upper_size,
+    width / dpi_scale,
+    height / dpi_scale,
+    _corner_radius,            // radius,
+    _anchor_width,             // anchor_width,
+    _anchor_height,            // anchor_height,
+    size_above_anchor,         // upper_size,
     true,                      // negative,
     false,                     // outline,
     1.0,                       // line_width,
-    _padding.CP(cv_),          // padding_size,
+    _padding,                  // padding_size,
     mask_color);
 
-  cairo_destroy(cr_bg);
-  cairo_destroy(cr_outline);
-  cairo_destroy(cr_mask);
-
   texture_bg_ = texture_ptr_from_cairo_graphics(cairo_bg);
   texture_mask_ = texture_ptr_from_cairo_graphics(cairo_mask);
   texture_outline_ = texture_ptr_from_cairo_graphics(cairo_outline);
@@ -1341,12 +1306,12 @@
 
 debug::Introspectable::IntrospectableList QuicklistView::GetIntrospectableChildren()
 {
-  _introspectable_children.clear();
-  for (auto item: _item_list)
-  {
-    _introspectable_children.push_back(item);
-  }
-  return _introspectable_children;
+  debug::Introspectable::IntrospectableList list(_item_list.size());
+
+  for (auto const& item: _item_list)
+    list.push_back(item.GetPointer());
+
+  return list;
 }
 
 } // NAMESPACE

=== modified file 'launcher/QuicklistView.h'
--- launcher/QuicklistView.h	2014-02-19 14:01:02 +0000
+++ launcher/QuicklistView.h	2014-03-03 11:01:22 +0000
@@ -46,7 +46,6 @@
   NUX_DECLARE_OBJECT_TYPE(QuicklistView, unity::CairoBaseWindow);
 public:
   QuicklistView(int monitor = 0);
-  ~QuicklistView();
 
   void SetText(std::string const& text);
 
@@ -67,7 +66,7 @@
   QuicklistMenuItem* GetNthItems(int index);
   QuicklistMenuItemType GetNthType(int index);
   int GetItemIndex(QuicklistMenuItem* item);
-  std::list<QuicklistMenuItem*> GetChildren();
+  std::list<QuicklistMenuItem::Ptr> GetChildren();
   void SelectFirstItem();
 
   void TestMenuItems(DbusmenuMenuitem* root);
@@ -171,13 +170,10 @@
 
   bool _cairo_text_has_changed;
   void UpdateTexture();
-  std::list<QuicklistMenuItem*> _item_list;
+  std::list<QuicklistMenuItem::Ptr> _item_list;
 
   // used by keyboard/a11y-navigation
   int _current_item_index;
-
-  // list of introspectable children, used to return children in the correct order:
-  IntrospectableList _introspectable_children;
 };
 
 } // NAMESPACE

=== modified file 'launcher/Tooltip.cpp'
--- launcher/Tooltip.cpp	2014-02-19 14:01:02 +0000
+++ launcher/Tooltip.cpp	2014-03-03 11:01:22 +0000
@@ -25,6 +25,7 @@
 #include <unity-shared/CairoTexture.h>
 #include <unity-shared/RawPixel.h>
 #include <unity-shared/UnitySettings.h>
+#include "unity-shared/DecorationStyle.h"
 
 #include "Tooltip.h"
 
@@ -59,6 +60,7 @@
   _vlayout->AddLayout(_top_space, 0);
 
   _tooltip_text = new StaticCairoText(TEXT(""), NUX_TRACKER_LOCATION);
+  _tooltip_text->SetScale(cv_->DPIScale());
   _tooltip_text->SetTextAlignment(StaticCairoText::AlignState::NUX_ALIGN_CENTRE);
   _tooltip_text->SetTextVerticalAlignment(StaticCairoText::AlignState::NUX_ALIGN_CENTRE);
   _tooltip_text->SetMinimumWidth(MINIMUM_TEXT_WIDTH.CP(cv_));
@@ -169,14 +171,14 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
 void tint_dot_hl(cairo_t* cr,
-                 gint    width,
-                 gint    height,
+                 gfloat  width,
+                 gfloat  height,
                  gfloat  hl_x,
                  gfloat  hl_y,
                  gfloat  hl_size,
-                 gfloat* rgba_tint,
-                 gfloat* rgba_hl,
-                 gfloat* rgba_dot)
+                 nux::Color const& tint_color,
+                 nux::Color const& hl_color,
+                 nux::Color const& dot_color)
 {
   cairo_pattern_t* hl_pattern = NULL;
 
@@ -190,14 +192,14 @@
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
 
   // create path in normal context
-  cairo_rectangle(cr, 0.0f, 0.0f, (gdouble) width, (gdouble) height);
+  cairo_rectangle(cr, 0.0f, 0.0f, width, height);
 
   // fill path of normal context with tint
   cairo_set_source_rgba(cr,
-                        rgba_tint[0],
-                        rgba_tint[1],
-                        rgba_tint[2],
-                        rgba_tint[3]);
+                        tint_color.red,
+                        tint_color.green,
+                        tint_color.blue,
+                        tint_color.alpha);
   cairo_fill_preserve(cr);
 
   // draw glow
@@ -209,10 +211,10 @@
                                            hl_size);
   cairo_pattern_add_color_stop_rgba(hl_pattern,
                                     0.0f,
-                                    rgba_hl[0],
-                                    rgba_hl[1],
-                                    rgba_hl[2],
-                                    rgba_hl[3]);
+                                    hl_color.red,
+                                    hl_color.green,
+                                    hl_color.blue,
+                                    hl_color.alpha);
   cairo_pattern_add_color_stop_rgba(hl_pattern, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f);
   cairo_set_source(cr, hl_pattern);
   cairo_fill(cr);
@@ -222,8 +224,6 @@
 void _setup(cairo_surface_t** surf,
             cairo_t**         cr,
             gboolean          outline,
-            gint              width,
-            gint              height,
             gboolean          negative)
 {
   // clear context
@@ -247,8 +247,8 @@
 void _compute_full_mask_path(cairo_t* cr,
                              gfloat   anchor_width,
                              gfloat   anchor_height,
-                             gint     width,
-                             gint     height,
+                             gfloat   width,
+                             gfloat   height,
                              gint     upper_size,
                              gfloat   radius,
                              guint    pad)
@@ -305,14 +305,14 @@
 
 void compute_outline(cairo_t* cr,
                      gfloat   line_width,
-                     gfloat*  rgba_line)
+                     nux::Color const& line_color)
 {
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba(cr,
-                        rgba_line[0],
-                        rgba_line[1],
-                        rgba_line[2],
-                        rgba_line[3]);
+                        line_color.red,
+                        line_color.green,
+                        line_color.blue,
+                        line_color.alpha);
   cairo_set_line_width(cr, line_width);
   cairo_stroke(cr);
 }
@@ -320,7 +320,7 @@
 void _draw(cairo_t* cr,
            gboolean outline,
            gfloat   line_width,
-           gfloat*  rgba,
+           nux::Color const& color,
            gboolean negative,
            gboolean stroke)
 {
@@ -331,7 +331,7 @@
   if (outline)
   {
     cairo_set_line_width(cr, line_width);
-    cairo_set_source_rgba(cr, rgba[0], rgba[1], rgba[2], rgba[3]);
+    cairo_set_source_rgba(cr, color.red, color.green, color.blue, color.alpha);
   }
   else
   {
@@ -351,7 +351,7 @@
 void _finalize(cairo_t** cr,
                gboolean  outline,
                gfloat    line_width,
-               gfloat*   rgba,
+               nux::Color const& color,
                gboolean  negative,
                gboolean  stroke)
 {
@@ -362,7 +362,7 @@
   if (outline)
   {
     cairo_set_line_width(*cr, line_width);
-    cairo_set_source_rgba(*cr, rgba[0], rgba[1], rgba[2], rgba[3]);
+    cairo_set_source_rgba(*cr, color.red, color.green, color.blue, color.alpha);
   }
   else
   {
@@ -383,19 +383,19 @@
 compute_full_outline_shadow(
   cairo_t* cr,
   cairo_surface_t* surf,
-  gint    width,
-  gint    height,
+  gfloat  width,
+  gfloat  height,
   gfloat  anchor_width,
   gfloat  anchor_height,
   gint    upper_size,
   gfloat  corner_radius,
   guint   blur_coeff,
-  gfloat* rgba_shadow,
+  nux::Color const& shadow_color,
   gfloat  line_width,
   gint    padding_size,
-  gfloat* rgba_line)
+  nux::Color const& line_color)
 {
-  _setup(&surf, &cr, TRUE, width, height, FALSE);
+  _setup(&surf, &cr, TRUE, FALSE);
   _compute_full_mask_path(cr,
                           anchor_width,
                           anchor_height,
@@ -405,20 +405,19 @@
                           corner_radius,
                           padding_size);
 
-  _draw(cr, TRUE, line_width, rgba_shadow, FALSE, FALSE);
+  _draw(cr, TRUE, line_width, shadow_color, FALSE, FALSE);
   nux::CairoGraphics dummy(CAIRO_FORMAT_A1, 1, 1);
   dummy.BlurSurface(blur_coeff, surf);
   compute_mask(cr);
-  compute_outline(cr, line_width, rgba_line);
+  compute_outline(cr, line_width, line_color);
 }
 
 void compute_full_mask(
   cairo_t* cr,
   cairo_surface_t* surf,
-  gint     width,
-  gint     height,
+  gfloat   width,
+  gfloat   height,
   gfloat   radius,
-  guint    shadow_radius,
   gfloat   anchor_width,
   gfloat   anchor_height,
   gint     upper_size,
@@ -426,9 +425,9 @@
   gboolean outline,
   gfloat   line_width,
   gint     padding_size,
-  gfloat*  rgba)
+  nux::Color const& color)
 {
-  _setup(&surf, &cr, outline, width, height, negative);
+  _setup(&surf, &cr, outline, negative);
   _compute_full_mask_path(cr,
                           anchor_width,
                           anchor_height,
@@ -437,7 +436,7 @@
                           upper_size,
                           radius,
                           padding_size);
-  _finalize(&cr, outline, line_width, rgba, negative, outline);
+  _finalize(&cr, outline, line_width, color, negative, outline);
 }
 
 void Tooltip::UpdateTexture()
@@ -451,7 +450,9 @@
   int x = _anchorX - PADDING.CP(cv_);
   int y = _anchorY - height / 2;
 
-  float blur_coef = 6.0f;
+  auto const& deco_style = decoration::Style::Get();
+  float dpi_scale = cv_->DPIScale();
+  float blur_coef = std::round(deco_style->ActiveShadowRadius() * dpi_scale / 2.0f);
 
   SetBaseX(x);
   SetBaseY(y);
@@ -460,30 +461,32 @@
   nux::CairoGraphics cairo_mask(CAIRO_FORMAT_ARGB32, width, height);
   nux::CairoGraphics cairo_outline(CAIRO_FORMAT_ARGB32, width, height);
 
-  cairo_t* cr_bg      = cairo_bg.GetContext();
-  cairo_t* cr_mask    = cairo_mask.GetContext();
-  cairo_t* cr_outline = cairo_outline.GetContext();
-
-  float   tint_color[4]    = {0.074f, 0.074f, 0.074f, 0.80f};
-  float   hl_color[4]      = {1.0f, 1.0f, 1.0f, 0.8f};
-  float   dot_color[4]     = {1.0f, 1.0f, 1.0f, 0.20f};
-  float   shadow_color[4]  = {0.0f, 0.0f, 0.0f, 1.00f};
-  float   outline_color[4] = {1.0f, 1.0f, 1.0f, 0.15f};
-  float   mask_color[4]    = {1.0f, 1.0f, 1.0f, 1.00f};
+  cairo_surface_set_device_scale(cairo_bg.GetSurface(), dpi_scale, dpi_scale);
+  cairo_surface_set_device_scale(cairo_mask.GetSurface(), dpi_scale, dpi_scale);
+  cairo_surface_set_device_scale(cairo_outline.GetSurface(), dpi_scale, dpi_scale);
+
+  cairo_t* cr_bg      = cairo_bg.GetInternalContext();
+  cairo_t* cr_mask    = cairo_mask.GetInternalContext();
+  cairo_t* cr_outline = cairo_outline.GetInternalContext();
+
+  nux::Color tint_color(0.074f, 0.074f, 0.074f, 0.80f);
+  nux::Color hl_color(1.0f, 1.0f, 1.0f, 0.8f);
+  nux::Color dot_color(1.0f, 1.0f, 1.0f, 0.20f);
+  nux::Color shadow_color(deco_style->ActiveShadowColor());
+  nux::Color outline_color(1.0f, 1.0f, 1.0f, 0.15f);
+  nux::Color mask_color(1.0f, 1.0f, 1.0f, 1.00f);
 
   if (!HasBlurredBackground())
   {
     //If low gfx is detected then disable transparency because we're not bluring using our blur anymore.
-    const float alpha_value = 1.0f;
-
-    tint_color[3] = alpha_value;
-    hl_color[3] = alpha_value;
-    dot_color[3] = alpha_value;
+    tint_color.alpha = 1.0f;
+    hl_color.alpha = 1.0f;
+    dot_color.alpha = 1.0f;
   }
 
   tint_dot_hl(cr_bg,
-              width,
-              height,
+              width / dpi_scale,
+              height / dpi_scale,
               width / 2.0f,
               0,
               nux::Max<float>(width / 1.3f, height / 1.3f),
@@ -495,38 +498,33 @@
   (
     cr_outline,
     cairo_outline.GetSurface(),
-    width,
-    height,
-    ANCHOR_WIDTH.CP(cv_),
-    ANCHOR_HEIGHT.CP(cv_),
+    width / dpi_scale,
+    height / dpi_scale,
+    ANCHOR_WIDTH,
+    ANCHOR_HEIGHT,
     -1,
-    CORNER_RADIUS.CP(cv_),
+    CORNER_RADIUS,
     blur_coef,
     shadow_color,
     1.0f,
-    PADDING.CP(cv_),
+    PADDING,
     outline_color);
 
   compute_full_mask(
     cr_mask,
     cairo_mask.GetSurface(),
-    width,
-    height,
-    CORNER_RADIUS.CP(cv_), // radius,
-    RawPixel(16).CP(cv_),  // shadow_radius,
-    ANCHOR_WIDTH.CP(cv_),  // anchor_width,
-    ANCHOR_HEIGHT.CP(cv_), // anchor_height,
+    width / dpi_scale,
+    height / dpi_scale,
+    CORNER_RADIUS,         // radius,
+    ANCHOR_WIDTH,          // anchor_width,
+    ANCHOR_HEIGHT,         // anchor_height,
     -1,                    // upper_size,
     true,                  // negative,
     false,                 // outline,
     1.0,                   // line_width,
-    PADDING.CP(cv_),       // padding_size,
+    PADDING,               // padding_size,
     mask_color);
 
-  cairo_destroy(cr_bg);
-  cairo_destroy(cr_outline);
-  cairo_destroy(cr_mask);
-
   texture_bg_ = texture_ptr_from_cairo_graphics(cairo_bg);
   texture_mask_ = texture_ptr_from_cairo_graphics(cairo_mask);
   texture_outline_ = texture_ptr_from_cairo_graphics(cairo_outline);

=== modified file 'launcher/XdndCollectionWindowImp.cpp'
--- launcher/XdndCollectionWindowImp.cpp	2013-10-29 22:33:02 +0000
+++ launcher/XdndCollectionWindowImp.cpp	2014-03-03 11:01:22 +0000
@@ -55,7 +55,7 @@
     WindowManager::Default().window_moved.connect(sigc::mem_fun(this, &PrivateWindow::OnWindowMoved));
   }
 
-  void OnScreenChanged(int /*primary*/, std::vector<nux::Geometry>& /*monitors*/)
+  void OnScreenChanged(int /*primary*/, std::vector<nux::Geometry> const& /*monitors*/)
   {
     auto uscreen = UScreen::GetDefault();
     SetGeometry(uscreen->GetScreenGeometry());

=== modified file 'launcher/XdndManagerImp.cpp'
--- launcher/XdndManagerImp.cpp	2013-10-14 15:59:22 +0000
+++ launcher/XdndManagerImp.cpp	2014-03-03 11:01:22 +0000
@@ -19,6 +19,7 @@
 
 #include "XdndManagerImp.h"
 
+#include <algorithm>
 #include "unity-shared/UScreen.h"
 
 namespace unity {

=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2014-02-18 20:11:54 +0000
+++ panel/PanelController.cpp	2014-03-03 11:01:22 +0000
@@ -38,7 +38,7 @@
 class Controller::Impl
 {
 public:
-  Impl(menu::Manager::Ptr const&, ui::EdgeBarrierController::Ptr const&);
+  Impl(Controller*, menu::Manager::Ptr const&, ui::EdgeBarrierController::Ptr const&);
   ~Impl();
 
   // NOTE: nux::Property maybe?
@@ -48,14 +48,15 @@
 
   float opacity() const;
 
-  nux::ObjectPtr<PanelView> CreatePanel(Introspectable *iobj);
-  void OnScreenChanged(unsigned int primary_monitor, std::vector<nux::Geometry>& monitors, Introspectable *iobj);
+  nux::ObjectPtr<PanelView> CreatePanel();
+  void OnScreenChanged(unsigned int primary_monitor, std::vector<nux::Geometry> const& monitors);
   void UpdatePanelGeometries();
 
   typedef nux::ObjectPtr<nux::BaseWindow> BaseWindowPtr;
 
   PanelView* ViewForWindow(BaseWindowPtr const& window) const;
 
+  Controller* parent_;
   menu::Manager::Ptr indicators_;
   ui::EdgeBarrierController::Ptr edge_barriers_;
   PanelVector panels_;
@@ -66,12 +67,17 @@
 };
 
 
-Controller::Impl::Impl(menu::Manager::Ptr const& indicators, ui::EdgeBarrierController::Ptr const& edge_barriers)
-  : indicators_(indicators)
+Controller::Impl::Impl(Controller* parent, menu::Manager::Ptr const& indicators, ui::EdgeBarrierController::Ptr const& edge_barriers)
+  : parent_(parent)
+  , indicators_(indicators)
   , edge_barriers_(edge_barriers)
   , opacity_(1.0f)
   , opacity_maximized_toggle_(false)
-{}
+{
+  UScreen* screen = UScreen::GetDefault();
+  screen->changed.connect(sigc::mem_fun(this, &Impl::OnScreenChanged));
+  OnScreenChanged(screen->GetPrimaryMonitor(), screen->GetMonitors());
+}
 
 Controller::Impl::~Impl()
 {
@@ -132,9 +138,7 @@
 }
 
 // We need to put a panel on every monitor, and try and re-use the panels we already have
-void Controller::Impl::OnScreenChanged(unsigned int primary_monitor,
-                                       std::vector<nux::Geometry>& monitors,
-                                       Introspectable *iobj)
+void Controller::Impl::OnScreenChanged(unsigned int primary_monitor, std::vector<nux::Geometry> const& monitors)
 {
   unsigned int num_monitors = monitors.size();
   unsigned int num_panels = num_monitors;
@@ -147,11 +151,11 @@
   {
     if (i >= panels_size)
     {
-      panels_.push_back(CreatePanel(iobj));
+      panels_.push_back(CreatePanel());
     }
     else if (!panels_[i])
     {
-      panels_[i] = CreatePanel(iobj);
+      panels_[i] = CreatePanel();
     }
 
     if (panels_[i]->GetMonitor() != static_cast<int>(i))
@@ -171,7 +175,7 @@
     auto const& panel = panels_[i];
     if (panel)
     {
-      iobj->RemoveChild(panel.GetPointer());
+      parent_->RemoveChild(panel.GetPointer());
       panel->GetParent()->UnReference();
       edge_barriers_->RemoveHorizontalSubscriber(panel.GetPointer(), panel->GetMonitor());
     }
@@ -182,7 +186,7 @@
 }
 
 
-nux::ObjectPtr<PanelView> Controller::Impl::CreatePanel(Introspectable *iobj)
+nux::ObjectPtr<PanelView> Controller::Impl::CreatePanel()
 {
   auto* panel_window = new MockableBaseWindow(TEXT("PanelWindow"));
 
@@ -205,7 +209,7 @@
     panel_window->EnableInputWindow(true, panel::window_title, false, false);
 
   panel_window->InputWindowEnableStruts(true);
-  iobj->AddChild(view);
+  parent_->AddChild(view);
 
   return nux::ObjectPtr<PanelView>(view);
 }
@@ -228,14 +232,8 @@
 
 Controller::Controller(menu::Manager::Ptr const& menus, ui::EdgeBarrierController::Ptr const& edge_barriers)
   : launcher_width(64)
-  , pimpl(new Impl(menus, edge_barriers))
+  , pimpl(new Impl(this, menus, edge_barriers))
 {
-  UScreen* screen = UScreen::GetDefault();
-  screen->changed.connect(sigc::mem_fun(this, &Controller::OnScreenChanged));
-  OnScreenChanged(screen->GetPrimaryMonitor(), screen->GetMonitors());
-
-  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &Controller::OnDPIChanged));
-
   launcher_width.changed.connect([this] (int width)
   {
     pimpl->SetLauncherWidth(width);
@@ -245,19 +243,6 @@
 Controller::~Controller()
 {}
 
-void Controller::OnDPIChanged()
-{
-  for (auto& panel_ptr : pimpl->panels_)
-  {
-    if (panel_ptr)
-    {
-      int monitor = panel_ptr->GetMonitor();
-
-      panel_ptr->SetMonitor(monitor);
-    }
-  }
-}
-
 void Controller::SetOpacity(float opacity)
 {
   pimpl->SetOpacity(opacity);
@@ -299,10 +284,5 @@
     .add("opacity", pimpl->opacity());
 }
 
-void Controller::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)
-{
-  pimpl->OnScreenChanged(primary_monitor, monitors, this);
-}
-
 } // namespace panel
 } // namespace unity

=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2014-02-18 18:27:30 +0000
+++ panel/PanelController.h	2014-03-03 11:01:22 +0000
@@ -61,9 +61,6 @@
   void AddProperties(debug::IntrospectionData&);
 
 private:
-  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
-  void OnDPIChanged();
-
   class Impl;
   std::unique_ptr<Impl> pimpl;
 };

=== modified file 'panel/PanelIndicatorEntryDropdownView.cpp'
--- panel/PanelIndicatorEntryDropdownView.cpp	2014-02-18 21:20:28 +0000
+++ panel/PanelIndicatorEntryDropdownView.cpp	2014-03-03 11:01:22 +0000
@@ -144,7 +144,7 @@
     entries.push_back(entry->GetEntry());
 
   auto const& geo = GetAbsoluteGeometry();
-  indicators_->ShowEntriesDropdown(entries, active_entry_, 0, geo.x, geo.y + Style::Instance().PanelHeight(monitor_));
+  indicators_->ShowEntriesDropdown(entries, active_entry_, 0, geo.x, geo.y + geo.height);
 }
 
 bool PanelIndicatorEntryDropdownView::ActivateChild(PanelIndicatorEntryView::Ptr const& child)

=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-02-19 02:16:22 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-03-03 11:01:22 +0000
@@ -19,6 +19,7 @@
  */
 
 #include <Nux/Nux.h>
+#include <NuxCore/Logger.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GTKWrapper.h>
 
@@ -29,17 +30,16 @@
 
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/RawPixel.h"
 #include "unity-shared/WindowManager.h"
 #include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
-
 namespace
 {
-const RawPixel DEFAULT_SPACING = 3_em;
-
-const int SCALED_IMAGE_Y = 1;
+DECLARE_LOGGER(logger, "unity.panel.indicator.entry");
+const int DEFAULT_SPACING = 3;
 }
 
 using namespace indicator;
@@ -48,17 +48,14 @@
                                                  IndicatorEntryType type)
   : TextureArea(NUX_TRACKER_LOCATION)
   , proxy_(proxy)
-  , spacing_(DEFAULT_SPACING)
-  , left_padding_(padding < 0 ? 0 : padding)
-  , right_padding_(left_padding_)
+  , type_(type)
   , monitor_(0)
-  , type_(type)
-  , entry_texture_(nullptr)
   , opacity_(1.0f)
   , draw_active_(false)
   , overlay_showing_(false)
   , disabled_(false)
   , focused_(true)
+  , padding_(padding < 0 ? 0 : padding)
   , cv_(unity::Settings::Instance().em(monitor_))
 {
   proxy_->active_changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::OnActiveChanged));
@@ -73,6 +70,14 @@
     InputArea::mouse_wheel.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::OnMouseWheel));
   }
 
+  if (type_ != MENU)
+  {
+    icon_theme_changed_.Connect(gtk_icon_theme_get_default(), "changed", [this] (GtkIconTheme*) {
+      if (proxy_->image_type() && proxy_->image_visible())
+        Refresh();
+    });
+  }
+
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::Refresh));
   unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::Refresh));
 
@@ -115,7 +120,7 @@
     wm.TerminateScale();
 
   auto const& abs_geo = GetAbsoluteGeometry();
-  proxy_->ShowMenu(abs_geo.x, abs_geo.y + panel::Style::Instance().PanelHeight(monitor_), button);
+  proxy_->ShowMenu(abs_geo.x, abs_geo.y + abs_geo.height, button);
 }
 
 void PanelIndicatorEntryView::OnMouseDown(int x, int y, long button_flags, long key_flags)
@@ -194,73 +199,59 @@
   }
 }
 
-glib::Object<GdkPixbuf> PanelIndicatorEntryView::MakePixbuf()
+glib::Object<GdkPixbuf> PanelIndicatorEntryView::MakePixbuf(int size)
 {
   glib::Object<GdkPixbuf> pixbuf;
-  GtkIconTheme* theme = gtk_icon_theme_get_default();
-  int image_type = proxy_->image_type();
-  RawPixel size = (type_ != DROP_DOWN) ? 24_em : 10_em;
-
-  if (image_type == GTK_IMAGE_PIXBUF)
-  {
-    gsize len = 0;
-    guchar* decoded = g_base64_decode(proxy_->image_data().c_str(), &len);
-
-    glib::Object<GInputStream> stream(g_memory_input_stream_new_from_data(decoded,
-                                                                          len,
-                                                                          nullptr));
-
-    pixbuf = gdk_pixbuf_new_from_stream(stream, nullptr, nullptr);
-
-    g_free(decoded);
-    g_input_stream_close(stream, nullptr, nullptr);
-  }
-  else if (image_type == GTK_IMAGE_STOCK ||
-           image_type == GTK_IMAGE_ICON_NAME)
-  {
-    pixbuf = gtk_icon_theme_load_icon(theme, proxy_->image_data().c_str(), size.CP(cv_),
-                                      (GtkIconLookupFlags)0, nullptr);
-  }
-  else if (image_type == GTK_IMAGE_GICON)
-  {
-    glib::Object<GIcon> icon(g_icon_new_for_string(proxy_->image_data().c_str(), nullptr));
-
-    gtk::IconInfo info(gtk_icon_theme_lookup_by_gicon(theme, icon, size.CP(cv_),
-                                                      (GtkIconLookupFlags)0));
-    if (info)
-      pixbuf = gtk_icon_info_load_icon(info, nullptr);
+  auto image_type = proxy_->image_type();
+
+  switch (image_type)
+  {
+    case GTK_IMAGE_PIXBUF:
+    {
+      gsize len = 0;
+      auto* decoded = g_base64_decode(proxy_->image_data().c_str(), &len);
+      glib::Object<GInputStream> stream(g_memory_input_stream_new_from_data(decoded, len, nullptr));
+      pixbuf = gdk_pixbuf_new_from_stream(stream, nullptr, nullptr);
+      g_input_stream_close(stream, nullptr, nullptr);
+      g_free(decoded);
+      break;
+    }
+
+    case GTK_IMAGE_ICON_NAME:
+    case GTK_IMAGE_STOCK:
+    case GTK_IMAGE_GICON:
+    {
+      GtkIconTheme* theme = gtk_icon_theme_get_default();
+      auto flags = static_cast<GtkIconLookupFlags>(0);
+      gtk::IconInfo info;
+
+      if (image_type == GTK_IMAGE_GICON)
+      {
+        glib::Object<GIcon> icon(g_icon_new_for_string(proxy_->image_data().c_str(), nullptr));
+        info = gtk_icon_theme_lookup_by_gicon(theme, icon, size, flags);
+      }
+      else
+      {
+        info = gtk_icon_theme_lookup_icon(theme, proxy_->image_data().c_str(), size, flags);
+      }
+
+      if (info)
+      {
+        auto* filename = gtk_icon_info_get_filename(info);
+        pixbuf = gdk_pixbuf_new_from_file_at_size(filename, -1, size, nullptr);
+      }
+      else if (image_type == GTK_IMAGE_ICON_NAME)
+      {
+        pixbuf = gdk_pixbuf_new_from_file_at_size(proxy_->image_data().c_str(), -1, size, nullptr);
+      }
+
+      break;
+    }
   }
 
   return pixbuf;
 }
 
-int PanelIndicatorEntryView::PixbufWidth(glib::Object<GdkPixbuf> const& pixbuf) const
-{
-  int image_type = proxy_->image_type();
-  if (image_type == GTK_IMAGE_PIXBUF)
-  {
-    return RawPixel(gdk_pixbuf_get_width(pixbuf)).CP(cv_);
-  }
-  else
-  {
-    return gdk_pixbuf_get_width(pixbuf);
-  }
-}
-
-int PanelIndicatorEntryView::PixbufHeight(glib::Object<GdkPixbuf> const& pixbuf) const
-{
-  int image_type = proxy_->image_type();
-  if (image_type == GTK_IMAGE_PIXBUF)
-  {
-    return RawPixel(gdk_pixbuf_get_height(pixbuf)).CP(cv_);
-  }
-  else
-  {
-    return gdk_pixbuf_get_height(pixbuf);
-  }
-
-}
-
 void PanelIndicatorEntryView::DrawEntryPrelight(cairo_t* cr, unsigned int width, unsigned int height)
 {
   GtkStyleContext* style_context = panel::Style::Instance().GetStyleContext();
@@ -285,22 +276,9 @@
   gtk_style_context_restore(style_context);
 }
 
-// FIXME Remove me when icons for the indicators aren't stuck as 22x22 images...
-void PanelIndicatorEntryView::ScaleImageIcons(cairo_t* cr, int* x, int* y)
-{
-  int image_type = proxy_->image_type();
-  if (image_type == GTK_IMAGE_PIXBUF)
-  {
-    float aspect = cv_->DPIScale();
-    *x = left_padding_;
-    *y = SCALED_IMAGE_Y;
-    cairo_scale(cr, aspect, aspect);
-  }
-}
-
-void PanelIndicatorEntryView::DrawEntryContent(cairo_t *cr, unsigned int width, unsigned int height, glib::Object<GdkPixbuf> const& pixbuf, glib::Object<PangoLayout> const& layout)
-{
-  int x = left_padding_.CP(cv_);
+void PanelIndicatorEntryView::DrawEntryContent(cairo_t *cr, unsigned int width, unsigned int height, glib::Object<GdkPixbuf> const& pixbuf, bool icon_scalable, glib::Object<PangoLayout> const& layout)
+{
+  int x = padding_;
 
   if (IsActive())
     DrawEntryPrelight(cr, width, height);
@@ -308,7 +286,7 @@
   if (pixbuf && IsIconVisible())
   {
     GtkStyleContext* style_context = panel::Style::Instance().GetStyleContext();
-    unsigned int icon_width = PixbufWidth(pixbuf);
+    unsigned int icon_width = gdk_pixbuf_get_width(pixbuf);
 
     gtk_style_context_save(style_context);
 
@@ -330,7 +308,17 @@
       gtk_style_context_set_state(style_context, GTK_STATE_FLAG_PRELIGHT);
     }
 
-    int y = (int)((height - PixbufHeight(pixbuf)) / 2);
+    int y = (height - gdk_pixbuf_get_height(pixbuf)) / 2;
+
+    if (icon_scalable)
+    {
+      double dpi_scale = cv_->DPIScale();
+      cairo_save(cr);
+      cairo_scale(cr, 1.0f/dpi_scale, 1.0f/dpi_scale);
+      x = padding_ * dpi_scale;
+      y = (std::ceil(height * dpi_scale) - gdk_pixbuf_get_height(pixbuf)) / 2;
+      icon_width /= dpi_scale;
+    }
 
     if (overlay_showing_ && !IsActive())
     {
@@ -339,9 +327,6 @@
        * a white square. It works surprisingly well for most symbolic-type
        * icon themes/icons.
        */
-      cairo_save(cr);
-      ScaleImageIcons(cr, &x, &y);
-
       cairo_push_group(cr);
       gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
       cairo_paint_with_alpha(cr, (IsIconSensitive() && IsFocused()) ? 1.0 : 0.5);
@@ -353,36 +338,29 @@
       cairo_mask(cr, pat);
 
       cairo_pattern_destroy(pat);
-      cairo_restore(cr);
     }
     else
     {
-      cairo_save(cr);
-      ScaleImageIcons(cr, &x, &y);
-
       cairo_push_group(cr);
       gtk_render_icon(style_context, cr, pixbuf, x, y);
       cairo_pop_group_to_source(cr);
       cairo_paint_with_alpha(cr, (IsIconSensitive() && IsFocused()) ? 1.0 : 0.5);
-
-      cairo_restore(cr);
     }
 
     gtk_widget_path_free(widget_path);
-
     gtk_style_context_restore(style_context);
 
-    x += icon_width + spacing_.CP(cv_);
+    if (icon_scalable)
+    {
+      cairo_restore(cr);
+      x = padding_;
+    }
+
+    x += icon_width + DEFAULT_SPACING;
   }
 
   if (layout)
   {
-    PangoRectangle log_rect;
-    pango_layout_get_extents(layout, nullptr, &log_rect);
-    unsigned int text_height = log_rect.height / PANGO_SCALE;
-
-    pango_cairo_update_layout(cr, layout);
-
     GtkStyleContext* style_context = panel::Style::Instance().GetStyleContext();
 
     gtk_style_context_save(style_context);
@@ -405,7 +383,9 @@
       gtk_style_context_set_state(style_context, GTK_STATE_FLAG_PRELIGHT);
     }
 
-    int y = (height - text_height) / 2;
+    nux::Size extents;
+    pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
+    int y = (height - extents.height) / 2;
 
     if (overlay_showing_)
     {
@@ -446,88 +426,79 @@
   cairo_t* cr;
 
   std::string label = GetLabel();
-  glib::Object<GdkPixbuf> const& pixbuf = MakePixbuf();
-
-  unsigned int width = 0;
-  unsigned int icon_width = 0;
-  unsigned int height = panel::Style::Instance().PanelHeight(monitor_);
+  auto& panel_style = panel::Style::Instance();
+
+  double dpi_scale = cv_->DPIScale();
+  int width = 0;
+  int height = panel_style.PanelHeight(monitor_) / dpi_scale;
+  int icon_width = 0;
+
+  int icon_size = RawPixel((type_ != DROP_DOWN) ? 22 : 10).CP(dpi_scale);
+  glib::Object<GdkPixbuf> const& pixbuf = MakePixbuf(icon_size);
+  bool icon_scalable = false;
 
   // First lets figure out our size
   if (pixbuf && IsIconVisible())
   {
-    width = PixbufWidth(pixbuf);
+    width = gdk_pixbuf_get_width(pixbuf);
+
+    if (gdk_pixbuf_get_height(pixbuf) == icon_size)
+    {
+      icon_scalable = true;
+      width /= dpi_scale;
+    }
+
     icon_width = width;
   }
 
   if (!label.empty() && IsLabelVisible())
   {
-    using namespace panel;
-    PangoContext* cxt;
     PangoAttrList* attrs = nullptr;
-    PangoRectangle log_rect;
-    GdkScreen* screen = gdk_screen_get_default();
-    PangoFontDescription* desc = nullptr;
-    PanelItem panel_item = (type_ == MENU) ? PanelItem::MENU : PanelItem::INDICATOR;
-
-    Style& panel_style = Style::Instance();
-    std::string const& font_description = panel_style.GetFontDescription(panel_item);
-    int dpi = panel_style.GetTextDPI();
+    auto panel_item = (type_ == MENU) ? panel::PanelItem::MENU : panel::PanelItem::INDICATOR;
+    std::string const& font = panel_style.GetFontDescription(panel_item);
 
     if (proxy_->show_now())
     {
       if (!pango_parse_markup(label.c_str(), -1, '_', &attrs, nullptr, nullptr, nullptr))
       {
-        g_debug("pango_parse_markup failed");
+        LOG_WARN(logger) << "Pango markup parsing failed";
       }
     }
 
-    desc = pango_font_description_from_string(font_description.c_str());
-    pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
-
-    nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, 1, 1);
-    cr = cairo_graphics.GetInternalContext();
-
-    layout = pango_cairo_create_layout(cr);
-    if (attrs)
-    {
-      pango_layout_set_attributes(layout, attrs);
-      pango_attr_list_unref(attrs);
-    }
-
-    pango_layout_set_font_description(layout, desc);
+    glib::Object<PangoContext> context(gdk_pango_context_get_for_screen(gdk_screen_get_default()));
+    std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font.c_str()), pango_font_description_free);
+    pango_context_set_font_description(context, desc.get());
+    pango_context_set_language(context, gtk_get_default_language());
 
     label.erase(std::remove(label.begin(), label.end(), '_'), label.end());
+    layout = pango_layout_new(context);
+    pango_layout_set_height(layout, -1); //avoid wrap lines
     pango_layout_set_text(layout, label.c_str(), -1);
-
-    cxt = pango_layout_get_context(layout);
-    pango_cairo_context_set_font_options(cxt, gdk_screen_get_font_options(screen));
-    pango_cairo_context_set_resolution(cxt, dpi / static_cast<float>(PANGO_SCALE));
-    pango_layout_context_changed(layout);
-
-    pango_layout_get_extents(layout, nullptr, &log_rect);
-    unsigned int text_width = log_rect.width / PANGO_SCALE;
+    pango_layout_set_attributes(layout, attrs);
+    pango_attr_list_unref(attrs);
+
+    nux::Size extents;
+    pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
 
     if (icon_width)
-      width += spacing_.CP(cv_);
-    width += text_width;
+      width += DEFAULT_SPACING;
 
-    pango_font_description_free(desc);
+    width += extents.width;
   }
 
   if (width)
-    width += left_padding_.CP(cv_) + right_padding_.CP(cv_);
-
-  SetMinimumWidth(width);
-  SetMaximumWidth(width);
-
-  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
+    width += padding_ * 2;
+
+  SetMinMaxSize(std::ceil(width * dpi_scale), std::ceil(height * dpi_scale));
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, GetWidth(), GetHeight());
+  cairo_surface_set_device_scale(cg.GetSurface(), dpi_scale, dpi_scale);
   cr = cg.GetInternalContext();
   cairo_set_line_width(cr, 1);
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
 
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-  DrawEntryContent(cr, width, height, pixbuf, layout);
+  DrawEntryContent(cr, width, height, pixbuf, icon_scalable, layout);
 
   entry_texture_ = texture_ptr_from_cairo_graphics(cg);
   SetTexture(entry_texture_.GetPointer());
@@ -582,9 +553,12 @@
 
 void PanelIndicatorEntryView::SetMonitor(int monitor)
 {
+  if (monitor_ == monitor)
+    return;
+
   monitor_ = monitor;
-
-  cv_ = unity::Settings::Instance().em(monitor);
+  cv_ = Settings::Instance().em(monitor);
+  Refresh();
 }
 
 void PanelIndicatorEntryView::SetOpacity(double opacity)

=== modified file 'panel/PanelIndicatorEntryView.h'
--- panel/PanelIndicatorEntryView.h	2014-02-19 02:16:22 +0000
+++ panel/PanelIndicatorEntryView.h	2014-03-03 11:01:22 +0000
@@ -34,7 +34,6 @@
 
 #include "unity-shared/EMConverter.h"
 #include "unity-shared/Introspectable.h"
-#include "unity-shared/RawPixel.h"
 
 
 namespace unity
@@ -102,7 +101,7 @@
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawEntryPrelight(cairo_t* cr, unsigned int w, unsigned int h);
   virtual void DrawEntryContent(cairo_t* cr, unsigned int width, unsigned int height,
-                                glib::Object<GdkPixbuf> const& pixbuf,
+                                glib::Object<GdkPixbuf> const& pixbuf, bool scalable,
                                 glib::Object<PangoLayout> const& layout);
 
   void Refresh();
@@ -110,11 +109,6 @@
   virtual void ShowMenu(int button = 1);
 
   indicator::Entry::Ptr proxy_;
-  RawPixel spacing_;
-  RawPixel left_padding_;
-  RawPixel right_padding_;
-
-  int monitor_;
 
 private:
   void OnMouseDown(int x, int y, long button_flags, long key_flags);
@@ -122,21 +116,19 @@
   void OnMouseWheel(int x, int y, int delta, unsigned long mouse_state, unsigned long key_state);
   void OnActiveChanged(bool is_active);
 
-  int PixbufWidth(glib::Object<GdkPixbuf> const& pixbuf) const;
-  int PixbufHeight(glib::Object<GdkPixbuf> const& pixbuf) const;
-
-  void ScaleImageIcons(cairo_t* cr, int* x, int* y);
-
-  glib::Object<GdkPixbuf> MakePixbuf();
+  glib::Object<GdkPixbuf> MakePixbuf(int size);
 
   IndicatorEntryType type_;
   nux::ObjectPtr<nux::BaseTexture> entry_texture_;
   nux::Geometry cached_geo_;
+  glib::Signal<void, GtkIconTheme*> icon_theme_changed_;
+  int monitor_;
   double opacity_;
   bool draw_active_;
   bool overlay_showing_;
   bool disabled_;
   bool focused_;
+  int padding_;
 
   EMConverter::Ptr cv_;
 };

=== modified file 'panel/PanelIndicatorsView.cpp'
--- panel/PanelIndicatorsView.cpp	2014-02-19 02:16:22 +0000
+++ panel/PanelIndicatorsView.cpp	2014-03-03 11:01:22 +0000
@@ -381,6 +381,9 @@
 void PanelIndicatorsView::SetMonitor(int monitor)
 {
   monitor_ = monitor;
+
+  for (auto const& entry : entries_)
+    entry.second->SetMonitor(monitor_);
 }
 
 bool PanelIndicatorsView::SetOpacity(double& target, double const& new_value)

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-02-19 02:16:22 +0000
+++ panel/PanelMenuView.cpp	2014-03-03 11:01:22 +0000
@@ -99,12 +99,13 @@
   titlebar_grab_area_->UnParentObject();
 }
 
-void PanelMenuView::OnDPIChanged()
+void PanelMenuView::OnStyleChanged()
 {
   int height = panel::Style::Instance().PanelHeight(monitor_);
+  window_buttons_->SetMinimumHeight(height);
   window_buttons_->SetMaximumHeight(height);
   window_buttons_->UpdateDPIChanged();
-  window_buttons_->ComputeContentSize();
+
   layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
 
   Refresh(true);
@@ -126,8 +127,7 @@
   mouse_leave.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseLeave));
   opacity_animator_.updated.connect(sigc::mem_fun(this, &PanelMenuView::OnFadeAnimatorUpdated));
   entry_added.connect(sigc::mem_fun(this, &PanelMenuView::OnEntryViewAdded));
-
-  Style::Instance().changed.connect(sigc::mem_fun(this, &PanelMenuView::OnDPIChanged));
+  Style::Instance().changed.connect(sigc::mem_fun(this, &PanelMenuView::OnStyleChanged));
 
   auto const& deco_style = decoration::Style::Get();
   lim_changed_connection_ = deco_style->integrated_menus.changed.connect([this] (bool lim) {
@@ -167,7 +167,6 @@
 {
   layout_->SetContentDistribution(nux::MAJOR_POSITION_START);
   layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
-  layout_->SetBaseHeight(panel::Style::Instance().PanelHeight(monitor_));
 }
 
 void PanelMenuView::SetupTitlebarGrabArea()
@@ -786,26 +785,28 @@
   auto const& style = decoration::Style::Get();
   auto text_size = style->TitleNaturalSize(label);
   auto state = WidgetState::NORMAL;
+  float dpi_scale = Settings::Instance().em(monitor_)->DPIScale();
 
   if (integrated_menus_ && !is_desktop_focused_ && !WindowManager::Default().IsScaleActive())
   {
-    title_geo_.x = geo.x + window_buttons_->GetBaseWidth() + style->TitleIndent();
+    title_geo_.x = geo.x + window_buttons_->GetBaseWidth() + (style->TitleIndent() * dpi_scale);
 
     if (!window_buttons_->focused())
       state = WidgetState::BACKDROP;
   }
   else
   {
-    title_geo_.x = geo.x + MAIN_LEFT_PADDING + TITLE_PADDING;
+    title_geo_.x = geo.x + (MAIN_LEFT_PADDING + TITLE_PADDING) * dpi_scale;
   }
 
-  title_geo_.y = geo.y + (geo.height - text_size.height) / 2;
-  title_geo_.width = std::min(text_size.width, geo.width - title_geo_.x);
-  title_geo_.height = text_size.height;
+  title_geo_.y = geo.y + (geo.height - (text_size.height * dpi_scale)) / 2;
+  title_geo_.width = std::min<int>(std::ceil(text_size.width * dpi_scale), geo.width - title_geo_.x);
+  title_geo_.height = std::ceil(text_size.height * dpi_scale);
 
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, title_geo_.width, title_geo_.height);
+  cairo_surface_set_device_scale(cairo_graphics.GetSurface(), dpi_scale, dpi_scale);
   cairo_t* cr = cairo_graphics.GetInternalContext();
-  style->DrawTitle(label, state, cr, title_geo_.width, title_geo_.height);
+  style->DrawTitle(label, state, cr, title_geo_.width / dpi_scale, title_geo_.height / dpi_scale);
   title_texture_ = texture_ptr_from_cairo_graphics(cairo_graphics);
 }
 
@@ -1685,9 +1686,9 @@
 
 void PanelMenuView::SetMonitor(int monitor)
 {
-  monitor_ = monitor;
+  PanelIndicatorsView::SetMonitor(monitor);
+
   monitor_geo_ = UScreen::GetDefault()->GetMonitorGeometry(monitor_);
-
   maximized_set_.clear();
   GList* windows = bamf_matcher_get_window_stack_for_monitor(matcher_, monitor_);
 
@@ -1722,6 +1723,7 @@
   window_buttons_->monitor = monitor_;
   window_buttons_->controlled_window = buttons_win;
 
+  OnStyleChanged();
   g_list_free(windows);
 }
 

=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-02-19 02:16:22 +0000
+++ panel/PanelMenuView.h	2014-03-03 11:01:22 +0000
@@ -59,8 +59,6 @@
   virtual void OverlayShown();
   virtual void OverlayHidden();
 
-  void OnDPIChanged();
-
 protected:
   std::string GetName() const;
   void AddProperties(debug::IntrospectionData&);
@@ -92,6 +90,7 @@
   void OnActiveWindowChanged(BamfMatcher* matcher, BamfView* old_view, BamfView* new_view);
   void OnActiveAppChanged(BamfMatcher* matcher, BamfApplication* old_app, BamfApplication* new_app);
   void OnNameChanged(BamfView* bamf_view, gchar* new_name, gchar* old_name);
+  void OnStyleChanged();
 
   void OnSpreadInitiate();
   void OnSpreadTerminate();

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2014-02-18 21:20:28 +0000
+++ panel/PanelView.cpp	2014-03-03 11:01:22 +0000
@@ -73,7 +73,7 @@
 {
   auto& wm = WindowManager::Default();
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelView::ForceUpdateBackground));
-  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &PanelView::OnDPIChanged));
+  Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &PanelView::Resize));
 
   wm.average_color.changed.connect(sigc::mem_fun(this, &PanelView::OnBackgroundUpdate));
   wm.initiate_spread.connect(sigc::mem_fun(this, &PanelView::OnSpreadInitiate));
@@ -171,13 +171,6 @@
   return tray_->xid();
 }
 
-void PanelView::OnDPIChanged()
-{
-  int height = panel::Style::Instance().PanelHeight(monitor_);
-  tray_->SetMinMaxSize(1, height);
-  menu_view_->OnDPIChanged();
-}
-
 void PanelView::SetLauncherWidth(int width)
 {
   launcher_width_ = width;
@@ -475,7 +468,6 @@
 
       refine_geo.x = refine_x_pos;
       refine_geo.width = bg_refine_tex_->GetWidth();
-      refine_geo.height = bg_refine_tex_->GetHeight();
 
       if (!Settings::Instance().GetLowGfxMode())
       {
@@ -484,7 +476,6 @@
 
         refine_geo.x += refine_geo.width;
         refine_geo.width = geo.width;
-        refine_geo.height = geo.height;
         nux::GetPainter().PushLayer(GfxContext, refine_geo, bg_refine_single_column_layer_.get());
         bgs++;
       }
@@ -800,21 +791,24 @@
   monitor_ = monitor;
   menu_view_->SetMonitor(monitor);
   indicators_->SetMonitor(monitor);
-
-  int height = panel::Style::Instance().PanelHeight(monitor_);
-  SetMinMaxSize(height, height);
-  
-  UScreen* uscreen = UScreen::GetDefault();
-  auto monitor_geo = uscreen->GetMonitorGeometry(monitor);
-  Resize(nux::Point(monitor_geo.x, monitor_geo.y), monitor_geo.width);
+  Resize();
 }
 
-void PanelView::Resize(nux::Point const& offset, int width)
+void PanelView::Resize()
 {
-  unity::panel::Style &panel_style = panel::Style::Instance();
-  SetMaximumWidth(width);
-  SetGeometry(nux::Geometry(0, 0, width, panel_style.PanelHeight(monitor_)));
-  parent_->SetGeometry(nux::Geometry(offset.x, offset.y, width, panel_style.PanelHeight(monitor_)));
+  int height = Style::Instance().PanelHeight(monitor_);
+  auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor_);
+
+  SetMinMaxSize(monitor_geo.width, height);
+  parent_->SetGeometry({monitor_geo.x, monitor_geo.y, monitor_geo.width, height});
+
+  for (auto* child : layout_->GetChildren())
+  {
+    child->SetMinimumHeight(height);
+    child->SetMaximumHeight(height);
+  }
+
+  QueueRelayout();
 }
 
 int PanelView::GetMonitor() const

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2014-02-18 21:20:28 +0000
+++ panel/PanelView.h	2014-03-03 11:01:22 +0000
@@ -104,15 +104,13 @@
 
   bool ActivateFirstSensitive();
   bool ActivateEntry(std::string const& entry_id);
-  void Resize(nux::Point const& offset, int width);
+  void Resize();
   bool IsTransparent();
   void UpdateBackground();
   void ForceUpdateBackground();
   bool TrackMenuPointer();
   void SyncGeometries();
   void AddPanelView(PanelIndicatorsView* child, unsigned int stretchFactor);
-  
-  void OnDPIChanged();
 
   MockableBaseWindow* parent_;
   indicator::Indicators::Ptr remote_;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-02-19 02:16:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-03 11:01:22 +0000
@@ -890,10 +890,12 @@
 
 void UnityScreen::DrawPanelUnderDash()
 {
-  if (!paint_panel_under_dash_ || !launcher_controller_->IsOverlayOpen())
+  if (!paint_panel_under_dash_ || (!dash_controller_->IsVisible() && !hud_controller_->IsVisible()))
     return;
 
-  if (_last_output->id() != screen->currentOutputDev().id())
+  auto const& output_dev = screen->currentOutputDev();
+
+  if (_last_output->id() != output_dev.id())
     return;
 
   auto graphics_engine = nux::GetGraphicsDisplay()->GetGraphicsEngine();
@@ -904,18 +906,17 @@
   graphics_engine->ResetModelViewMatrixStack();
   graphics_engine->Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
   graphics_engine->ResetProjectionMatrix();
-  graphics_engine->SetOrthographicProjectionMatrix(screen->width(), screen->height());
+  graphics_engine->SetOrthographicProjectionMatrix(output_dev.width(), output_dev.height());
 
   nux::TexCoordXForm texxform;
   texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_CLAMP);
 
-  // FIXME Change to paint per monitor vs all at once
-  int panel_height = panel_style_.PanelHeight();
-  auto const& texture = panel_style_.GetBackground()->GetDeviceTexture();
-  graphics_engine->QRP_GLSL_1Tex(0, 0, screen->width(), panel_height, texture, texxform, nux::color::White);
+  int monitor = WindowManager::Default().MonitorGeometryIn(NuxGeometryFromCompRect(output_dev));
+  auto const& texture = panel_style_.GetBackground(monitor)->GetDeviceTexture();
+  graphics_engine->QRP_GLSL_1Tex(0, 0, output_dev.width(), texture->GetHeight(), texture, texxform, nux::color::White);
 }
 
-bool UnityScreen::forcePaintOnTop ()
+bool UnityScreen::forcePaintOnTop()
 {
     return !allowWindowPaint ||
       ((switcher_controller_->Visible() ||
@@ -2852,9 +2853,12 @@
                          const CompRegion& region,
                          unsigned int mask)
 {
-  if (uScreen->doShellRepaint && !uScreen->paint_panel_under_dash_ && window->type() == CompWindowTypeNormalMask)
+  auto window_state = window->state();
+  auto window_type = window->type();
+
+  if (uScreen->doShellRepaint && !uScreen->paint_panel_under_dash_ && window_type == CompWindowTypeNormalMask)
   {
-    if ((window->state() & MAXIMIZE_STATE) && window->onCurrentDesktop() && !window->overrideRedirect() && window->managed())
+    if ((window_state & MAXIMIZE_STATE) && window->onCurrentDesktop() && !window->overrideRedirect() && window->managed())
     {
       CompPoint const& viewport = window->defaultViewport();
       unsigned output = window->outputDevice();
@@ -2887,7 +2891,7 @@
   {
     Window active_window = screen->activeWindow();
 
-    if (G_UNLIKELY(window->type() == CompWindowTypeDesktopMask))
+    if (G_UNLIKELY(window_type == CompWindowTypeDesktopMask))
     {
       uScreen->setPanelShadowMatrix(matrix);
 
@@ -2907,9 +2911,9 @@
         draw_panel_shadow = DrawPanelShadow::BELOW_WINDOW;
         uScreen->is_desktop_active_ = false;
 
-        if (!(window->state() & CompWindowStateMaximizedVertMask) &&
-            !(window->state() & CompWindowStateFullscreenMask) &&
-            !(window->type() & CompWindowTypeFullscreenMask))
+        if (!(window_state & CompWindowStateMaximizedVertMask) &&
+            !(window_state & CompWindowStateFullscreenMask) &&
+            !(window_type & CompWindowTypeFullscreenMask))
         {
           WindowManager& wm = WindowManager::Default();
           auto const& output = uScreen->screen->currentOutputDev();
@@ -3817,8 +3821,7 @@
 
     if (texture->width() && texture->height())
     {
-      GLTexture::MatrixList ml(1);
-      ml[0] = texture->matrix();
+      GLTexture::MatrixList ml({texture->matrix()});
       CompRegion texture_region(0, 0, texture->width(), texture->height());
       gWindow->glAddGeometry(ml, texture_region, texture_region);
     }
@@ -3841,16 +3844,13 @@
 
   using namespace decoration;
 
-  // We need to scale the cairo matrix in order to get the properly scaled
-  cairo_save(ctx);
-  cairo_scale(ctx, aspect, aspect);
-  int w = std::round(ctx.width() / aspect);
-  int h = std::round(ctx.height() / aspect);
+  aspect *= deco_win_->dpi_scale();
+  double w = ctx.width() / aspect;
+  double h = ctx.height() / aspect;
   Style::Get()->DrawSide(Side::TOP, WidgetState::NORMAL, ctx, w, h);
-  cairo_restore(ctx);
 }
 
-void UnityWindow::RenderTitle(compiz_utils::CairoContext const& ctx, int x, int y, int width, int height)
+void UnityWindow::RenderTitle(compiz_utils::CairoContext const& ctx, int x, int y, int width, int height, double aspect)
 {
   using namespace decoration;
   auto const& style = Style::Get();
@@ -3860,6 +3860,7 @@
   y += (height - text_size.height)/2;
 
   cairo_save(ctx);
+  cairo_scale(ctx, 1.0f/aspect, 1.0f/aspect);
   cairo_translate(ctx, x, y);
   style->DrawTitle(title, WidgetState::NORMAL, ctx, width - x, height);
   cairo_restore(ctx);
@@ -3867,14 +3868,12 @@
 
 void UnityWindow::BuildDecorationTexture()
 {
-  if (decoration_tex_)
-    return;
-
   auto const& border = decoration::Style::Get()->Border();
 
   if (border.top)
   {
-    compiz_utils::CairoContext context(window->borderRect().width(), border.top);
+    double dpi_scale = deco_win_->dpi_scale();
+    compiz_utils::CairoContext context(window->borderRect().width(), border.top * dpi_scale, dpi_scale);
     RenderDecoration(context);
     decoration_tex_ = context;
   }
@@ -3896,7 +3895,8 @@
     if (!compiz_utils::IsWindowFullyDecorable(window))
       return;
 
-    BuildDecorationTexture();
+    if (!decoration_tex_)
+      BuildDecorationTexture();
 
     if (decoration_tex_)
       DrawTexture(*decoration_tex_, attrib, transform, mask, geo.x, geo.y, scale);
@@ -3906,8 +3906,9 @@
   else
   {
     auto const& style = decoration::Style::Get();
+    double dpi_scale = deco_win_->dpi_scale();
     int width = geo.width;
-    int height = style->Border().top;
+    int height = style->Border().top * dpi_scale;
     auto const& padding = style->Padding(decoration::Side::TOP);
     bool redraw_decoration = true;
     compiz_utils::SimpleTexture::Ptr close_texture;
@@ -3925,19 +3926,19 @@
     if (window->actions() & CompWindowActionCloseMask)
     {
       using namespace decoration;
-      close_texture = DataPool::Get()->ButtonTexture(WindowButtonType::CLOSE, close_icon_state_);
+      close_texture = DataPool::Get()->ButtonTexture(dpi_scale, WindowButtonType::CLOSE, close_icon_state_);
     }
 
     if (redraw_decoration)
     {
       if (width != 0 && height != 0)
       {
-        compiz_utils::CairoContext context(width, height);
+        compiz_utils::CairoContext context(width, height, scale * dpi_scale);
         RenderDecoration(context, scale);
 
         // Draw window title
-        int text_x = padding.left + (close_texture ? close_texture->width() : 0);
-        RenderTitle(context, text_x, padding.top, width - padding.right, height);
+        int text_x = padding.left + (close_texture ? close_texture->width() : 0) / dpi_scale;
+        RenderTitle(context, text_x, padding.top, (width - padding.right) / dpi_scale, height / dpi_scale, scale);
         decoration_selected_tex_ = context;
         uScreen->damageRegion(CompRegionFromNuxGeo(geo));
       }
@@ -3953,10 +3954,12 @@
 
     if (close_texture)
     {
-      int x = geo.x + padding.left;
-      int y = geo.y + padding.top + (height - close_texture->height()) / 2.0f;
+      int w = close_texture->width();
+      int h = close_texture->height();
+      int x = geo.x + padding.left * dpi_scale;
+      int y = geo.y + padding.top * dpi_scale + (height - w) / 2.0f;
 
-      close_button_geo_.Set(x, y, close_texture->width(), close_texture->height());
+      close_button_geo_.Set(x, y, w, h);
       DrawTexture(*close_texture, attrib, transform, mask, x, y);
     }
     else
@@ -4041,7 +4044,8 @@
 {
   using namespace decoration;
   auto const& style = Style::Get();
-  unsigned glow_size = style->GlowSize();
+  double dpi_scale = deco_win_->dpi_scale();
+  unsigned glow_size = std::round(style->GlowSize() * dpi_scale);
   auto const& glow_texture = DataPool::Get()->GlowTexture();
 
   if (!glow_size || !glow_texture)
@@ -4054,7 +4058,7 @@
   {
     // We paint the glow below the window edges to correctly
     // render the rounded corners
-    int inside_glow = decoration_radius / 4;
+    int inside_glow = decoration_radius * dpi_scale / 4;
     glow_size += inside_glow;
     glow_geo.Expand(-inside_glow, -inside_glow);
   }

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-02-18 21:21:16 +0000
+++ plugins/unityshell/src/unityshell.h	2014-03-03 11:01:22 +0000
@@ -519,7 +519,7 @@
   compiz::WindowInputRemoverLock::Ptr GetInputRemover ();
 
   void RenderDecoration(compiz_utils::CairoContext const&, double aspect = 1.0f);
-  void RenderTitle(compiz_utils::CairoContext const&, int x, int y, int width, int height);
+  void RenderTitle(compiz_utils::CairoContext const&, int x, int y, int width, int height, double aspect = 1.0f);
   void DrawTexture(GLTexture::List const& textures, GLWindowPaintAttrib const&,
                    GLMatrix const&, unsigned mask, int x, int y, double aspect = 1.0f);
 

=== removed file 'resources/close_dash.png'
Binary files resources/close_dash.png	2012-03-14 06:24:18 +0000 and resources/close_dash.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/close_dash.svg'
--- resources/close_dash.svg	1970-01-01 00:00:00 +0000
+++ resources/close_dash.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_dash.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="9.5000027"
+     inkscape:cy="9.5000031"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.7143,-511.00011)"
+       style="display:inline"
+       id="g4113">
+      <path
+         id="circle4507"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,97.5 A 7.4999798,7.4999798 0 0 0 78,105 7.4999798,7.4999798 0 0 0 85.5,112.5 7.4999798,7.4999798 0 0 0 93,105 7.4999798,7.4999798 0 0 0 85.5,97.5 Z m -2.5,4.22266 0.388672,0.38867 L 85.5,104.22266 87.611328,102.11133 88,101.72266 88.777344,102.5 88.388672,102.89062 86.277344,105 88.388672,107.11133 88.777344,107.5 88,108.2793 87.611328,107.89062 85.5,105.7793 83.388672,107.89062 83,108.2793 82.222656,107.5 82.611328,107.11133 84.722656,105 82.611328,102.89062 82.222656,102.5 83,101.72266 Z"
+         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="1033.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4539"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/close_dash_disabled.png'
Binary files resources/close_dash_disabled.png	2012-02-12 15:48:12 +0000 and resources/close_dash_disabled.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/close_dash_disabled.svg'
--- resources/close_dash_disabled.svg	1970-01-01 00:00:00 +0000
+++ resources/close_dash_disabled.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_dash_disabled.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       style="display:inline"
+       id="g4117"
+       transform="translate(-289.71429,-511.00011)">
+      <path
+         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M 85.5,97.5 A 7.4999798,7.4999798 0 0 0 78,105 7.4999798,7.4999798 0 0 0 85.5,112.5 7.4999798,7.4999798 0 0 0 93,105 7.4999798,7.4999798 0 0 0 85.5,97.5 Z m -2.5,4.22266 0.388672,0.38867 L 85.5,104.22266 87.611328,102.11133 88,101.72266 88.777344,102.5 88.388672,102.89062 86.277344,105 88.388672,107.11133 88.777344,107.5 88,108.2793 87.611328,107.89062 85.5,105.7793 83.388672,107.89062 83,108.2793 82.222656,107.5 82.611328,107.11133 84.722656,105 82.611328,102.89062 82.222656,102.5 83,101.72266 Z"
+         transform="translate(-76.500002,938.36224)"
+         id="path4119"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4121"
+         width="19"
+         height="19"
+         x="-0.5000006"
+         y="1033.8623" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/close_dash_prelight.png'
Binary files resources/close_dash_prelight.png	2012-03-14 06:24:18 +0000 and resources/close_dash_prelight.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/close_dash_prelight.svg'
--- resources/close_dash_prelight.svg	1970-01-01 00:00:00 +0000
+++ resources/close_dash_prelight.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_dash_prelight.svg">
+  <defs
+     id="defs4488">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4195"
+       x="-0.12"
+       width="1.24"
+       y="-0.12"
+       height="1.24">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.75"
+         id="feGaussianBlur4197" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       style="display:inline"
+       id="g4131"
+       transform="translate(-289.71429,-511.00011)">
+      <path
+         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M 85.5,97.5 A 7.4999798,7.4999798 0 0 0 78,105 7.4999798,7.4999798 0 0 0 85.5,112.5 7.4999798,7.4999798 0 0 0 93,105 7.4999798,7.4999798 0 0 0 85.5,97.5 Z m -2.5,4.22266 0.388672,0.38867 L 85.5,104.22266 87.611328,102.11133 88,101.72266 88.777344,102.5 88.388672,102.89062 86.277344,105 88.388672,107.11133 88.777344,107.5 88,108.2793 87.611328,107.89062 85.5,105.7793 83.388672,107.89062 83,108.2793 82.222656,107.5 82.611328,107.11133 84.722656,105 82.611328,102.89062 82.222656,102.5 83,101.72266 Z"
+         transform="translate(-76.500002,938.36224)"
+         id="path4133"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4135"
+         width="19"
+         height="19"
+         x="-0.5000006"
+         y="1033.8623" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4137"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,97.5 A 7.4999798,7.4999798 0 0 0 78,105 7.4999798,7.4999798 0 0 0 85.5,112.5 7.4999798,7.4999798 0 0 0 93,105 7.4999798,7.4999798 0 0 0 85.5,97.5 Z m -2.5,4.22266 0.388672,0.38867 L 85.5,104.22266 87.611328,102.11133 88,101.72266 88.777344,102.5 88.388672,102.89062 86.277344,105 88.388672,107.11133 88.777344,107.5 88,108.2793 87.611328,107.89062 85.5,105.7793 83.388672,107.89062 83,108.2793 82.222656,107.5 82.611328,107.11133 84.722656,105 82.611328,102.89062 82.222656,102.5 83,101.72266 Z"
+         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4195);enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/close_dash_pressed.png'
Binary files resources/close_dash_pressed.png	2012-03-14 06:24:18 +0000 and resources/close_dash_pressed.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/close_dash_pressed.svg'
--- resources/close_dash_pressed.svg	1970-01-01 00:00:00 +0000
+++ resources/close_dash_pressed.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="close_dash_pressed.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.71429,-511.00011)"
+       id="g4123"
+       style="opacity:0.6;display:inline">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4125"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,97.5 A 7.4999798,7.4999798 0 0 0 78,105 7.4999798,7.4999798 0 0 0 85.5,112.5 7.4999798,7.4999798 0 0 0 93,105 7.4999798,7.4999798 0 0 0 85.5,97.5 Z m -2.5,4.22266 0.388672,0.38867 L 85.5,104.22266 87.611328,102.11133 88,101.72266 88.777344,102.5 88.388672,102.89062 86.277344,105 88.388672,107.11133 88.777344,107.5 88,108.2793 87.611328,107.89062 85.5,105.7793 83.388672,107.89062 83,108.2793 82.222656,107.5 82.611328,107.11133 84.722656,105 82.611328,102.89062 82.222656,102.5 83,101.72266 Z"
+         style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="1033.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4127"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/maximize_dash.png'
Binary files resources/maximize_dash.png	2012-03-14 06:24:18 +0000 and resources/maximize_dash.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/maximize_dash.svg'
--- resources/maximize_dash.svg	1970-01-01 00:00:00 +0000
+++ resources/maximize_dash.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.71429,-492.00011)"
+       style="display:inline"
+       id="g4218">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4209"
+         d="m 8.999998,1016.8622 a 7.4999796,7.4999796 0 0 0 -7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,-7.5 7.4999796,7.4999796 0 0 0 -7.5,-7.5 z m -3.5,4 7,0 0,7 -7,0 0,-6.5 0,-0.5 z m 1,1 0,5 5,0 0,-5 -5,0 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4203"
+         width="19"
+         height="19"
+         x="-0.5000006"
+         y="1014.8623" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/maximize_dash_disabled.png'
Binary files resources/maximize_dash_disabled.png	2012-02-12 15:48:12 +0000 and resources/maximize_dash_disabled.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/maximize_dash_disabled.svg'
--- resources/maximize_dash_disabled.svg	1970-01-01 00:00:00 +0000
+++ resources/maximize_dash_disabled.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_disabled.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       style="opacity:0.25;display:inline"
+       transform="translate(-289.71429,-492.00011)"
+       id="g4240">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4242"
+         d="m 8.999998,1016.8622 a 7.4999796,7.4999796 0 0 0 -7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,-7.5 7.4999796,7.4999796 0 0 0 -7.5,-7.5 z m -3.5,4 7,0 0,7 -7,0 0,-6.5 0,-0.5 z m 1,1 0,5 5,0 0,-5 -5,0 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4244"
+         width="19"
+         height="19"
+         x="-0.5000006"
+         y="1014.8623" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/maximize_dash_prelight.png'
Binary files resources/maximize_dash_prelight.png	2012-03-14 06:24:18 +0000 and resources/maximize_dash_prelight.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/maximize_dash_prelight.svg'
--- resources/maximize_dash_prelight.svg	1970-01-01 00:00:00 +0000
+++ resources/maximize_dash_prelight.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_prelight.svg">
+  <defs
+     id="defs4488">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4230"
+       x="-0.12"
+       width="1.24"
+       y="-0.12"
+       height="1.24">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.75"
+         id="feGaussianBlur4232" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       style="display:inline"
+       id="g4222"
+       transform="translate(-289.71429,-492.00011)">
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.999998,1016.8622 a 7.4999796,7.4999796 0 0 0 -7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,-7.5 7.4999796,7.4999796 0 0 0 -7.5,-7.5 z m -3.5,4 7,0 0,7 -7,0 0,-6.5 0,-0.5 z m 1,1 0,5 5,0 0,-5 -5,0 z"
+         id="path4224"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="1014.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4226"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4228"
+         d="m 8.999998,1016.8622 a 7.4999796,7.4999796 0 0 0 -7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,-7.5 7.4999796,7.4999796 0 0 0 -7.5,-7.5 z m -3.5,4 7,0 0,7 -7,0 0,-6.5 0,-0.5 z m 1,1 0,5 5,0 0,-5 -5,0 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4230);enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/maximize_dash_pressed.png'
Binary files resources/maximize_dash_pressed.png	2012-03-14 06:24:18 +0000 and resources/maximize_dash_pressed.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/maximize_dash_pressed.svg'
--- resources/maximize_dash_pressed.svg	1970-01-01 00:00:00 +0000
+++ resources/maximize_dash_pressed.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="maximize_dash_pressed.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       id="g4234"
+       transform="translate(-289.71429,-492.00011)"
+       style="opacity:0.5;display:inline">
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.999998,1016.8622 a 7.4999796,7.4999796 0 0 0 -7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,7.5 7.4999796,7.4999796 0 0 0 7.5,-7.5 7.4999796,7.4999796 0 0 0 -7.5,-7.5 z m -3.5,4 7,0 0,7 -7,0 0,-6.5 0,-0.5 z m 1,1 0,5 5,0 0,-5 -5,0 z"
+         id="path4236"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="1014.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4238"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/minimize_dash.png'
Binary files resources/minimize_dash.png	2012-03-14 06:24:18 +0000 and resources/minimize_dash.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/minimize_dash.svg'
--- resources/minimize_dash.svg	1970-01-01 00:00:00 +0000
+++ resources/minimize_dash.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_dash.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.71429,-473.00011)"
+       id="g4261"
+       style="opacity:0.5;display:inline">
+      <path
+         id="path4256"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,59.5 A 7.4999794,7.4999794 0 0 0 78,67 7.4999794,7.4999794 0 0 0 85.5,74.5 7.4999794,7.4999794 0 0 0 93,67 7.4999794,7.4999794 0 0 0 85.5,59.5 Z m -3.5,7 7,0 0,1 -7,0 0,-1 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="995.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4250"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/minimize_dash_disabled.png'
Binary files resources/minimize_dash_disabled.png	2012-02-12 15:48:12 +0000 and resources/minimize_dash_disabled.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/minimize_dash_disabled.svg'
--- resources/minimize_dash_disabled.svg	1970-01-01 00:00:00 +0000
+++ resources/minimize_dash_disabled.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_dash_disabled.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.71429,-473.00011)"
+       id="g4261"
+       style="opacity:0.25;display:inline">
+      <path
+         id="path4256"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,59.5 A 7.4999794,7.4999794 0 0 0 78,67 7.4999794,7.4999794 0 0 0 85.5,74.5 7.4999794,7.4999794 0 0 0 93,67 7.4999794,7.4999794 0 0 0 85.5,59.5 Z m -3.5,7 7,0 0,1 -7,0 0,-1 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="995.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4250"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/minimize_dash_prelight.png'
Binary files resources/minimize_dash_prelight.png	2012-03-14 06:24:18 +0000 and resources/minimize_dash_prelight.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/minimize_dash_prelight.svg'
--- resources/minimize_dash_prelight.svg	1970-01-01 00:00:00 +0000
+++ resources/minimize_dash_prelight.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_dash_prelight.svg">
+  <defs
+     id="defs4488">
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4411"
+       x="-0.12"
+       width="1.24"
+       y="-0.12"
+       height="1.24">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.75"
+         id="feGaussianBlur4413" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       style="display:inline"
+       id="g4265"
+       transform="translate(-289.71429,-473.00011)">
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="M 85.5,59.5 A 7.4999794,7.4999794 0 0 0 78,67 7.4999794,7.4999794 0 0 0 85.5,74.5 7.4999794,7.4999794 0 0 0 93,67 7.4999794,7.4999794 0 0 0 85.5,59.5 Z m -3.5,7 7,0 0,1 -7,0 0,-1 z"
+         transform="translate(-76.500002,938.36224)"
+         id="path4267"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4269"
+         width="19"
+         height="19"
+         x="-0.5000006"
+         y="995.8623" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4409"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,59.5 A 7.4999794,7.4999794 0 0 0 78,67 7.4999794,7.4999794 0 0 0 85.5,74.5 7.4999794,7.4999794 0 0 0 93,67 7.4999794,7.4999794 0 0 0 85.5,59.5 Z m -3.5,7 7,0 0,1 -7,0 0,-1 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4411);enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/minimize_dash_pressed.png'
Binary files resources/minimize_dash_pressed.png	2012-03-14 06:24:18 +0000 and resources/minimize_dash_pressed.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/minimize_dash_pressed.svg'
--- resources/minimize_dash_pressed.svg	1970-01-01 00:00:00 +0000
+++ resources/minimize_dash_pressed.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19"
+   height="19"
+   id="svg4486"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 19 19"
+   sodipodi:docname="minimize_dash_pressed.svg">
+  <defs
+     id="defs4488" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9580786"
+     inkscape:cx="-7.3730107"
+     inkscape:cy="9.9678584"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(290.21429,-522.86219)">
+    <g
+       transform="translate(-289.71429,-473.00011)"
+       id="g4261"
+       style="opacity:0.5;display:inline">
+      <path
+         id="path4256"
+         transform="translate(-76.500002,938.36224)"
+         d="M 85.5,59.5 A 7.4999794,7.4999794 0 0 0 78,67 7.4999794,7.4999794 0 0 0 85.5,74.5 7.4999794,7.4999794 0 0 0 93,67 7.4999794,7.4999794 0 0 0 85.5,59.5 Z m -3.5,7 7,0 0,1 -7,0 0,-1 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="995.8623"
+         x="-0.5000006"
+         height="19"
+         width="19"
+         id="rect4250"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>

=== removed file 'resources/progress_bar_fill.png'
Binary files resources/progress_bar_fill.png	2010-12-15 19:21:14 +0000 and resources/progress_bar_fill.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/progress_bar_fill.svg'
--- resources/progress_bar_fill.svg	1970-01-01 00:00:00 +0000
+++ resources/progress_bar_fill.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="42"
+   height="4"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/home/marco/Dev/unity/trunk/resources/progress_bar_trough_150.png"
+   inkscape:export-xdpi="250"
+   inkscape:export-ydpi="250"
+   sodipodi:docname="progress_bar_trough.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Torso"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Torso"
+       style="overflow:visible">
+      <g
+         id="g4192"
+         transform="scale(0.7,0.7)">
+        <path
+           id="path4194"
+           d="m -4.7792281,-3.239542 c 2.350374,0.3659393 5.30026732,1.9375477 5.03715532,3.62748546 C -0.00518779,2.0778819 -2.2126741,2.6176539 -4.5630471,2.2517169 -6.9134221,1.8857769 -8.521035,0.75201414 -8.257922,-0.93792336 -7.994809,-2.6278615 -7.1296041,-3.6054813 -4.7792281,-3.239542 z"
+           style="fill:none;stroke:#000000;stroke-width:1.25"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4196"
+           d="M 4.4598789,0.08866574 C -2.5564571,-4.378332 5.2248769,-3.9061806 -0.84829578,-8.7197331"
+           style="fill:none;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4198"
+           d="M 4.9298719,0.05752074 C -1.3872731,1.7494689 1.8027579,5.4782079 -4.9448731,7.5462725"
+           style="fill:none;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <rect
+           id="rect4200"
+           transform="matrix(0.527536,-0.849533,0.887668,0.460484,0,0)"
+           y="-1.7408575"
+           x="-10.391706"
+           height="2.7608147"
+           width="2.6366582"
+           style="fill-rule:evenodd;stroke-width:1pt" />
+        <rect
+           id="rect4202"
+           transform="matrix(0.671205,-0.741272,0.790802,0.612072,0,0)"
+           y="-7.9629307"
+           x="4.9587269"
+           height="2.8614161"
+           width="2.7327356"
+           style="fill-rule:evenodd;stroke-width:1pt" />
+        <path
+           id="path4204"
+           transform="matrix(0,-1.109517,1.109517,0,25.96648,19.71619)"
+           d="m 16.779951,-28.685045 a 0.60731727,0.60731727 0 1 0 -1.214634,0 0.60731727,0.60731727 0 1 0 1.214634,0 z"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4206"
+           transform="matrix(0,-1.109517,1.109517,0,26.8245,16.99126)"
+           d="m 16.779951,-28.685045 a 0.60731727,0.60731727 0 1 0 -1.214634,0 0.60731727,0.60731727 0 1 0 1.214634,0 z"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3980"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#12f82b"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="47.76404"
+     inkscape:cy="27.178915"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1450"
+     inkscape:window-height="793"
+     inkscape:window-x="551"
+     inkscape:window-y="125"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Livello"
+     style="display:inline"
+     transform="translate(0,-1048.3622)">
+    <rect
+       style="fill:#bdbdbd;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       id="rect5033"
+       width="42"
+       height="4"
+       x="0"
+       y="1048.3622"
+       ry="1.4394673"
+       inkscape:export-filename="/tmp/progress.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

=== removed file 'resources/progress_bar_trough.png'
Binary files resources/progress_bar_trough.png	2010-12-15 19:21:14 +0000 and resources/progress_bar_trough.png	1970-01-01 00:00:00 +0000 differ
=== added file 'resources/progress_bar_trough.svg'
--- resources/progress_bar_trough.svg	1970-01-01 00:00:00 +0000
+++ resources/progress_bar_trough.svg	2014-03-03 11:01:22 +0000
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="54"
+   height="54"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   inkscape:export-filename="/home/marco/Dev/unity/trunk/resources/progress_bar_trough_150.png"
+   inkscape:export-xdpi="250"
+   inkscape:export-ydpi="250"
+   sodipodi:docname="progress_bar_trough.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Torso"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Torso"
+       style="overflow:visible">
+      <g
+         id="g4192"
+         transform="scale(0.7,0.7)">
+        <path
+           id="path4194"
+           d="m -4.7792281,-3.239542 c 2.350374,0.3659393 5.30026732,1.9375477 5.03715532,3.62748546 C -0.00518779,2.0778819 -2.2126741,2.6176539 -4.5630471,2.2517169 -6.9134221,1.8857769 -8.521035,0.75201414 -8.257922,-0.93792336 -7.994809,-2.6278615 -7.1296041,-3.6054813 -4.7792281,-3.239542 z"
+           style="fill:none;stroke:#000000;stroke-width:1.25"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4196"
+           d="M 4.4598789,0.08866574 C -2.5564571,-4.378332 5.2248769,-3.9061806 -0.84829578,-8.7197331"
+           style="fill:none;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4198"
+           d="M 4.9298719,0.05752074 C -1.3872731,1.7494689 1.8027579,5.4782079 -4.9448731,7.5462725"
+           style="fill:none;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <rect
+           id="rect4200"
+           transform="matrix(0.527536,-0.849533,0.887668,0.460484,0,0)"
+           y="-1.7408575"
+           x="-10.391706"
+           height="2.7608147"
+           width="2.6366582"
+           style="fill-rule:evenodd;stroke-width:1pt" />
+        <rect
+           id="rect4202"
+           transform="matrix(0.671205,-0.741272,0.790802,0.612072,0,0)"
+           y="-7.9629307"
+           x="4.9587269"
+           height="2.8614161"
+           width="2.7327356"
+           style="fill-rule:evenodd;stroke-width:1pt" />
+        <path
+           id="path4204"
+           transform="matrix(0,-1.109517,1.109517,0,25.96648,19.71619)"
+           d="m 16.779951,-28.685045 a 0.60731727,0.60731727 0 1 0 -1.214634,0 0.60731727,0.60731727 0 1 0 1.214634,0 z"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4206"
+           transform="matrix(0,-1.109517,1.109517,0,26.8245,16.99126)"
+           d="m 16.779951,-28.685045 a 0.60731727,0.60731727 0 1 0 -1.214634,0 0.60731727,0.60731727 0 1 0 1.214634,0 z"
+           style="fill:#ff0000;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3980"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <filter
+       inkscape:collect="always"
+       id="filter6680"