Merge lp:~brandontschaefer/unity/panel-height-dynamic-dpi-over-decorations-branch into lp:unity

[Brandon Schaefer]

Remove the nux::Property panel_height; Replace it with a function.

Now PanelStyle holds up to monitors::MAX panel_height. Now to get the panel height for the monitor you just use PanelHeight(int monitor).

Added a signal panel_height_changed() that will emit the new panel height, and the monitor that was changed. Its not currently used.

Remove the nux::Property panel_height; Replace it with a function.

Now PanelStyle holds up to monitors::MAX panel_height. Now to get the panel height for the monitor you just use PanelHeight(int monitor).

Added a signal panel_height_changed() that will emit the new panel height, and the monitor that was changed. Its not currently used, but when we get the back end for specific monitor DPI changes, this signal will be useful when dynamically updating the panel height else where. (Such as the panel it self and launcher).

** NOTE **
Not all the PanelHeights() take into account the monitor. Things will need to be refactored to get the correct monitor. For now, I did all the easy ones I found and will go back and slowly get them all into place. Some will not be easy.

Taken from these 2 branches:
https://code.launchpad.net/~brandontschaefer/unity/multimonitor-dpi-panel-height
https://code.launchpad.net/~brandontschaefer/unity/panel-height-dynamic-resize

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3903
http://jenkins.qa.ubuntu.com/job/unity-ci/570/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/104

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3904
http://jenkins.qa.ubuntu.com/job/unity-ci/571/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/105

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3905
http://jenkins.qa.ubuntu.com/job/unity-ci/572/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/106

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3907
http://jenkins.qa.ubuntu.com/job/unity-ci/613/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/147

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3908
http://jenkins.qa.ubuntu.com/job/unity-ci/616/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/150

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3909
http://jenkins.qa.ubuntu.com/job/unity-ci/639/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/175/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/173/console

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

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

Nice job! Just a small suggestion: in some files where you need the height or other sizes too many times you could use a variable to store it to avoid too many calls for the same value in one file (for example you could store panel_style.PanelHeight()). Apart from that it looks good! +1 :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3910
http://jenkins.qa.ubuntu.com/job/unity-ci/642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/178/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/176/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3911
http://jenkins.qa.ubuntu.com/job/unity-ci/645/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/179/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3912
http://jenkins.qa.ubuntu.com/job/unity-ci/651/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/185

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3913
http://jenkins.qa.ubuntu.com/job/unity-ci/656/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/192
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/190

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3914
http://jenkins.qa.ubuntu.com/job/unity-ci/661/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/195

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

review: Approve (continuous-integration)

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

813 + WindowManager& wm = WindowManager::Default();

It doesn't change much, but why defining it at this level, instead that when you actually use it?

206 + panels_[i]->SetMaximumHeight(panel::Style::Instance().PanelHeight(i));
230 + panel_ptr->SetMaximumHeight(height);

This won't probably happen since the children of the panel will request to be bigger, but why not setting the MinimumWidth as well to the same value?
In this way we ensure it will scale both up and down.

Anyuway the first call is quite useless since the same it will done inside PanelView::SetMonitor anyway, so I'd just fix that instead that redoing the same in PanelController.

As for PanelIndicatorEntryView we might have just used new cairo features instead of dealing with the EMConverter (to it would make changes much smaller), but it arrived late for us. :(

610 + unity::Settings::Instance().dpi_changed.connect([this] {

Get rid of this lambda from PanelMenuView and PanelTray at least... Or you use a connection::Wrapper/Manager to handle it or you should use sigc::mem_fun in order to make sure we disconnect from it when the views gets removed (otherwise we'd get a crash if you change the setting after removing a monitor)

Anyway consider the case where you can just do this once in PanelView (or even in PanelController) applying then this down to its children.

WindowButtons: see if you can share the same cv_ instead of passing down the same monitor for every children (probably something to be done in other places as well), but we leave it for the next steps.

805 + int panel_height = panel_style_.PanelHeight();
806 auto const& texture = panel_style_.GetBackground()->GetDeviceTexture();
807 graphics_engine->QRP_GLSL_1Tex(0, 0, screen->width(), panel_height, texture, texxform, nux::color::White);

In theory here you only to paint each time for every outputdevice, with different size. But if you can't fix it now, please tag it with a FIXME for later (not that I like it, but at least we can track it :P).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3915
http://jenkins.qa.ubuntu.com/job/unity-ci/664/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/196
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/198

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3917
http://jenkins.qa.ubuntu.com/job/unity-ci/667/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/201/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3918
http://jenkins.qa.ubuntu.com/job/unity-ci/670/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/204

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3920
http://jenkins.qa.ubuntu.com/job/unity-ci/675/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/211/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/209/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3922
http://jenkins.qa.ubuntu.com/job/unity-ci/676/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/212
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/208/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/210

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3923
http://jenkins.qa.ubuntu.com/job/unity-ci/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/216

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

review: Approve (continuous-integration)

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-11-21 19:38:45 +0000
+++ dash/DashController.cpp	2014-02-19 01:47:39 +0000
@@ -250,7 +250,7 @@
   view_->Relayout();
   window_->SetGeometry(geo);
   panel::Style &panel_style = panel::Style::Instance();
-  view_->SetMonitorOffset(launcher_width, panel_style.panel_height);
+  view_->SetMonitorOffset(launcher_width, panel_style.PanelHeight(monitor_));
 }
 
 void Controller::OnMouseDownOutsideWindow(int x, int y,
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2014-02-10 15:31:44 +0000
+++ dash/DashView.cpp	2014-02-19 01:47:39 +0000
@@ -519,12 +519,13 @@
 {
   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_style.panel_height, panel_style.panel_height), 0);
+  layout_->AddLayout(new nux::SpaceLayout(0, 0, panel_height, panel_height), 0);
 
   content_layout_ = new DashLayout(NUX_TRACKER_LOCATION);
   content_layout_->SetTopAndBottomPadding(style.GetDashViewTopPadding(), 0);
@@ -611,6 +612,7 @@
 {
   dash::Style& style = dash::Style::Instance();
   panel::Style &panel_style = panel::Style::Instance();
+  int panel_height = panel_style.PanelHeight();
 
   int width = 0, height = 0;
   int tile_width = style.GetTileWidth();
@@ -635,14 +637,14 @@
 
   // width/height shouldn't be bigger than the geo available.
   width = std::min(width, for_geo.width); // launcher width is taken into account in for_geo.
-  height = std::min(height, for_geo.height - panel_style.panel_height); // panel height is not taken into account in for_geo.
+  height = std::min(height, for_geo.height - panel_height); // panel height is not taken into account in for_geo.
 
   if (style.always_maximised)
   {
     width = std::max(0, for_geo.width);
-    height = std::max(0, for_geo.height - panel_style.panel_height);
+    height = std::max(0, for_geo.height - panel_height);
   }
-  return nux::Geometry(0, panel_style.panel_height, width, height);
+  return nux::Geometry(0, panel_height, width, height);
 }
 
 void DashView::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
@@ -650,9 +652,10 @@
   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_style.panel_height;
-  renderer_geo.height += panel_style.panel_height;
+  renderer_geo.y += panel_height;
+  renderer_geo.height += panel_height;
 
   renderer_.DrawFull(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo, false);
 }
@@ -660,14 +663,15 @@
 void DashView::DrawContent(nux::GraphicsEngine& graphics_engine, bool force_draw)
 {
   panel::Style& panel_style = panel::Style::Instance();
+  int panel_height = panel_style.PanelHeight();
 
   nux::Geometry renderer_geo_abs(GetAbsoluteGeometry());
-  renderer_geo_abs.y += panel_style.panel_height;
-  renderer_geo_abs.height -= panel_style.panel_height;
+  renderer_geo_abs.y += panel_height;
+  renderer_geo_abs.height -= panel_height;
 
   nux::Geometry renderer_geo(GetGeometry());
-  renderer_geo.y += panel_style.panel_height;
-  renderer_geo.height += panel_style.panel_height;
+  renderer_geo.y += panel_height;
+  renderer_geo.height += panel_height;
 
   renderer_.DrawInner(graphics_engine, content_geo_, renderer_geo_abs, renderer_geo);
 
@@ -1689,10 +1693,11 @@
 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_style.panel_height;
-  renderer_geo_abs.height -= panel_style.panel_height;
+  renderer_geo_abs.y += panel_height;
+  renderer_geo_abs.height -= panel_height;
   return renderer_geo_abs;
 }
 
 
=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2014-02-05 15:49:03 +0000
+++ hud/HudController.cpp	2014-02-19 01:47:39 +0000
@@ -231,13 +231,15 @@
   int ideal_monitor = GetIdealMonitor();
   auto monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(ideal_monitor);
 
+  panel::Style &panel_style = panel::Style::Instance();
+  int panel_height = panel_style.PanelHeight(ideal_monitor);
+
   // We want to cover as much of the screen as possible to grab any mouse events
   // outside of our window
-  panel::Style &panel_style = panel::Style::Instance();
   nux::Geometry geo(monitor_geo.x,
-                    monitor_geo.y + panel_style.panel_height,
+                    monitor_geo.y + panel_height,
                     monitor_geo.width,
-                    monitor_geo.height - panel_style.panel_height);
+                    monitor_geo.height - panel_height);
 
   if (IsLockedToLauncher(ideal_monitor))
   {
@@ -261,7 +263,7 @@
   view_->QueueDraw();
   window_->SetGeometry(geo);
   panel::Style &panel_style = panel::Style::Instance();
-  view_->SetMonitorOffset(launcher_width, panel_style.panel_height);
+  view_->SetMonitorOffset(launcher_width, panel_style.PanelHeight(monitor_index_));
 }
 
 void Controller::OnMouseDownOutsideWindow(int x, int y,
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-02-15 14:36:33 +0000
+++ launcher/Launcher.cpp	2014-02-19 01:47:39 +0000
@@ -1183,8 +1183,10 @@
   UScreen* uscreen = UScreen::GetDefault();
   auto monitor_geo = uscreen->GetMonitorGeometry(new_monitor);
   unity::panel::Style &panel_style = panel::Style::Instance();
-  Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_style.panel_height),
-         monitor_geo.height - panel_style.panel_height);
+  int panel_height = panel_style.PanelHeight(new_monitor);
+
+  Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_height),
+         monitor_geo.height - panel_height);
   icon_renderer_->monitor = new_monitor;
 }
 
@@ -1748,7 +1750,7 @@
       texxform.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
       texxform.SetWrap(nux::TEXWRAP_CLAMP, nux::TEXWRAP_CLAMP);
       texxform.uoffset = (1.0f / launcher_sheen_->GetWidth()); // TODO (gord) don't use absolute values here
-      texxform.voffset = (1.0f / launcher_sheen_->GetHeight()) * panel::Style::Instance().panel_height;
+      texxform.voffset = (1.0f / launcher_sheen_->GetHeight()) * panel::Style::Instance().PanelHeight(icon_renderer_->monitor);
       GfxContext.QRP_1Tex(base.x, base.y, base.width, base.height,
                           launcher_sheen_->GetDeviceTexture(),
                           texxform,
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2014-01-31 16:19:39 +0000
+++ launcher/LauncherController.cpp	2014-02-19 01:47:39 +0000
@@ -43,6 +43,8 @@
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/TimeUtil.h"
+#include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -169,6 +171,21 @@
     }
   });
 
+  unity::Settings::Instance().dpi_changed.connect([this] {
+    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);
+      }
+    }
+  });
+
   parent_->AddChild(model_.get());
 
   xdnd_manager_->dnd_started.connect(sigc::mem_fun(this, &Impl::OnDndStarted));
 
=== modified file 'panel/PanelController.cpp'
--- panel/PanelController.cpp	2014-02-12 07:45:21 +0000
+++ panel/PanelController.cpp	2014-02-19 01:47:39 +0000
@@ -26,7 +26,6 @@
 
 #include "unity-shared/UScreen.h"
 #include "PanelView.h"
-#include "unity-shared/PanelStyle.h"
 
 namespace unity
 {
@@ -190,7 +189,6 @@
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
   PanelView* view = new PanelView(panel_window, indicators_);
-  view->SetMaximumHeight(panel::Style::Instance().panel_height);
   view->SetOpacity(opacity_);
   view->SetOpacityMaximizedToggle(opacity_maximized_toggle_);
 
@@ -236,6 +234,8 @@
   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,6 +245,19 @@
 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);
 
=== modified file 'panel/PanelController.h'
--- panel/PanelController.h	2014-02-12 07:45:21 +0000
+++ panel/PanelController.h	2014-02-19 01:47:39 +0000
@@ -62,6 +62,7 @@
 
 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-16 19:44:54 +0000
+++ panel/PanelIndicatorEntryDropdownView.cpp	2014-02-19 01:47:39 +0000
@@ -125,7 +125,7 @@
     entries.push_back(entry->GetEntry());
 
   auto const& geo = GetAbsoluteGeometry();
-  indicators_->ShowEntriesDropdown(entries, active_entry_, 0, geo.x, geo.y + Style::Instance().panel_height);
+  indicators_->ShowEntriesDropdown(entries, active_entry_, 0, geo.x, geo.y + Style::Instance().PanelHeight(monitor_));
 }
 
 bool PanelIndicatorEntryDropdownView::ActivateChild(PanelIndicatorEntryView::Ptr const& child)
 
=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-02-16 19:44:54 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-02-19 01:47:39 +0000
@@ -30,13 +30,16 @@
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/WindowManager.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
 
 namespace
 {
-const int DEFAULT_SPACING = 3;
+const RawPixel DEFAULT_SPACING = 3_em;
+
+const int SCALED_IMAGE_Y = 1;
 }
 
 using namespace indicator;
@@ -49,6 +52,7 @@
   , spacing_(DEFAULT_SPACING)
   , left_padding_(padding < 0 ? 0 : padding)
   , right_padding_(left_padding_)
+  , monitor_(0)
   , type_(type)
   , entry_texture_(nullptr)
   , opacity_(1.0f)
@@ -56,6 +60,7 @@
   , overlay_showing_(false)
   , disabled_(false)
   , focused_(true)
+  , cv_(unity::Settings::Instance().em(monitor_))
 {
   proxy_->active_changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::OnActiveChanged));
   proxy_->updated.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::Refresh));
@@ -70,6 +75,7 @@
   }
 
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::Refresh));
+  unity::Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &PanelIndicatorEntryView::Refresh));
 
   Refresh();
 }
@@ -104,14 +110,13 @@
     });
 
     wm.TerminateExpo();
-    return;
   }
 
   if (wm.IsScaleActive())
     wm.TerminateScale();
 
   auto const& abs_geo = GetAbsoluteGeometry();
-  proxy_->ShowMenu(abs_geo.x, abs_geo.y + panel::Style::Instance().panel_height, button);
+  proxy_->ShowMenu(abs_geo.x, abs_geo.y + panel::Style::Instance().PanelHeight(monitor_), button);
 }
 
 void PanelIndicatorEntryView::OnMouseDown(int x, int y, long button_flags, long key_flags)
@@ -195,7 +200,7 @@
   glib::Object<GdkPixbuf> pixbuf;
   GtkIconTheme* theme = gtk_icon_theme_get_default();
   int image_type = proxy_->image_type();
-  int size = (type_ != DROP_DOWN) ? 24 : 16;
+  RawPixel size = (type_ != DROP_DOWN) ? 24_em : 16_em;
 
   if (image_type == GTK_IMAGE_PIXBUF)
   {
@@ -214,14 +219,14 @@
   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,
+    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,
+    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);
@@ -230,6 +235,33 @@
   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();
@@ -254,9 +286,22 @@
   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_;
+  int x = left_padding_.CP(cv_);
 
   if (IsActive())
     DrawEntryPrelight(cr, width, height);
@@ -264,7 +309,7 @@
   if (pixbuf && IsIconVisible())
   {
     GtkStyleContext* style_context = panel::Style::Instance().GetStyleContext();
-    unsigned int icon_width = gdk_pixbuf_get_width(pixbuf);
+    unsigned int icon_width = PixbufWidth(pixbuf);
 
     gtk_style_context_save(style_context);
 
@@ -286,7 +331,8 @@
       gtk_style_context_set_state(style_context, GTK_STATE_FLAG_PRELIGHT);
     }
 
-    int y = (int)((height - gdk_pixbuf_get_height(pixbuf)) / 2);
+    int y = (int)((height - PixbufHeight(pixbuf)) / 2);
+
     if (overlay_showing_ && !IsActive())
     {
       /* Most of the images we get are straight pixbufs (annoyingly), so when
@@ -295,6 +341,7 @@
        * icon themes/icons.
        */
       cairo_save(cr);
+      ScaleImageIcons(cr, &x, &y);
 
       cairo_push_group(cr);
       gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
@@ -311,17 +358,22 @@
     }
     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_;
+    x += icon_width + spacing_.CP(cv_);
   }
 
   if (layout)
@@ -399,12 +451,12 @@
 
   unsigned int width = 0;
   unsigned int icon_width = 0;
-  unsigned int height = panel::Style::Instance().panel_height;
+  unsigned int height = panel::Style::Instance().PanelHeight(monitor_);
 
   // First lets figure out our size
   if (pixbuf && IsIconVisible())
   {
-    width = gdk_pixbuf_get_width(pixbuf);
+    width = PixbufWidth(pixbuf);
     icon_width = width;
   }
 
@@ -457,14 +509,14 @@
     unsigned int text_width = log_rect.width / PANGO_SCALE;
 
     if (icon_width)
-      width += spacing_;
+      width += spacing_.CP(cv_);
     width += text_width;
 
     pango_font_description_free(desc);
   }
 
   if (width)
-    width += left_padding_ + right_padding_;
+    width += left_padding_.CP(cv_) + right_padding_.CP(cv_);
 
   SetMinimumWidth(width);
   SetMaximumWidth(width);
@@ -529,6 +581,13 @@
   Refresh();
 }
 
+void PanelIndicatorEntryView::SetMonitor(int monitor)
+{
+  monitor_ = monitor;
+
+  cv_ = unity::Settings::Instance().em(monitor);
+}
+
 void PanelIndicatorEntryView::SetOpacity(double opacity)
 {
   opacity = CLAMP(opacity, 0.0f, 1.0f);
 
=== modified file 'panel/PanelIndicatorEntryView.h'
--- panel/PanelIndicatorEntryView.h	2014-02-05 10:36:28 +0000
+++ panel/PanelIndicatorEntryView.h	2014-02-19 01:47:39 +0000
@@ -32,7 +32,9 @@
 
 #include <gtk/gtk.h>
 
+#include "unity-shared/EMConverter.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/RawPixel.h"
 
 
 namespace unity
@@ -90,6 +92,8 @@
   void OverlayShown();
   void OverlayHidden();
 
+  virtual void SetMonitor(int monitor);
+
   sigc::signal<void, PanelIndicatorEntryView*, bool> active_changed;
   sigc::signal<void, PanelIndicatorEntryView*> refreshed;
 
@@ -108,9 +112,11 @@
   virtual void ShowMenu(int button = 1);
 
   indicator::Entry::Ptr proxy_;
-  unsigned int spacing_;
-  unsigned int left_padding_;
-  unsigned int right_padding_;
+  RawPixel spacing_;
+  RawPixel left_padding_;
+  RawPixel right_padding_;
+
+  int monitor_;
 
 private:
   void OnMouseDown(int x, int y, long button_flags, long key_flags);
@@ -118,6 +124,11 @@
   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();
 
   IndicatorEntryType type_;
@@ -128,6 +139,8 @@
   bool overlay_showing_;
   bool disabled_;
   bool focused_;
+
+  EMConverter::Ptr cv_;
 };
 
 }
 
=== modified file 'panel/PanelIndicatorsView.cpp'
--- panel/PanelIndicatorsView.cpp	2014-02-06 22:12:59 +0000
+++ panel/PanelIndicatorsView.cpp	2014-02-19 01:47:39 +0000
@@ -41,6 +41,7 @@
 : View(NUX_TRACKER_LOCATION)
 , opacity(1.0f, sigc::mem_fun(this, &PanelIndicatorsView::SetOpacity))
 , layout_(new nux::HLayout("", NUX_TRACKER_LOCATION))
+, monitor_(0)
 {
   opacity.DisableNotifications();
   layout_->SetContentDistribution(nux::MAJOR_POSITION_END);
@@ -265,23 +266,27 @@
   if (!view)
     return;
 
+  auto const& entry_id = view->GetEntryID();
   int entry_pos = pos;
-  auto const& entry_id = view->GetEntryID();
+  bool known_entry = (entries_.find(entry_id) != entries_.end());
   view->SetOpacity(opacity());
 
-  if (entry_pos == IndicatorEntryPosition::AUTO)
+  if (!known_entry && dropdown_ && !dropdown_->Empty())
   {
-    entry_pos = nux::NUX_LAYOUT_BEGIN;
-
-    if (view->GetEntryPriority() > -1)
+    if (entry_pos == IndicatorEntryPosition::AUTO)
     {
-      for (auto area : layout_->GetChildren())
+      entry_pos = nux::NUX_LAYOUT_BEGIN;
+
+      if (view->GetEntryPriority() > -1)
       {
-        auto en = static_cast<PanelIndicatorEntryView*>(area);
-        if (view->GetEntryPriority() <= en->GetEntryPriority())
-          break;
+        for (auto area : layout_->GetChildren())
+        {
+          auto en = static_cast<PanelIndicatorEntryView*>(area);
+          if (view->GetEntryPriority() <= en->GetEntryPriority())
+            break;
 
-        ++entry_pos;
+          ++entry_pos;
+        }
       }
     }
   }
@@ -292,7 +297,7 @@
   QueueRelayout();
   QueueDraw();
 
-  if (entries_.find(entry_id) == entries_.end())
+  if (!known_entry)
   {
     view->refreshed.connect(sigc::mem_fun(this, &PanelIndicatorsView::OnEntryRefreshed));
     entries_.insert({entry_id, view});
@@ -306,6 +311,8 @@
   auto view = new PanelIndicatorEntryView(entry, padding, type);
   AddEntryView(view, pos);
 
+  view->SetMonitor(monitor_);
+
   return view;
 }
 
@@ -357,6 +364,11 @@
     entry.second->OverlayHidden();
 }
 
+void PanelIndicatorsView::SetMonitor(int monitor)
+{
+  monitor_ = monitor;
+}
+
 bool PanelIndicatorsView::SetOpacity(double& target, double const& new_value)
 {
   double opacity = CLAMP(new_value, 0.0f, 1.0f);
 
=== modified file 'panel/PanelIndicatorsView.h'
--- panel/PanelIndicatorsView.h	2014-02-06 22:12:59 +0000
+++ panel/PanelIndicatorsView.h	2014-02-19 01:47:39 +0000
@@ -69,6 +69,8 @@
 
   void EnableDropdownMenu(bool, indicator::Indicators::Ptr const& i = nullptr);
 
+  virtual void SetMonitor(int monitor);
+
   nux::Property<double> opacity;
 
   sigc::signal<void> on_indicator_updated;
@@ -95,6 +97,8 @@
   typedef std::map<std::string, PanelIndicatorEntryView*> Entries;
   Entries entries_;
 
+  int monitor_;
+
 private:
   bool SetOpacity(double& target, double const& new_value);
 
 
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-02-15 18:10:14 +0000
+++ panel/PanelMenuView.cpp	2014-02-19 01:47:39 +0000
@@ -68,7 +68,6 @@
   , show_now_activated_(false)
   , we_control_active_(false)
   , new_app_menu_shown_(false)
-  , monitor_(0)
   , active_xid_(0)
   , desktop_name_(_("Ubuntu Desktop"))
 {
@@ -83,13 +82,7 @@
   SetupWindowManagerSignals();
   SetupUBusManagerInterests();
 
-  style_changed_connection_ = panel::Style::Instance().changed.connect([this] {
-    window_buttons_->ComputeContentSize();
-    layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
-
-    Refresh(true);
-    FullRedraw();
-  });
+  style_changed_connection_ = panel::Style::Instance().changed.connect(sigc::mem_fun(this, &PanelMenuView::OnDPIChanged));
 
   opacity = 0.0f;
 
@@ -103,6 +96,19 @@
   titlebar_grab_area_->UnParentObject();
 }
 
+void PanelMenuView::OnDPIChanged()
+{
+  int height = panel::Style::Instance().PanelHeight(monitor_);
+  window_buttons_->SetMaximumHeight(height);
+  window_buttons_->UpdateDPIChanged();
+
+  window_buttons_->ComputeContentSize();
+  layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
+
+  Refresh(true);
+  FullRedraw();
+}
+
 void PanelMenuView::SetupPanelMenuViewSignals()
 {
   active_win_changed_signal_.Connect(matcher_, "active-window-changed",
@@ -129,7 +135,7 @@
   window_buttons_->controlled_window = active_xid_;
   window_buttons_->opacity = 0.0f;
   window_buttons_->SetLeftAndRightPadding(MAIN_LEFT_PADDING, MENUBAR_PADDING);
-  window_buttons_->SetMaximumHeight(panel::Style::Instance().panel_height);
+  window_buttons_->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor_));
   window_buttons_->ComputeContentSize();
 
   window_buttons_->mouse_enter.connect(sigc::mem_fun(this, &PanelMenuView::OnPanelViewMouseEnter));
@@ -145,7 +151,7 @@
 {
   layout_->SetContentDistribution(nux::MAJOR_POSITION_START);
   layout_->SetLeftAndRightPadding(window_buttons_->GetContentWidth(), 0);
-  layout_->SetBaseHeight(panel::Style::Instance().panel_height);
+  layout_->SetBaseHeight(panel::Style::Instance().PanelHeight(monitor_));
 }
 
 void PanelMenuView::SetupTitlebarGrabArea()
 
=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-02-15 18:10:14 +0000
+++ panel/PanelMenuView.h	2014-02-19 01:47:39 +0000
@@ -45,7 +45,7 @@
   ~PanelMenuView();
 
   void SetMousePosition(int x, int y);
-  void SetMonitor(int monitor);
+  void SetMonitor(int monitor) override;
 
   Window GetTopWindow() const;
   Window GetMaximizedWindow() const;
@@ -58,6 +58,8 @@
   virtual void OverlayShown();
   virtual void OverlayHidden();
 
+  void OnDPIChanged();
+
 protected:
   std::string GetName() const;
   void AddProperties(debug::IntrospectionData&);
@@ -177,7 +179,6 @@
   bool we_control_active_;
   bool new_app_menu_shown_;
 
-  int monitor_;
   Window active_xid_;
   nux::Geometry monitor_geo_;
   const std::string desktop_name_;
 
=== modified file 'panel/PanelTray.cpp'
--- panel/PanelTray.cpp	2013-09-19 16:44:03 +0000
+++ panel/PanelTray.cpp	2014-02-19 01:47:39 +0000
@@ -21,6 +21,7 @@
 
 #include "PanelTray.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
 
 #include <NuxCore/Logger.h>
 
@@ -35,11 +36,12 @@
 namespace unity
 {
 
-PanelTray::PanelTray()
+PanelTray::PanelTray(int monitor)
   : View(NUX_TRACKER_LOCATION)
   , window_(gtk_window_new(GTK_WINDOW_TOPLEVEL))
+  , monitor_(monitor)
 {
-  int panel_height = panel::Style::Instance().panel_height;
+  int panel_height = panel::Style::Instance().PanelHeight(monitor_);
 
   auto gtkwindow = glib::object_cast<GtkWindow>(window_);
   gtk_window_set_type_hint(gtkwindow, GDK_WINDOW_TYPE_HINT_DOCK);
@@ -113,7 +115,7 @@
 {
   if (tray_)
   {
-    SetMinMaxSize(WidthOfTray() + (PADDING * 2), panel::Style::Instance().panel_height);
+    SetMinMaxSize(WidthOfTray() + (PADDING * 2), panel::Style::Instance().PanelHeight(monitor_));
     QueueRelayout();
     QueueDraw();
 
@@ -176,7 +178,7 @@
 bool PanelTray::IdleSync()
 {
   int width = WidthOfTray();
-  gtk_window_resize(GTK_WINDOW(window_.RawPtr()), width, panel::Style::Instance().panel_height);
+  gtk_window_resize(GTK_WINDOW(window_.RawPtr()), width, panel::Style::Instance().PanelHeight(monitor_));
   Sync();
 
   return false;
 
=== modified file 'panel/PanelTray.h'
--- panel/PanelTray.h	2013-09-19 16:44:03 +0000
+++ panel/PanelTray.h	2014-02-19 01:47:39 +0000
@@ -40,7 +40,7 @@
 class PanelTray : public nux::View, public unity::debug::Introspectable
 {
 public:
-  PanelTray();
+  PanelTray(int monitor);
   ~PanelTray();
 
   void Sync();
@@ -70,6 +70,8 @@
   glib::Source::UniquePtr sync_idle_;
   std::list<NaTrayChild*> children_;
   nux::Geometry last_geo_;
+
+  int monitor_;
 };
 
 }
 
=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2014-02-17 13:43:43 +0000
+++ panel/PanelView.cpp	2014-02-19 01:47:39 +0000
@@ -73,6 +73,8 @@
 {
   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));
+
   wm.average_color.changed.connect(sigc::mem_fun(this, &PanelView::OnBackgroundUpdate));
   wm.initiate_spread.connect(sigc::mem_fun(this, &PanelView::OnSpreadInitiate));
   wm.terminate_spread.connect(sigc::mem_fun(this, &PanelView::OnSpreadTerminate));
@@ -107,11 +109,12 @@
 
   SetCompositionLayout(layout_);
 
-  tray_ = new PanelTray();
+  tray_ = new PanelTray(monitor_);
   layout_->AddView(tray_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   AddChild(tray_);
 
   indicators_ = new PanelIndicatorsView();
+  indicators_->SetMonitor(monitor_);
   AddPanelView(indicators_, 0);
 
   for (auto const& object : remote_->GetIndicators())
@@ -168,6 +171,13 @@
   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;
@@ -774,7 +784,11 @@
 {
   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);
@@ -784,8 +798,8 @@
 {
   unity::panel::Style &panel_style = panel::Style::Instance();
   SetMaximumWidth(width);
-  SetGeometry(nux::Geometry(0, 0, width, panel_style.panel_height));
-  parent_->SetGeometry(nux::Geometry(offset.x, offset.y, width, panel_style.panel_height));
+  SetGeometry(nux::Geometry(0, 0, width, panel_style.PanelHeight(monitor_)));
+  parent_->SetGeometry(nux::Geometry(offset.x, offset.y, width, panel_style.PanelHeight(monitor_)));
 }
 
 int PanelView::GetMonitor() const
 
=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2014-02-17 14:09:15 +0000
+++ panel/PanelView.h	2014-02-19 01:47:39 +0000
@@ -110,6 +110,8 @@
   bool TrackMenuPointer();
   void SyncGeometries();
   void AddPanelView(PanelIndicatorsView* child, unsigned int stretchFactor);
+  
+  void OnDPIChanged();
 
   MockableBaseWindow* parent_;
   indicator::Indicators::Ptr remote_;
 
=== modified file 'panel/StandalonePanel.cpp'
--- panel/StandalonePanel.cpp	2014-02-12 07:13:01 +0000
+++ panel/StandalonePanel.cpp	2014-02-19 01:47:39 +0000
@@ -89,7 +89,7 @@
     panel_window->ShowWindow(true);
     panel_window->SetWidth(1024);
     panel_window->SetXY(0, 0);
-    panel_window->SetMaximumHeight(panel_style.panel_height());
+    panel_window->SetMaximumHeight(panel_style.PanelHeight());
 
     wt->window_configuration.connect([this] (int x, int y, int w, int h) {
       panel_window->SetWidth(w);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-02-17 23:31:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-02-19 01:47:39 +0000
@@ -628,7 +628,8 @@
   if (_shadow_texture.empty ())
     return;
 
-  float panel_h = static_cast<float>(panel_style_.panel_height);
+  int monitor = PluginAdapter::Default().MonitorGeometryIn(NuxGeometryFromCompRect(output));
+  float panel_h = static_cast<float>(panel_style_.PanelHeight(monitor));
   float shadowX = output.x();
   float shadowY = output.y() + panel_h;
   float shadowWidth = output.width();
@@ -907,7 +908,9 @@
 
   nux::TexCoordXForm texxform;
   texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_CLAMP);
-  int panel_height = panel_style_.panel_height;
+
+  // 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);
 }
@@ -2907,9 +2910,11 @@
             !(window->state() & CompWindowStateFullscreenMask) &&
             !(window->type() & CompWindowTypeFullscreenMask))
         {
+          WindowManager& wm = WindowManager::Default();
           auto const& output = uScreen->screen->currentOutputDev();
+          int monitor = wm.MonitorGeometryIn(NuxGeometryFromCompRect(output));
 
-          if (window->y() - window->border().top < output.y() + uScreen->panel_style_.panel_height)
+          if (window->y() - window->border().top < output.y() + uScreen->panel_style_.PanelHeight(monitor))
           {
             draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
           }
@@ -3622,7 +3627,7 @@
     hud_controller_->launcher_width = launcher_width;
     dash_controller_->launcher_width = launcher_width;
     panel_controller_->launcher_width = launcher_width;
-    shortcut_controller_->SetAdjustment(launcher_width, panel_style_.panel_height);
+    shortcut_controller_->SetAdjustment(launcher_width, panel_style_.PanelHeight());
 
     CompOption::Value v(launcher_width);
     screen->setOptionForPlugin("expo", "x_offset", v);
 
=== modified file 'tests/test_em_converter.cpp'
--- tests/test_em_converter.cpp	2014-01-29 22:40:20 +0000
+++ tests/test_em_converter.cpp	2014-02-19 01:47:39 +0000
@@ -64,7 +64,7 @@
 
 TEST_F(TestEMConverter, TestConvertPixel)
 {
-  EXPECT_EQ(PIXEL_SIZE, em_converter.ConvertPixels(PIXEL_SIZE));
+  EXPECT_EQ(PIXEL_SIZE, em_converter.CP(PIXEL_SIZE));
 }
 
 TEST_F(TestEMConverter, TestDPIScale)
 
=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_launcher_controller.cpp	2014-02-19 01:47:39 +0000
@@ -464,8 +464,8 @@
     auto const& monitor_geo = uscreen.GetMonitorGeometry(i);
     auto const& launcher_geo = lc.launchers()[i]->GetAbsoluteGeometry();
     ASSERT_EQ(launcher_geo.x, monitor_geo.x);
-    ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.panel_height);
-    ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.panel_height);
+    ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.PanelHeight(i));
+    ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.PanelHeight(i));
   }
 }
 
@@ -476,15 +476,15 @@
   uscreen.SetMonitors({monitor_geo});
   nux::Geometry launcher_geo = lc.launcher().GetAbsoluteGeometry();
   ASSERT_EQ(launcher_geo.x, monitor_geo.x);
-  ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.panel_height);
-  ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.panel_height);
+  ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.PanelHeight());
+  ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.PanelHeight());
 
   uscreen.Reset();
   monitor_geo = uscreen.GetMonitorGeometry(0);
   launcher_geo = lc.launcher().GetAbsoluteGeometry();
   ASSERT_EQ(launcher_geo.x, monitor_geo.x);
-  ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.panel_height);
-  ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.panel_height);
+  ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.PanelHeight());
+  ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.PanelHeight());
 }
 
 TEST_F(TestLauncherController, IconCentersResetsOnMonitorsUpdated)
 
=== modified file 'tests/test_panel_controller.cpp'
--- tests/test_panel_controller.cpp	2014-02-12 07:13:01 +0000
+++ tests/test_panel_controller.cpp	2014-02-19 01:47:39 +0000
@@ -148,7 +148,7 @@
       ASSERT_EQ(panel_geo.x, monitor_geo.x);
       ASSERT_EQ(panel_geo.y, monitor_geo.y);
       ASSERT_EQ(panel_geo.width, monitor_geo.width);
-      ASSERT_EQ(panel_geo.height, panel_style.panel_height);
+      ASSERT_EQ(panel_geo.height, panel_style.PanelHeight(i));
     }
   }
 }
@@ -164,7 +164,7 @@
   ASSERT_EQ(panel_geo.x, monitor_geo.x);
   ASSERT_EQ(panel_geo.y, monitor_geo.y);
   ASSERT_EQ(panel_geo.width, monitor_geo.width);
-  ASSERT_EQ(panel_geo.height, panel_style.panel_height);
+  ASSERT_EQ(panel_geo.height, panel_style.PanelHeight());
 
   uscreen.Reset();
   monitor_geo = uscreen.GetMonitorGeometry(0);
@@ -172,7 +172,7 @@
   ASSERT_EQ(panel_geo.x, monitor_geo.x);
   ASSERT_EQ(panel_geo.y, monitor_geo.y);
   ASSERT_EQ(panel_geo.width, monitor_geo.width);
-  ASSERT_EQ(panel_geo.height, panel_style.panel_height);
+  ASSERT_EQ(panel_geo.height, panel_style.PanelHeight());
 }
 
 TEST_F(TestPanelController, MultiMonitorEdgeBarrierSubscriptions)
 
=== modified file 'tests/test_panel_indicator_entry_dropdown_view.cpp'
--- tests/test_panel_indicator_entry_dropdown_view.cpp	2014-01-30 19:46:58 +0000
+++ tests/test_panel_indicator_entry_dropdown_view.cpp	2014-02-19 01:47:39 +0000
@@ -230,7 +230,7 @@
   }
 
   auto const& geo = dropdown.GetGeometry();
-  EXPECT_CALL(*indicators_, ShowEntriesDropdown(entries, Entry::Ptr(), 0, geo.x, geo.y + Style::Instance().panel_height));
+  EXPECT_CALL(*indicators_, ShowEntriesDropdown(entries, Entry::Ptr(), 0, geo.x, geo.y + Style::Instance().PanelHeight()));
   dropdown.ShowMenu();
 }
 
@@ -249,7 +249,7 @@
   auto active = views[g_random_int() % views.size()];
   auto const& geo = dropdown.GetGeometry();
 
-  EXPECT_CALL(*indicators_, ShowEntriesDropdown(entries, active->GetEntry(), 0, geo.x, geo.y + Style::Instance().panel_height));
+  EXPECT_CALL(*indicators_, ShowEntriesDropdown(entries, active->GetEntry(), 0, geo.x, geo.y + Style::Instance().PanelHeight()));
   dropdown.ActivateChild(active);
 }
 
 
=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2014-02-17 15:36:53 +0000
+++ tests/test_panel_menu_view.cpp	2014-02-19 01:47:39 +0000
@@ -61,7 +61,7 @@
     nux::ObjectPtr<nux::BaseWindow> panel_win(new nux::BaseWindow());
     auto const& monitor_geo = uscreen.GetMonitorGeometry(monitor);
     panel_win->SetGeometry(monitor_geo);
-    panel_win->SetMaximumHeight(panelStyle.panel_height());
+    panel_win->SetMaximumHeight(panelStyle.PanelHeight(monitor));
     panel_win->SetLayout(new nux::HLayout(NUX_TRACKER_LOCATION));
     panel_win->GetLayout()->AddView(&menu_view, 1);
     panel_win->GetLayout()->SetContentDistribution(nux::MAJOR_POSITION_START);
 
=== modified file 'tests/test_panel_style.cpp'
--- tests/test_panel_style.cpp	2013-07-09 04:29:25 +0000
+++ tests/test_panel_style.cpp	2014-02-19 01:47:39 +0000
@@ -27,6 +27,8 @@
 #include "unity-shared/UnitySettings.h"
 #include "test_utils.h"
 
+#include "MultiMonitor.h"
+
 using namespace unity;
 using namespace testing;
 
@@ -83,4 +85,14 @@
   g_free (old_font);
 }
 
+TEST_F(TestPanelStyle, TestPanelHeightUnderBounds)
+{
+  ASSERT_EQ(panel_style_instance->PanelHeight(-1), 0);
+}
+
+TEST_F(TestPanelStyle, TestPanelHeightOverBounds)
+{
+  ASSERT_EQ(panel_style_instance->PanelHeight(monitors::MAX), 0);
+}
+
 }
 
=== modified file 'tests/test_raw_pixel.cpp'
--- tests/test_raw_pixel.cpp	2014-02-07 21:50:15 +0000
+++ tests/test_raw_pixel.cpp	2014-02-19 01:47:39 +0000
@@ -32,13 +32,13 @@
 {
 public:
   TestRawPixel()
-    : cv(FONT_SIZE, DPI)
+    : cv(std::make_shared<EMConverter>(FONT_SIZE, DPI))
     , p_i(10_em)
     , p_f(10.0_em)
   {
   }
 
-  EMConverter cv;
+  EMConverter::Ptr cv;
   RawPixel p_i;
   RawPixel p_f;
 };
@@ -67,7 +67,7 @@
 
 TEST_F(TestRawPixel, TestConverterTimesTwo)
 {
-  cv.SetDPI(DPI * 2);
+  cv->SetDPI(DPI * 2);
   ASSERT_EQ(p_i.CP(cv), 20);
 }
 
 
=== modified file 'unity-shared/EMConverter.cpp'
--- unity-shared/EMConverter.cpp	2014-02-07 21:50:15 +0000
+++ unity-shared/EMConverter.cpp	2014-02-19 01:47:39 +0000
@@ -96,7 +96,7 @@
   return (pixels / base_pixels_per_em_);
 }
 
-double EMConverter::ConvertPixels(int pixels) const
+double EMConverter::CP(int pixels) const
 {
   double pixels_em = PixelsToBaseEM(pixels);
   return EMToPixels(pixels_em);
 
=== modified file 'unity-shared/EMConverter.h'
--- unity-shared/EMConverter.h	2014-02-07 21:50:15 +0000
+++ unity-shared/EMConverter.h	2014-02-19 01:47:39 +0000
@@ -20,12 +20,16 @@
 #ifndef EM_CONVERTER_H
 #define EM_CONVERTER_H
 
+#include <memory>
+
 namespace unity
 {
 
 class EMConverter
 {
 public:
+  typedef std::shared_ptr<EMConverter> Ptr;
+
   EMConverter(int font_size = 0, double dpi = 96.0);
 
   void SetFontSize(int font_size);
@@ -34,7 +38,7 @@
   int    GetFontSize() const;
   double GetDPI() const;
 
-  double ConvertPixels(int pixels) const;
+  double CP(int pixels) const;
   double DPIScale() const;
 
   double PtToPx(int pt);
 
=== modified file 'unity-shared/OverlayWindowButtons.cpp'
--- unity-shared/OverlayWindowButtons.cpp	2014-02-10 15:31:44 +0000
+++ unity-shared/OverlayWindowButtons.cpp	2014-02-19 01:47:39 +0000
@@ -60,7 +60,7 @@
 
   SetX(geo.x + MAIN_LEFT_PADDING);
   SetY(geo.y + MENUBAR_PADDING);
-  SetHeight(panel::Style::Instance().panel_height);
+  SetHeight(panel::Style::Instance().PanelHeight(monitor));
 
   window_buttons_->monitor = monitor;
 }
 
=== modified file 'unity-shared/PanelStyle.cpp'
--- unity-shared/PanelStyle.cpp	2014-01-16 13:20:16 +0000
+++ unity-shared/PanelStyle.cpp	2014-02-19 01:47:39 +0000
@@ -27,6 +27,8 @@
 #include "unity-shared/TextureCache.h"
 #include "unity-shared/UnitySettings.h"
 
+#include "MultiMonitor.h"
+
 namespace unity
 {
 namespace panel
@@ -38,6 +40,7 @@
 DECLARE_LOGGER(logger, "unity.panel.style");
 const int BUTTONS_SIZE = 16;
 const int BUTTONS_PADDING = 1;
+const int BASE_PANEL_HEIGHT = 24;
 
 std::string button_id(WindowButtonType type, WindowState ws)
 {
@@ -50,8 +53,8 @@
 }
 
 Style::Style()
-  : panel_height(24)
-  , style_context_(gtk_style_context_new())
+  : style_context_(gtk_style_context_new())
+  , panel_heights_(monitors::MAX, BASE_PANEL_HEIGHT)
 {
   if (style_instance)
   {
@@ -62,15 +65,6 @@
     style_instance = this;
   }
 
-  if (Settings::Instance().form_factor() == FormFactor::TV)
-    panel_height = 0;
-
-  Settings::Instance().form_factor.changed.connect([this](FormFactor form_factor)
-  {
-    if (form_factor == FormFactor::TV)
-      panel_height = 0;
-  });
-
   GtkWidgetPath* widget_path = gtk_widget_path_new();
   gint pos = gtk_widget_path_append_type(widget_path, GTK_TYPE_WINDOW);
   gtk_widget_path_iter_set_name(widget_path, pos, "UnityPanelWidget");
@@ -115,10 +109,23 @@
   RefreshContext();
 }
 
+int Style::PanelHeight(int monitor) const
+{
+  if (monitor < 0 || monitor >= (int)monitors::MAX)
+  {
+    LOG_ERROR(logger) << "Invalid monitor index: " << monitor;
+    return 0;
+  }
+
+  EMConverter::Ptr const& cv = unity::Settings::Instance().em(monitor);
+  return panel_heights_[monitor].CP(cv);
+}
+
 void Style::RefreshContext()
 {
   gtk_style_context_invalidate(style_context_);
   bg_texture_.Release();
+
   changed.emit();
 }
 
@@ -127,13 +134,13 @@
   return style_context_;
 }
 
-BaseTexturePtr Style::GetBackground()
+BaseTexturePtr Style::GetBackground(int monitor)
 {
   if (bg_texture_)
     return bg_texture_;
 
   int width = 1;
-  int height = panel_height();
+  int height = PanelHeight(monitor);
 
   nux::CairoGraphics context(CAIRO_FORMAT_ARGB32, width, height);
 
 
=== modified file 'unity-shared/PanelStyle.h'
--- unity-shared/PanelStyle.h	2014-01-14 17:18:17 +0000
+++ unity-shared/PanelStyle.h	2014-02-19 01:47:39 +0000
@@ -28,6 +28,9 @@
 #include <gtk/gtk.h>
 #include <UnityCore/GLibWrapper.h>
 
+#include "unity-shared/EMConverter.h"
+#include "unity-shared/RawPixel.h"
+
 namespace unity
 {
 namespace decoration
@@ -57,23 +60,28 @@
 
   static Style& Instance();
 
-  nux::Property<int> panel_height;
-
   GtkStyleContext* GetStyleContext();
-  BaseTexturePtr GetBackground();
+  BaseTexturePtr GetBackground(int monitor = 0);
   BaseTexturePtr GetWindowButton(WindowButtonType type, WindowState state);
   BaseTexturePtr GetFallbackWindowButton(WindowButtonType type, WindowState state);
   std::string GetFontDescription(PanelItem item);
   int GetTextDPI();
 
+  int PanelHeight(int monitor = 0) const;
+
   sigc::signal<void> changed;
 
 private:
   void OnThemeChanged(std::string const&);
   void RefreshContext();
 
+  void UpdateFontSize();
+  void UpdatePanelHeight();
+
   glib::Object<GtkStyleContext> style_context_;
   BaseTexturePtr bg_texture_;
+
+  std::vector<RawPixel> panel_heights_;
 };
 
 }
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2014-02-18 00:59:30 +0000
+++ unity-shared/PluginAdapter.cpp	2014-02-19 01:47:39 +0000
@@ -23,6 +23,7 @@
 #include "DecorationStyle.h"
 #include "PluginAdapter.h"
 #include "CompizUtils.h"
+#include "MultiMonitor.h"
 
 #include <scale/scale.h>
 #include <NuxCore/Logger.h>
@@ -411,6 +412,20 @@
   return ret;
 }
 
+int PluginAdapter::MonitorGeometryIn(nux::Geometry const& geo) const
+{
+  std::vector<nux::Geometry> const& monitors = unity::UScreen::GetDefault()->GetMonitors();
+  for (unsigned i = 0; i < monitors.size(); ++i)
+  {
+    nux::Geometry const& i_g = geo.Intersect(monitors[i]);
+
+    if (i_g.width > 0 && i_g.height > 0)
+      return i;
+  }
+
+  return 0;
+}
+
 bool PluginAdapter::IsTopWindowFullscreenOnMonitorWithMouse() const
 {
   int monitor = unity::UScreen::GetDefault()->GetMonitorWithMouse();
 
=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2014-02-15 14:46:47 +0000
+++ unity-shared/PluginAdapter.h	2014-02-19 01:47:39 +0000
@@ -115,6 +115,7 @@
   Window GetActiveWindow() const;
   std::vector<Window> GetWindowsInStackingOrder() const override;
 
+  int MonitorGeometryIn(nux::Geometry const& geo) const override;
   bool IsTopWindowFullscreenOnMonitorWithMouse() const override;
 
   // WindowManager implementation
 
=== modified file 'unity-shared/RawPixel.cpp'
--- unity-shared/RawPixel.cpp	2014-02-07 21:50:15 +0000
+++ unity-shared/RawPixel.cpp	2014-02-19 01:47:39 +0000
@@ -37,9 +37,9 @@
 {
 }
 
-float RawPixel::CP(EMConverter const& converter) const
+float RawPixel::CP(EMConverter::Ptr const& converter) const
 {
-  return converter.ConvertPixels(raw_pixel_);
+  return converter->CP(raw_pixel_);
 }
 
 RawPixel::operator float() const
 
=== modified file 'unity-shared/RawPixel.h'
--- unity-shared/RawPixel.h	2014-02-07 21:50:15 +0000
+++ unity-shared/RawPixel.h	2014-02-19 01:47:39 +0000
@@ -30,7 +30,7 @@
 public:
   RawPixel(float raw_pixel);
 
-  float CP(EMConverter const& converter) const;
+  float CP(EMConverter::Ptr const& converter) const;
 
   operator float() const;
 
 
=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2014-02-17 15:22:39 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2014-02-19 01:47:39 +0000
@@ -129,6 +129,12 @@
 
   return ret;
 }
+  
+int StandaloneWindowManager::MonitorGeometryIn(nux::Geometry const& geo) const
+{
+  // TODO
+  return 0;
+}
 
 bool StandaloneWindowManager::IsTopWindowFullscreenOnMonitorWithMouse() const
 {
 
=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2014-02-14 03:05:02 +0000
+++ unity-shared/StandaloneWindowManager.h	2014-02-19 01:47:39 +0000
@@ -71,6 +71,7 @@
   virtual Window GetActiveWindow() const;
   std::vector<Window> GetWindowsInStackingOrder() const override;
 
+  virtual int  MonitorGeometryIn(nux::Geometry const& geo) const override;
   virtual bool IsTopWindowFullscreenOnMonitorWithMouse() const override;
 
   virtual bool IsWindowMaximized(Window window_id) const;
 
=== modified file 'unity-shared/UnitySettings.cpp'
--- unity-shared/UnitySettings.cpp	2014-01-31 21:20:30 +0000
+++ unity-shared/UnitySettings.cpp	2014-02-19 01:47:39 +0000
@@ -39,6 +39,10 @@
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
+
+// FIXME Remove me when hikikos settings changes land in unity
+const std::string GNOME_SETTINGS      = "org.gnome.desktop.interface";
+const std::string TEXT_SCALING_FACTOR = "text-scaling-factor";
 }
 
 //
@@ -50,11 +54,14 @@
   Impl(Settings* owner)
     : parent_(owner)
     , gsettings_(g_settings_new(SETTINGS_NAME.c_str()))
+    , gnome_settings_(g_settings_new(GNOME_SETTINGS.c_str()))
     , cached_form_factor_(FormFactor::DESKTOP)
     , cached_double_click_activate_(true)
     , lowGfx_(false)
-    , em_converters_(monitors::MAX)
   {
+    for (int i = 0; i < (int)monitors::MAX; i++)
+      em_converters_.push_back(std::make_shared<EMConverter>());
+
     CacheFormFactor();
     CacheDoubleClickActivate();
 
@@ -67,6 +74,10 @@
       parent_->double_click_activate.changed.emit(cached_double_click_activate_);
     });
 
+    signals_.Add<void, GSettings*, const gchar*>(gnome_settings_, "changed::" + TEXT_SCALING_FACTOR, [this] (GSettings*, const gchar* t) {
+      UpdateEMConverter();
+    });
+
     UpdateEMConverter();
   }
 
@@ -124,10 +135,10 @@
   // FIXME Add in getting the specific dpi scale from each monitor
   int GetDPI(int monitor = 0) const
   {
-    int dpi = 0;
-    g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, nullptr);
+    int dpi = 96;
+    float scale = g_settings_get_double(gnome_settings_, TEXT_SCALING_FACTOR.c_str());
 
-    return dpi / 1024;
+    return dpi * scale;
   }
 
   void UpdateFontSize()
@@ -135,7 +146,7 @@
     int font_size = GetFontSize();
 
     for (auto& em : em_converters_)
-      em.SetFontSize(font_size);
+      em->SetFontSize(font_size);
   }
 
   void UpdateDPI()
@@ -143,8 +154,10 @@
     for (int i = 0; i < (int)em_converters_.size(); ++i)
     {
       int dpi = GetDPI(i);
-      em_converters_[i].SetDPI(dpi);
+      em_converters_[i]->SetDPI(dpi);
     }
+
+    parent_->dpi_changed.emit();
   }
 
   void UpdateEMConverter()
@@ -155,6 +168,7 @@
 
   Settings* parent_;
   glib::Object<GSettings> gsettings_;
+  glib::Object<GSettings> gnome_settings_;
   FormFactor cached_form_factor_;
   bool cached_double_click_activate_;
   bool lowGfx_;
@@ -162,7 +176,8 @@
   glib::Signal<void, GSettings*, gchar* > form_factor_changed_;
   glib::Signal<void, GSettings*, gchar* > double_click_activate_changed_;
 
-  std::vector<EMConverter> em_converters_;
+  glib::SignalManager signals_;
+  std::vector<EMConverter::Ptr> em_converters_;
 };
 
 //
@@ -215,7 +230,7 @@
   pimpl->lowGfx_ = low_gfx;
 }
 
-EMConverter const& Settings::em(int monitor) const
+EMConverter::Ptr const& Settings::em(int monitor) const
 {
   if (monitor < 0 || monitor >= (int)monitors::MAX)
   {
 
=== modified file 'unity-shared/UnitySettings.h'
--- unity-shared/UnitySettings.h	2014-01-31 21:01:53 +0000
+++ unity-shared/UnitySettings.h	2014-02-19 01:47:39 +0000
@@ -51,7 +51,8 @@
   nux::Property<bool> is_standalone;
   nux::ROProperty<bool> double_click_activate;
 
-  EMConverter const& em(int monitor = 0) const;
+  sigc::signal<void> dpi_changed;
+  EMConverter::Ptr const& em(int monitor = 0) const;
 
 private:
   class Impl;
 
=== modified file 'unity-shared/WindowButtonPriv.h'
--- unity-shared/WindowButtonPriv.h	2014-01-14 13:13:11 +0000
+++ unity-shared/WindowButtonPriv.h	2014-02-19 01:47:39 +0000
@@ -24,9 +24,11 @@
 #include <Nux/Button.h>
 
 #include "unity-shared/DecorationStyle.h"
+#include "unity-shared/Introspectable.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/RawPixel.h"
 #include "unity-shared/UBusWrapper.h"
-#include "unity-shared/Introspectable.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -44,6 +46,9 @@
   panel::WindowButtonType GetType() const;
   void SetVisualState(nux::ButtonVisualState new_state);
 
+  void OnMonitorChanged(int monitor);
+  void UpdateDPIChanged();
+
   nux::RWProperty<bool> enabled;
   nux::Property<bool> overlay_mode;
 
@@ -58,6 +63,8 @@
   bool EnabledSetter(bool enabled);
   static nux::ObjectPtr<nux::BaseTexture> GetDashWindowButton(panel::WindowButtonType type, panel::WindowState state);
 
+  void UpdateGeometry();
+
   inline WindowButtons* Parent() const
   {
     return static_cast<WindowButtons*>(GetParentObject());
@@ -66,6 +73,9 @@
 private:
   panel::WindowButtonType type_;
 
+  int monitor_;
+  EMConverter::Ptr cv_;
+
   nux::ObjectPtr<nux::BaseTexture> normal_tex_;
   nux::ObjectPtr<nux::BaseTexture> prelight_tex_;
   nux::ObjectPtr<nux::BaseTexture> pressed_tex_;
 
=== modified file 'unity-shared/WindowButtons.cpp'
--- unity-shared/WindowButtons.cpp	2014-02-15 17:33:02 +0000
+++ unity-shared/WindowButtons.cpp	2014-02-19 01:47:39 +0000
@@ -43,11 +43,25 @@
             sigc::mem_fun(this, &WindowButton::EnabledSetter))
   , overlay_mode(false)
   , type_(type)
+  , monitor_(0)
+  , cv_(unity::Settings::Instance().em(0))
 {
   overlay_mode.changed.connect([this] (bool) { UpdateSize(); QueueDraw(); });
   SetAcceptKeyNavFocusOnMouseDown(false);
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &WindowButton::LoadImages));
-  LoadImages();
+
+  LoadImages();
+}
+
+void WindowButton::UpdateDPIChanged()
+{
+  LoadImages();
+}
+
+void WindowButton::OnMonitorChanged(int monitor)
+{
+  monitor_ = monitor;
+  cv_ = unity::Settings::Instance().em(monitor);
 }
 
 void WindowButton::SetVisualState(nux::ButtonVisualState new_state)
@@ -133,7 +147,7 @@
 
 void WindowButton::UpdateSize()
 {
-  int panel_height = panel::Style::Instance().panel_height;
+  int panel_height = panel::Style::Instance().PanelHeight(monitor_);
   nux::BaseTexture* tex;
   tex = (overlay_mode()) ? normal_dash_tex_.GetPointer() : normal_tex_.GetPointer();
   int width = 0;
@@ -141,8 +155,10 @@
 
   if (tex)
   {
-    width = std::min(panel_height, tex->GetWidth());
-    height = std::min(panel_height, tex->GetHeight());
+    int tex_w = RawPixel(tex->GetWidth()).CP(cv_);
+    int tex_h = RawPixel(tex->GetHeight()).CP(cv_);
+    width  = std::min(panel_height, tex_w);
+    height = std::min(panel_height, tex_h);
   }
 
   SetMinMaxSize(width, height);
@@ -321,6 +337,20 @@
   WindowManager::Default().terminate_spread.connect(sigc::mem_fun(this, &WindowButtons::OnSpreadTerminate));
 }
 
+
+void WindowButtons::UpdateDPIChanged()
+{
+  for (auto area : GetChildren())
+    static_cast<internal::WindowButton*>(area)->UpdateDPIChanged();
+}
+
+void WindowButtons::OnMonitorChanged(int monitor)
+{
+  // Need to update the EMConverter in each window button if the monitor changes
+  for (auto area : GetChildren())
+    static_cast<internal::WindowButton*>(area)->OnMonitorChanged(monitor);
+}
+
 nux::Area* WindowButtons::FindAreaUnderMouse(const nux::Point& mouse, nux::NuxEventType event_type)
 {
   if (!GetInputEventSensitivity())
 
=== modified file 'unity-shared/WindowButtons.h'
--- unity-shared/WindowButtons.h	2014-02-15 17:33:02 +0000
+++ unity-shared/WindowButtons.h	2014-02-19 01:47:39 +0000
@@ -44,6 +44,7 @@
   nux::Property<bool> focused;
 
   bool IsMouseOwner();
+  void UpdateDPIChanged();
   virtual nux::Area* FindAreaUnderMouse(const nux::Point& mouse_pos, nux::NuxEventType event_type);
 
   sigc::signal<void> close_clicked;
@@ -71,6 +72,7 @@
   void OnControlledWindowChanged(Window xid);
   void ResetNormalButtonState();
   bool OpacitySetter(double& target, double new_value);
+  void OnMonitorChanged(int monitor);
 
   std::string active_overlay_;
   UBusManager ubus_manager_;
 
=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2014-02-14 03:05:02 +0000
+++ unity-shared/WindowManager.h	2014-02-19 01:47:39 +0000
@@ -77,6 +77,7 @@
   virtual Window GetActiveWindow() const = 0;
   virtual std::vector<Window> GetWindowsInStackingOrder() const = 0;
 
+  virtual int  MonitorGeometryIn(nux::Geometry const& geo) const = 0;
   virtual bool IsTopWindowFullscreenOnMonitorWithMouse() const = 0;
 
   virtual bool IsWindowMaximized(Window window_id) const = 0;