Merge lp:~brandontschaefer/unity/shutdown-dialog-hi-dpi into lp:unity

[Brandon Schaefer]

ShutdownView: Scale up the Buttons and Text plus Borders of the UnityWindowView.

Scale up the Buttons/Text of the shutdown dialog. Still need to do the border it self.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/unity-ci/896/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/430

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

review: Approve (continuous-integration)

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

22 + RawPixel const DEFAULT_TEXTURE_SIZE = 168_em;

Mh, I don't like much the texture size defined here, considering they might change, but you can just do (without adding extra computation cost, since this will happen anyway)

nux::Size size;
auto const& texture_name = (texture_prefix + ".png");
gdk_pixbuf_get_file_info(texture_name.c_str(), &size.width, &size.height);
int max_size = std::max(std::round(size.width * scale), std::round(size.height * scale));
normal_tex_.Adopt(nux::CreateTexture2DFromFile(texture_name.c_str(), max_size, true));

Make sure you intialize the scale in SessionButton.

184 + auto* button = (Button*)area;

A static_cast would be nicer

145 + UpdateEMConverter();

I think you only need UpdateViewSize there, since the mode don't affect the monitor, but indeed might change the contents.

161 +void View::UpdateEMConverter()
162 +{
163 + int mouse_monitor = UScreen::GetDefault()->GetMonitorWithMouse();
164 + if (monitor != mouse_monitor)
165 + {
166 + monitor = mouse_monitor;
167 + UpdateViewSize();
168 + }
169 +}

I think you should get rid of this, just calling UpdateViewSize when the em converter changes.

Also, monitor variable should not be set by SessionView but by SessionController.
The view should not care about positioning itself.

219 + button->scale = cv_->DPIScale();
220 + button->scale = cv_->DPIScale();

Duplicated?

Finally, from a test run I'm getting these issues:
1) the title/subtitle text is not resized here (I don't see why, since it seems you're setting the scale properly)
2) Changing the scale value, when the view is hidden doesn't make it to be update once I request a new shutdown.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

> 22 + RawPixel const DEFAULT_TEXTURE_SIZE = 168_em;
>
> Mh, I don't like much the texture size defined here, considering they might
> change, but you can just do (without adding extra computation cost, since this
> will happen anyway)

Done.

>
> nux::Size size;
> auto const& texture_name = (texture_prefix + ".png");
> gdk_pixbuf_get_file_info(texture_name.c_str(), &size.width, &size.height);
> int max_size = std::max(std::round(size.width * scale), std::round(size.height
> * scale));
> normal_tex_.Adopt(nux::CreateTexture2DFromFile(texture_name.c_str(), max_size,
> true));
>

Done.

> Make sure you intialize the scale in SessionButton.
>
> 184 + auto* button = (Button*)area;
>
> A static_cast would be nicer
>

Done.

> 145 + UpdateEMConverter();
>
> I think you only need UpdateViewSize there, since the mode don't affect the
> monitor, but indeed might change the contents.
>
> 161 +void View::UpdateEMConverter()
> 162 +{
> 163 + int mouse_monitor = UScreen::GetDefault()->GetMonitorWithMouse();
> 164 + if (monitor != mouse_monitor)
> 165 + {
> 166 + monitor = mouse_monitor;
> 167 + UpdateViewSize();
> 168 + }
> 169 +}
>
> I think you should get rid of this, just calling UpdateViewSize when the em
> converter changes.
>

Done.

> Also, monitor variable should not be set by SessionView but by
> SessionController.
> The view should not care about positioning itself.
>

Done.

> 219 + button->scale = cv_->DPIScale();
> 220 + button->scale = cv_->DPIScale();
>
> Duplicated?
>

Yup, fixed.

> Finally, from a test run I'm getting these issues:
> 1) the title/subtitle text is not resized here (I don't see why, since it
> seems you're setting the scale properly)
> 2) Changing the scale value, when the view is hidden doesn't make it to be
> update once I request a new shutdown.

Tests are passing here, if you could give those another go... Ill attempt a few more times. Thanks!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3791
http://jenkins.qa.ubuntu.com/job/unity-ci/899/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/431
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/433

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

review: Approve (continuous-integration)

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

Ops, it seems you're touching also ApplicationLauncherIcon.cpp, due to mergig with other fix... :)

26 + std::string const FONT = "Ubuntu Light 12";

I would have preferred if you left the const TYPE as discussed...

42 + , texture_size_(-1)
 GetDefaultMaxTextureSize(texture_prefix);

The gdk_pixbuf_get_file_info is cached anyway, so imho you don't need to track the texture_size_... I'd just make GetDefaultMaxTextureSize to return a RawPixel. Otherwise, change the Get prefix, as it might imply it would return something.

156 +#include <unity-shared/UScreen.h>

I guess you don't need that anymore, right?

155 +#include <unity-shared/RawPixel.h>
Also this one is now implicit by including the SessionButton

225 + monitor.changed.connect([this] (bool changed) {

Not really a bug as bool's are int's, but that should be an (int monitor) :)

Running it, now works properly, but I think that at this point we should also scale the Close button, as it might be very tiny on HiDpi monitors (and at this point borders as well).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3792
http://jenkins.qa.ubuntu.com/job/unity-ci/912/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/444
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/446

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

review: Approve (continuous-integration)

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

Ah, I just recalled... Can you ensure that this merges cleanly with lp:~andyrock/unity/lp-1281058/+merge/215331?

If it doesn't I guess it's better if you resubmit the proposal with that branch as prerequisite...

[Brandon Schaefer (brandontschaefer)]

> Ops, it seems you're touching also ApplicationLauncherIcon.cpp, due to mergig
> with other fix... :)
>
> 26 + std::string const FONT = "Ubuntu Light 12";
>
> I would have preferred if you left the const TYPE as discussed...
>
>
> 42 + , texture_size_(-1)
> GetDefaultMaxTextureSize(texture_prefix);
>
> The gdk_pixbuf_get_file_info is cached anyway, so imho you don't need to track
> the texture_size_... I'd just make GetDefaultMaxTextureSize to return a
> RawPixel. Otherwise, change the Get prefix, as it might imply it would return
> something.
>

Fixed.

> 156 +#include <unity-shared/UScreen.h>
>
> I guess you don't need that anymore, right?

Fixed.

>
> 155 +#include <unity-shared/RawPixel.h>
> Also this one is now implicit by including the SessionButton

Still best to keep the header there.

>
> 225 + monitor.changed.connect([this] (bool changed) {
>
> Not really a bug as bool's are int's, but that should be an (int monitor) :)
>

Fixed.

> Running it, now works properly, but I think that at this point we should also
> scale the Close button, as it might be very tiny on HiDpi monitors (and at
> this point borders as well).

[Brandon Schaefer (brandontschaefer)]

And it merges cleanly with andyrocks branch

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3796
http://jenkins.qa.ubuntu.com/job/unity-ci/917/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/4/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

Ok, I think we're done :)

You know, I would have loved to get also the invalidated textures to be cleaned up, but that's still a corner case, that won't hit most of people (unless they don't change the scale settings), so I'm fine with this.
Thanks!

review: Approve

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

Even better! :)

Approve²

review: Approve

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2014-03-25 19:07:36 +0000
+++ launcher/SwitcherView.cpp	2014-05-14 15:52:49 +0000
@@ -37,7 +37,7 @@
 
 namespace
 {
-  unsigned int const VERTICAL_PADDING = 45;
+  RawPixel const VERTICAL_PADDING = 45_em;
   unsigned int const SPREAD_OFFSET = 100;
   unsigned int const EXTRA_ICON_SPACE = 10;
   unsigned int const MAX_DIRECTIONS_CHANGED = 3;
@@ -52,10 +52,9 @@
   , icon_size(128)
   , minimum_spacing(10)
   , tile_size(150)
-  , vertical_size(tile_size + VERTICAL_PADDING * 2)
+  , vertical_size(tile_size + VERTICAL_PADDING.CP(scale()) * 2)
   , text_size(15)
   , animation_length(250)
-  , monitor(-1)
   , spread_size(3.5f)
   , icon_renderer_(renderer)
   , text_view_(new StaticCairoText(""))
@@ -73,8 +72,9 @@
   text_view_->SetTextColor(nux::color::White);
   text_view_->SetFont("Ubuntu Bold 10");
 
-  icon_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnIconSizeChanged));
-  tile_size.changed.connect (sigc::mem_fun (this, &SwitcherView::OnTileSizeChanged));
+  icon_size.changed.connect(sigc::mem_fun(this, &SwitcherView::OnIconSizeChanged));
+  tile_size.changed.connect(sigc::mem_fun(this, &SwitcherView::OnTileSizeChanged));
+  scale.changed.connect(sigc::mem_fun(this, &SwitcherView::OnScaleChanged));
 
   mouse_move.connect (sigc::mem_fun(this, &SwitcherView::RecvMouseMove));
   mouse_down.connect (sigc::mem_fun(this, &SwitcherView::RecvMouseDown));
@@ -164,15 +164,20 @@
     text_view_->SetText(model->Selection()->tooltip_text(), true);
 }
 
-void SwitcherView::OnIconSizeChanged (int size)
-{
-  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
-}
-
-void SwitcherView::OnTileSizeChanged (int size)
-{
-  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
-  vertical_size = tile_size + VERTICAL_PADDING * 2;
+void SwitcherView::OnIconSizeChanged(int size)
+{
+  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
+}
+
+void SwitcherView::OnTileSizeChanged(int size)
+{
+  icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
+  vertical_size = tile_size + VERTICAL_PADDING.CP(scale()) * 2;
+}
+
+void SwitcherView::OnScaleChanged(double scale)
+{
+  vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
 }
 
 void SwitcherView::StartAnimation()
@@ -699,7 +704,10 @@
   background_geo.height = vertical_size;
 
   if (text_view_->IsVisible())
+  {
     background_geo.height += text_size;
+    text_view_->SetBaseY(background_geo.y + background_geo.height - VERTICAL_PADDING.CP(scale()));
+  }
 
   if (model_)
   {
@@ -953,7 +961,6 @@
   if (text_view_->IsVisible())
   {
     nux::GetPainter().PushPaintLayerStack();
-    text_view_->SetBaseY(last_background_.y + last_background_.height - 45);
     text_view_->Draw(GfxContext, force_draw);
     nux::GetPainter().PopPaintLayerStack();
   }

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2014-03-25 19:07:36 +0000
+++ launcher/SwitcherView.h	2014-05-14 15:52:49 +0000
@@ -65,7 +65,6 @@
   nux::Property<int> vertical_size;
   nux::Property<int> text_size;
   nux::Property<int> animation_length;
-  nux::Property<int> monitor;
   nux::Property<double> spread_size;
 
   void SkipAnimation();
@@ -135,8 +134,9 @@
   void OnDetailSelectionChanged (bool detail);
   void OnDetailSelectionIndexChanged (unsigned int index);
 
-  void OnIconSizeChanged (int size);
-  void OnTileSizeChanged (int size);
+  void OnIconSizeChanged(int size);
+  void OnTileSizeChanged(int size);
+  void OnScaleChanged(double scale);
 
   nux::Geometry UpdateRenderTargets(float progress);
   void ResizeRenderTargets(nux::Geometry const& layout_geo, float progress);

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2014-04-05 20:09:17 +0000
+++ shortcuts/ShortcutController.cpp	2014-05-14 15:52:49 +0000
@@ -75,9 +75,7 @@
   if (Visible())
   {
     model->Fill();
-    auto uscreen = UScreen::GetDefault();
-    int monitor = uscreen->GetMonitorAtPosition(view_window_->GetX(), view_window_->GetX());
-    auto const& offset = GetOffsetPerMonitor(monitor);
+    auto const& offset = GetOffsetPerMonitor(view_->monitor());
 
     if (offset.x < 0 || offset.y < 0)
     {
@@ -110,8 +108,8 @@
   modeller_->GetCurrentModel()->Fill();
   EnsureView();
 
-  int monitor = UScreen::GetDefault()->GetMonitorWithMouse();
-  auto const& offset = GetOffsetPerMonitor(monitor);
+  view_->monitor = UScreen::GetDefault()->GetMonitorWithMouse();
+  auto const& offset = GetOffsetPerMonitor(view_->monitor());
 
   if (offset.x < 0 || offset.y < 0)
     return false;

=== modified file 'shutdown/SessionButton.cpp'
--- shutdown/SessionButton.cpp	2014-02-25 01:07:06 +0000
+++ shutdown/SessionButton.cpp	2014-05-14 15:52:49 +0000
@@ -30,15 +30,15 @@
 
 namespace style
 {
-  const std::string FONT = "Ubuntu Light 12";
-
-  const unsigned BUTTON_SPACE = 9;
+  std::string const FONT = "Ubuntu Light 12";
+  RawPixel const BUTTON_SPACE = 9_em;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(Button);
 
 Button::Button(Action action, NUX_FILE_LINE_DECL)
   : nux::View(NUX_FILE_LINE_PARAM)
+  , scale(1.0)
   , highlighted(false)
   , action([this] { return action_; })
   , label([this] { return label_view_->GetText(); })
@@ -78,14 +78,21 @@
       break;
   }
 
-  normal_tex_.Adopt(nux::CreateTexture2DFromFile((texture_prefix + ".png").c_str(), -1, true));
-  highlight_tex_.Adopt(nux::CreateTexture2DFromFile((texture_prefix + "_highlight.png").c_str(), -1, true));
+  UpdateTextures(texture_prefix);
 
   auto main_layout = new nux::VLayout();
   main_layout->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
   main_layout->SetSpaceBetweenChildren(style::BUTTON_SPACE);
   SetLayout(main_layout);
 
+  scale.changed.connect([this, main_layout, texture_prefix] (double new_scale) {
+    main_layout->SetSpaceBetweenChildren(style::BUTTON_SPACE.CP(new_scale));
+    label_view_->SetScale(new_scale);
+
+    UpdateTextures(texture_prefix);
+    image_view_->SetTexture(highlighted ? highlight_tex_ : normal_tex_);
+  });
+
   image_view_ = new IconTexture(normal_tex_);
   image_view_->SetInputEventSensitivity(false);
   main_layout->AddView(image_view_, 1, nux::MINOR_POSITION_CENTER);
@@ -111,6 +118,24 @@
   });
 }
 
+void Button::UpdateTextures(std::string const& texture_prefix)
+{
+  RawPixel const texture_size = GetDefaultMaxTextureSize(texture_prefix);
+
+  normal_tex_.Adopt(nux::CreateTexture2DFromFile((texture_prefix + ".png").c_str(), texture_size.CP(scale), true));
+  highlight_tex_.Adopt(nux::CreateTexture2DFromFile((texture_prefix + "_highlight.png").c_str(), texture_size.CP(scale), true));
+}
+
+RawPixel Button::GetDefaultMaxTextureSize(std::string const& texture_prefix) const
+{
+  nux::Size size;
+  auto const& texture_name = (texture_prefix + ".png");
+  gdk_pixbuf_get_file_info(texture_name.c_str(), &size.width, &size.height);
+  RawPixel max_size = std::max(size.width, size.height);
+
+  return max_size;
+}
+
 void Button::Draw(nux::GraphicsEngine& ctx, bool force)
 {
   GetLayout()->ProcessDraw(ctx, force);

=== modified file 'shutdown/SessionButton.h'
--- shutdown/SessionButton.h	2014-02-25 01:07:06 +0000
+++ shutdown/SessionButton.h	2014-05-14 15:52:49 +0000
@@ -26,6 +26,7 @@
 
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/Introspectable.h"
+#include "unity-shared/RawPixel.h"
 #include "unity-shared/StaticCairoText.h"
 
 namespace unity
@@ -49,6 +50,7 @@
 
   Button(Action, NUX_FILE_LINE_PROTO);
 
+  nux::Property<double> scale;
   nux::Property<bool> highlighted;
   nux::ROProperty<Action> action;
   nux::ROProperty<std::string> label;
@@ -65,6 +67,9 @@
 private:
   friend class TestSessionButton;
 
+  void UpdateTextures(std::string const& texture_prefix);
+  RawPixel GetDefaultMaxTextureSize(std::string const& texture_prefix) const;
+
   Action action_;
   IconTexture* image_view_;
   StaticCairoText* label_view_;

=== modified file 'shutdown/SessionController.cpp'
--- shutdown/SessionController.cpp	2014-04-30 14:59:29 +0000
+++ shutdown/SessionController.cpp	2014-05-14 15:52:49 +0000
@@ -151,6 +151,8 @@
   {
     view_->size_changed.connect([this] (nux::Area*, int, int) {
       int monitor = UScreen::GetDefault()->GetMonitorWithMouse();
+      view_->monitor = monitor;
+
       auto const& offset = GetOffsetPerMonitor(monitor);
       view_window_->SetXY(offset.x, offset.y);
     });

=== modified file 'shutdown/SessionView.cpp'
--- shutdown/SessionView.cpp	2014-05-09 16:08:36 +0000
+++ shutdown/SessionView.cpp	2014-05-14 15:52:49 +0000
@@ -20,10 +20,11 @@
 #include "SessionView.h"
 #include "SessionButton.h"
 
-#include <Nux/VLayout.h>
 #include <UnityCore/GLibWrapper.h>
 #include <glib/gi18n-lib.h>
 
+#include "unity-shared/RawPixel.h"
+
 namespace unity
 {
 namespace session
@@ -31,15 +32,15 @@
 
 namespace style
 {
-  const std::string FONT = "Ubuntu Light";
-  const std::string TITLE_FONT = FONT+" 15";
-  const std::string SUBTITLE_FONT = FONT+" 12";
+  std::string const FONT = "Ubuntu Light";
+  std::string const TITLE_FONT = FONT+" 15";
+  std::string const SUBTITLE_FONT = FONT+" 12";
 
-  const unsigned LEFT_RIGHT_PADDING = 30;
-  const unsigned TOP_PADDING = 19;
-  const unsigned BOTTOM_PADDING = 12;
-  const unsigned MAIN_SPACE = 10;
-  const unsigned BUTTONS_SPACE = 20;
+  RawPixel const LEFT_RIGHT_PADDING = 30_em;
+  RawPixel const TOP_PADDING        = 19_em;
+  RawPixel const BOTTOM_PADDING     = 12_em;
+  RawPixel const MAIN_SPACE         = 10_em;
+  RawPixel const BUTTONS_SPACE      = 20_em;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(View);
@@ -51,18 +52,15 @@
   , key_focus_area_(this)
 {
   closable = true;
-  auto main_layout = new nux::VLayout();
-  main_layout->SetTopAndBottomPadding(style::TOP_PADDING, style::BOTTOM_PADDING);
-  main_layout->SetLeftAndRightPadding(style::LEFT_RIGHT_PADDING);
-  main_layout->SetSpaceBetweenChildren(style::MAIN_SPACE);
-  SetLayout(main_layout);
+  main_layout_ = new nux::VLayout();
+  SetLayout(main_layout_);
 
   title_ = new StaticCairoText("");
   title_->SetFont(style::TITLE_FONT);
   title_->SetTextAlignment(StaticCairoText::AlignState::NUX_ALIGN_LEFT);
   title_->SetInputEventSensitivity(false);
   title_->SetVisible(false);
-  main_layout->AddView(title_);
+  main_layout_->AddView(title_);
 
   subtitle_ = new StaticCairoText("");
   subtitle_->SetFont(style::SUBTITLE_FONT);
@@ -70,11 +68,10 @@
   subtitle_->SetInputEventSensitivity(false);
   subtitle_->SetLines(std::numeric_limits<int>::min());
   subtitle_->SetLineSpacing(2);
-  main_layout->AddView(subtitle_);
+  main_layout_->AddView(subtitle_);
 
   buttons_layout_ = new nux::HLayout();
-  buttons_layout_->SetSpaceBetweenChildren(style::BUTTONS_SPACE);
-  main_layout->AddLayout(buttons_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_PERCENTAGE, 0.0f);
+  main_layout_->AddLayout(buttons_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_PERCENTAGE, 0.0f);
 
   GetBoundingArea()->mouse_click.connect([this] (int, int, unsigned long, unsigned long) { request_close.emit(); });
 
@@ -99,10 +96,33 @@
     Populate();
   });
 
+  scale.changed.connect(sigc::hide(sigc::mem_fun(this, &View::UpdateViewSize)));
+
+  UpdateViewSize();
   UpdateText();
   Populate();
 }
 
+void View::UpdateViewSize()
+{
+  main_layout_->SetTopAndBottomPadding(style::TOP_PADDING.CP(scale()), style::BOTTOM_PADDING.CP(scale()));
+  main_layout_->SetLeftAndRightPadding(style::LEFT_RIGHT_PADDING.CP(scale()));
+  main_layout_->SetSpaceBetweenChildren(style::MAIN_SPACE.CP(scale()));
+
+  title_->SetScale(scale());
+  subtitle_->SetScale(scale());
+
+  ReloadCloseButtonTexture();
+
+  buttons_layout_->SetSpaceBetweenChildren(style::BUTTONS_SPACE.CP(scale()));
+
+  for (auto* area : buttons_layout_->GetChildren())
+  {
+    auto* button = static_cast<Button*>(area);
+    button->scale = scale();
+  }
+}
+
 void View::UpdateText()
 {
   std::string message;
@@ -190,6 +210,7 @@
   if (mode() == Mode::LOGOUT)
   {
     auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
+    button->scale = scale();
     button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
     AddButton(button);
 
@@ -203,12 +224,14 @@
     if (mode() == Mode::FULL)
     {
       auto* button = new Button(Button::Action::LOCK, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::LockScreen));
       AddButton(button);
 
       if (manager_->CanSuspend())
       {
         button = new Button(Button::Action::SUSPEND, NUX_TRACKER_LOCATION);
+        button->scale = scale();
         button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Suspend));
         AddButton(button);
       }
@@ -216,6 +239,7 @@
       if (manager_->CanHibernate())
       {
         button = new Button(Button::Action::HIBERNATE, NUX_TRACKER_LOCATION);
+        button->scale = scale();
         button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Hibernate));
         AddButton(button);
       }
@@ -224,10 +248,12 @@
     if (manager_->CanShutdown())
     {
       auto *button = new Button(Button::Action::REBOOT, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Reboot));
       AddButton(button);
 
       button = new Button(Button::Action::SHUTDOWN, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Shutdown));
       key_focus_area_ = (mode() == Mode::SHUTDOWN) ? button : key_focus_area_;
       AddButton(button);
@@ -235,6 +261,7 @@
     else if (mode() == Mode::FULL)
     {
       auto* button = new Button(Button::Action::LOGOUT, NUX_TRACKER_LOCATION);
+      button->scale = scale();
       button->activated.connect(sigc::mem_fun(manager_.get(), &Manager::Logout));
       AddButton(button);
     }

=== modified file 'shutdown/SessionView.h'
--- shutdown/SessionView.h	2013-11-20 21:39:40 +0000
+++ shutdown/SessionView.h	2014-05-14 15:52:49 +0000
@@ -22,9 +22,11 @@
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
+#include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 
 #include "UnityCore/SessionManager.h"
+#include "unity-shared/EMConverter.h"
 #include "unity-shared/UnityWindowView.h"
 #include "UnityCore/SessionManager.h"
 
@@ -71,6 +73,8 @@
 private:
   friend class TestSessionView;
 
+  void UpdateViewSize();
+
   void UpdateText();
   void Populate();
   void AddButton(Button*);
@@ -78,6 +82,7 @@
   Manager::Ptr manager_;
   StaticCairoText* title_;
   StaticCairoText* subtitle_;
+  nux::VLayout* main_layout_;
   nux::HLayout* buttons_layout_;
   nux::InputArea* key_focus_area_;
 };

=== modified file 'tests/test_switcher_view.cpp'
--- tests/test_switcher_view.cpp	2014-03-25 19:07:36 +0000
+++ tests/test_switcher_view.cpp	2014-05-14 15:52:49 +0000
@@ -117,7 +117,7 @@
   EXPECT_EQ(switcher.vertical_size, switcher.tile_size + VERTICAL_PADDING * 2);
   EXPECT_EQ(switcher.text_size, 15);
   EXPECT_EQ(switcher.animation_length, 250);
-  EXPECT_EQ(switcher.monitor, -1);
+  EXPECT_EQ(switcher.monitor, 0);
   EXPECT_EQ(switcher.spread_size, 3.5f);
   ASSERT_NE(switcher.text_view_, nullptr);
   ASSERT_NE(switcher.icon_renderer_, nullptr);

=== modified file 'tests/test_unity_window_view.cpp'
--- tests/test_unity_window_view.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_unity_window_view.cpp	2014-05-14 15:52:49 +0000
@@ -82,10 +82,10 @@
   view.closable = true;
   ASSERT_NE(view.close_button_, nullptr);
 
-  EXPECT_EQ(view.close_button_->texture(), view.style()->GetCloseIcon());
+  EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON));
   EXPECT_EQ(view.close_button_->GetParentObject(), &view);
 
-  int padding = view.style()->GetCloseButtonPadding();
+  int padding = view.style()->GetCloseButtonPadding(view.scale);
   EXPECT_EQ(view.close_button_->GetBaseX(), padding);
   EXPECT_EQ(view.close_button_->GetBaseY(), padding);
 }
@@ -96,16 +96,16 @@
   ASSERT_NE(view.close_button_, nullptr);
 
   view.close_button_->mouse_enter.emit(0, 0, 0, 0);
-  EXPECT_EQ(view.close_button_->texture(), view.style()->GetCloseIconHighligted());
+  EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON_HIGHLIGHTED));
 
   view.close_button_->mouse_leave.emit(0, 0, 0, 0);
-  EXPECT_EQ(view.close_button_->texture(), view.style()->GetCloseIcon());
+  EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON));
 
   view.close_button_->mouse_down.emit(0, 0, 0, 0);
-  EXPECT_EQ(view.close_button_->texture(), view.style()->GetCloseIconPressed());
+  EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON_PRESSED));
 
   view.close_button_->mouse_up.emit(0, 0, 0, 0);
-  EXPECT_EQ(view.close_button_->texture(), view.style()->GetCloseIcon());
+  EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON));
 }
 
 TEST_F(TestUnityWindowView, CloseButtonClicksRequestsClose)
@@ -185,7 +185,7 @@
   view.SetLayout(layout);
   view.ComputeContentSize();
 
-  int offset = view.style()->GetInternalOffset();
+  int offset = view.style()->GetInternalOffset(view.scale);
   EXPECT_EQ(layout->GetBaseX(), offset);
   EXPECT_EQ(layout->GetBaseY(), offset);
 }
@@ -199,7 +199,7 @@
 
 TEST_F(TestUnityWindowView, GetInternalBackground)
 {
-  int offset = view.style()->GetInternalOffset();
+  int offset = view.style()->GetInternalOffset(view.scale);
   view.background_geo_.Set(g_random_int(), g_random_int(), g_random_int(), g_random_int());
   EXPECT_EQ(view.GetInternalBackground(), view.background_geo_.GetExpand(-offset, -offset));
 }
@@ -240,4 +240,4 @@
 }
 
 } // ui
-} // unity
\ No newline at end of file
+} // unity

=== modified file 'unity-shared/EMConverter.cpp'
--- unity-shared/EMConverter.cpp	2014-02-27 04:54:19 +0000
+++ unity-shared/EMConverter.cpp	2014-05-14 15:52:49 +0000
@@ -17,6 +17,7 @@
  * Authored by: Brandon Schaefer <[e-mail]>
  */
 
+#include <cmath>
 #include "EMConverter.h"
 
 namespace unity
@@ -104,8 +105,7 @@
 
 double EMConverter::CP(int pixels) const
 {
-  double pixels_em = PixelsToBaseEM(pixels);
-  return EMToPixels(pixels_em);
+  return std::round(pixels * DPIScale());
 }
 
 double EMConverter::DPIScale() const

=== modified file 'unity-shared/RawPixel.cpp'
--- unity-shared/RawPixel.cpp	2014-02-26 00:01:21 +0000
+++ unity-shared/RawPixel.cpp	2014-05-14 15:52:49 +0000
@@ -39,7 +39,7 @@
 
 int RawPixel::CP(EMConverter::Ptr const& converter) const
 {
-  return std::round(converter->CP(raw_pixel_));
+  return converter->CP(raw_pixel_);
 }
 
 int RawPixel::CP(double scale) const

=== modified file 'unity-shared/UnityWindowStyle.cpp'
--- unity-shared/UnityWindowStyle.cpp	2013-12-11 02:24:29 +0000
+++ unity-shared/UnityWindowStyle.cpp	2014-05-14 15:52:49 +0000
@@ -16,19 +16,114 @@
  *
  * Authored by: Jason Smith <[e-mail]>
  *              Marco Trevisan <[e-mail]>
+ *              Brandon Schaefer <[e-mail]>
  */
 
+#include <NuxCore/Logger.h>
+
+#include "UnitySettings.h"
 #include "UnityWindowStyle.h"
+#include "UScreen.h"
 #include "config.h"
 
-namespace unity {
-namespace ui {
+#include <unordered_set>
+
+namespace unity
+{
+namespace ui
+{
+namespace
+{
+  const char* const SWITCHER_TOP    = PKGDATADIR"/switcher_top.png";
+  const char* const SWITCHER_LEFT   = PKGDATADIR"/switcher_left.png";
+  const char* const SWITCHER_CORNER = PKGDATADIR"/switcher_corner.png";
+
+  const char* const DIALOG_CLOSE     = PKGDATADIR"/dialog_close.png";
+  const char* const DIALOG_HIGHLIGHT = PKGDATADIR"/dialog_close_highlight.png";
+  const char* const DIALOG_PRESS     = PKGDATADIR"/dialog_close_press.png";
+
+
+  RawPixel const INTERNAL_OFFSET = 20_em;
+  RawPixel const BORDER_SIZE     = 30_em;
+  RawPixel const CLOSE_PADDING   =  3_em;
+}
+
+DECLARE_LOGGER(logger, "unity.ui.unity.window.style");
+
 
 UnityWindowStyle::UnityWindowStyle()
 {
-  background_top_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/switcher_top.png", -1, true));
-  background_left_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/switcher_left.png", -1, true));
-  background_corner_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/switcher_corner.png", -1, true));
+  unsigned monitors = UScreen::GetDefault()->GetPluggedMonitorsNumber();
+  auto& settings = Settings::Instance();
+
+  // Pre-load scale values per monitor
+  for (unsigned i = 0; i < monitors; ++i)
+  {
+    double scale = settings.Instance().em(i)->DPIScale();
+
+    if (unity_window_textures_.find(scale) == unity_window_textures_.end())
+      LoadAllTextureInScale(scale);
+  }
+
+  settings.Instance().dpi_changed.connect(sigc::mem_fun(this, &UnityWindowStyle::CleanUpUnusedTextures));
+  UScreen::GetDefault()->changed.connect(sigc::mem_fun(this, &UnityWindowStyle::OnMonitorChanged));
+}
+
+void UnityWindowStyle::LoadAllTextureInScale(double scale)
+{
+  auto& window_textures = unity_window_textures_[scale];
+
+  window_textures[unsigned(WindowTextureType::BACKGROUND_TOP)]    = LoadTexture(scale, SWITCHER_TOP);
+  window_textures[unsigned(WindowTextureType::BACKGROUND_LEFT)]   = LoadTexture(scale, SWITCHER_LEFT);
+  window_textures[unsigned(WindowTextureType::BACKGROUND_CORNER)] = LoadTexture(scale, SWITCHER_CORNER);
+
+  window_textures[unsigned(WindowTextureType::CLOSE_ICON)]             = LoadTexture(scale, DIALOG_CLOSE);
+  window_textures[unsigned(WindowTextureType::CLOSE_ICON_HIGHLIGHTED)] = LoadTexture(scale, DIALOG_HIGHLIGHT);
+  window_textures[unsigned(WindowTextureType::CLOSE_ICON_PRESSED)]     = LoadTexture(scale, DIALOG_PRESS);
+}
+
+nux::BaseTexture* UnityWindowStyle::LoadTexture(double scale, const char* const texture_name) const
+{
+  RawPixel max_size = GetDefaultMaxTextureSize(texture_name);
+  return nux::CreateTexture2DFromFile(texture_name, max_size.CP(scale), true);
+}
+
+RawPixel UnityWindowStyle::GetDefaultMaxTextureSize(const char* const texture_name) const
+{
+  nux::Size size;
+  gdk_pixbuf_get_file_info(texture_name, &size.width, &size.height);
+  RawPixel max_size = std::max(std::round(size.width), std::round(size.height));
+
+  return max_size;
+}
+
+void UnityWindowStyle::OnMonitorChanged(int primary, std::vector<nux::Geometry> const& monitors)
+{
+  CleanUpUnusedTextures();
+}
+
+// Get current in use scale values, if a scaled value is allocated, but
+// not in use clean up the scaled textures in unity_window_textures
+void UnityWindowStyle::CleanUpUnusedTextures()
+{
+  unsigned monitors = UScreen::GetDefault()->GetPluggedMonitorsNumber();
+  auto& settings = Settings::Instance();
+  std::unordered_set<double> used_scales;
+
+  for (unsigned i = 0; i < monitors; ++i)
+    used_scales.insert(settings.em(i)->DPIScale());
+
+  for (auto it = unity_window_textures_.begin(); it != unity_window_textures_.end();)
+  {
+    if (used_scales.find(it->first) == used_scales.end())
+    {
+      it = unity_window_textures_.erase(it);
+    }
+    else
+    {
+      ++it;
+    }
+  }
 }
 
 UnityWindowStyle::Ptr const& UnityWindowStyle::Get()
@@ -38,60 +133,38 @@
   return instance;
 }
 
-int UnityWindowStyle::GetBorderSize() const
-{
-  return 30; // as measured from textures
-}
-
-int UnityWindowStyle::GetInternalOffset() const
-{
-  return 20;
-}
-
-int UnityWindowStyle::GetCloseButtonPadding() const
-{
-  return 3;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetCloseIcon()
-{
-  if (!close_icon_)
-    close_icon_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/dialog_close.png", -1, true));
-
-  return close_icon_;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetCloseIconHighligted()
-{
-  if (!close_icon_highlighted_)
-    close_icon_highlighted_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/dialog_close_highlight.png", -1, true));
-
-  return close_icon_highlighted_;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetCloseIconPressed()
-{
-  if (!close_icon_pressed_)
-    close_icon_pressed_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/dialog_close_press.png", -1, true));
-
-  return close_icon_pressed_;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetBackgroundTop() const
-{
-  return background_top_;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetBackgroundLeft() const
-{
-  return background_left_;
-}
-
-UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetBackgroundCorner() const
-{
-  return background_corner_;
-}
-
-
-}
-}
+int UnityWindowStyle::GetBorderSize(double scale) const
+{
+  return BORDER_SIZE.CP(scale); // as measured from textures
+}
+
+int UnityWindowStyle::GetInternalOffset(double scale) const
+{
+  return INTERNAL_OFFSET.CP(scale);
+}
+
+int UnityWindowStyle::GetCloseButtonPadding(double scale) const
+{
+  return CLOSE_PADDING.CP(scale);
+}
+
+UnityWindowStyle::BaseTexturePtr UnityWindowStyle::GetTexture(double scale, WindowTextureType const& type)
+{
+  auto it = unity_window_textures_.find(scale);
+  if (it == unity_window_textures_.end())
+  {
+    LoadAllTextureInScale(scale);
+
+    it = unity_window_textures_.find(scale);
+    if (it == unity_window_textures_.end())
+    {
+      LOG_ERROR(logger) << "Failed to create unity window style textures, for scale size: " << scale;
+      return BaseTexturePtr(nullptr);
+    }
+  }
+
+  return it->second[unsigned(type)];
+}
+
+} // namespace ui
+} // namespace unity

=== modified file 'unity-shared/UnityWindowStyle.h'
--- unity-shared/UnityWindowStyle.h	2013-12-11 02:24:29 +0000
+++ unity-shared/UnityWindowStyle.h	2014-05-14 15:52:49 +0000
@@ -16,6 +16,7 @@
  *
  * Authored by: Jason Smith <[e-mail]>
  *              Marco Trevisan <[e-mail]>
+ *              Brandon Schaefer <[e-mail]>
  */
 
 #ifndef UNITYWINDOWSTYLE_H
@@ -24,8 +25,23 @@
 #include <sigc++/sigc++.h>
 #include <Nux/Nux.h>
 
-namespace unity {
-namespace ui {
+#include "RawPixel.h"
+
+namespace unity
+{
+namespace ui
+{
+
+enum class WindowTextureType : unsigned
+{
+  BACKGROUND_TOP,
+  BACKGROUND_LEFT,
+  BACKGROUND_CORNER,
+  CLOSE_ICON,
+  CLOSE_ICON_HIGHLIGHTED,
+  CLOSE_ICON_PRESSED,
+  Size
+};
 
 class UnityWindowStyle
 {
@@ -35,29 +51,28 @@
 
   static UnityWindowStyle::Ptr const& Get();
 
-  BaseTexturePtr GetCloseIcon();
-  BaseTexturePtr GetCloseIconHighligted();
-  BaseTexturePtr GetCloseIconPressed();
-  int GetCloseButtonPadding() const;
-
-  BaseTexturePtr GetBackgroundTop() const;
-  BaseTexturePtr GetBackgroundLeft() const;
-  BaseTexturePtr GetBackgroundCorner() const;
-  int GetBorderSize() const;
-  int GetInternalOffset() const;
+  BaseTexturePtr GetTexture(double scale, WindowTextureType const& type);
+  int GetCloseButtonPadding(double scale) const;
+  int GetBorderSize(double scale) const;
+  int GetInternalOffset(double scale) const;
 
 private:
   UnityWindowStyle();
 
-  BaseTexturePtr background_top_;
-  BaseTexturePtr background_left_;
-  BaseTexturePtr background_corner_;
-  BaseTexturePtr close_icon_;
-  BaseTexturePtr close_icon_highlighted_;
-  BaseTexturePtr close_icon_pressed_;
+  void ReloadIcons();
+  void LoadAllTextureInScale(double scale);
+  nux::BaseTexture* LoadTexture(double scale, const char* const texture_name) const;
+  RawPixel GetDefaultMaxTextureSize(const char* const texture_name) const;
+ 
+  void OnMonitorChanged(int primary, std::vector<nux::Geometry> const& monitors);
+  void CleanUpUnusedTextures();
+
+  typedef std::array<BaseTexturePtr, size_t(WindowTextureType::Size)> UnityWindowTextures;
+  std::unordered_map<double, UnityWindowTextures> unity_window_textures_;
+
 };
 
-}
-}
+} // namespace ui
+} // namespace unity
 
 #endif

=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2014-02-05 12:19:45 +0000
+++ unity-shared/UnityWindowView.cpp	2014-05-14 15:52:49 +0000
@@ -32,6 +32,8 @@
   : View(NUX_FILE_LINE_PARAM)
   , style(UnityWindowStyle::Get())
   , closable(false)
+  , monitor(0)
+  , scale(Settings::Instance().em()->DPIScale())
   , internal_layout_(nullptr)
   , bg_helper_(this)
 {
@@ -47,6 +49,8 @@
 
   live_background = false;
 
+  monitor.changed.connect(sigc::hide(sigc::mem_fun(this, &UnityWindowView::OnDPIChanged)));
+  Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &UnityWindowView::OnDPIChanged));
   closable.changed.connect(sigc::mem_fun(this, &UnityWindowView::OnClosableChanged));
   background_color.changed.connect(sigc::hide(sigc::mem_fun(this, &View::QueueDraw)));
 }
@@ -60,6 +64,17 @@
     bounding_area_->UnParentObject();
 }
 
+void UnityWindowView::OnDPIChanged()
+{
+  scale = Settings::Instance().em(monitor())->DPIScale();
+
+  if (internal_layout_)
+  {
+    int offset = style()->GetInternalOffset(scale);
+    view_layout_->SetPadding(offset, offset);
+  }
+}
+
 void UnityWindowView::SetBackgroundHelperGeometryGetter(BackgroundEffectHelper::GeometryGetterFunc const& func)
 {
   bg_helper_.SetGeometryGetter(func);
@@ -109,6 +124,11 @@
   return View::FindKeyFocusArea(etype, key_code, modifiers);
 }
 
+void UnityWindowView::ReloadCloseButtonTexture()
+{
+  OnClosableChanged(closable);
+}
+
 void UnityWindowView::OnClosableChanged(bool closable)
 {
   if (!closable)
@@ -117,34 +137,38 @@
     return;
   }
 
-  auto const& texture = style()->GetCloseIcon();
-  int padding = style()->GetCloseButtonPadding();
+  auto const& texture = style()->GetTexture(scale, WindowTextureType::CLOSE_ICON);
+  int padding = style()->GetCloseButtonPadding(scale);
+
   close_button_ = new IconTexture(texture);
   close_button_->SetBaseXY(padding, padding);
   close_button_->SetParentObject(this);
 
   close_button_->mouse_enter.connect([this](int, int, unsigned long, unsigned long) {
     if (close_button_->IsMouseOwner())
-      close_button_->SetTexture(style()->GetCloseIconPressed());
+      close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON_PRESSED));
     else
-      close_button_->SetTexture(style()->GetCloseIconHighligted());
+      close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON_HIGHLIGHTED));
   });
 
   close_button_->mouse_leave.connect([this](int, int, unsigned long, unsigned long) {
-    close_button_->SetTexture(style()->GetCloseIcon());
+    close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON));
   });
 
   close_button_->mouse_down.connect([this](int, int, unsigned long, unsigned long) {
-    close_button_->SetTexture(style()->GetCloseIconPressed());
+    close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON_PRESSED));
   });
 
   close_button_->mouse_up.connect([this](int, int, unsigned long, unsigned long) {
     bool inside = close_button_->IsMouseInside();
-    close_button_->SetTexture(inside ? style()->GetCloseIconHighligted() : style()->GetCloseIcon());
+    if (inside)
+      close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON_HIGHLIGHTED));
+    else
+      close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON));
   });
 
   close_button_->mouse_click.connect([this](int, int, unsigned long, unsigned long) {
-    close_button_->SetTexture(style()->GetCloseIcon());
+    close_button_->SetTexture(style()->GetTexture(scale, WindowTextureType::CLOSE_ICON));
     request_close.emit();
   });
 
@@ -155,7 +179,7 @@
 {
   if (layout && layout->IsLayout())
   {
-    int offset = style()->GetInternalOffset();
+    int offset = style()->GetInternalOffset(scale);
 
     // We wrap the internal layout adding some padding, so that inherited classes
     // can ignore the offsets we define here.
@@ -180,7 +204,8 @@
 
 nux::Geometry UnityWindowView::GetInternalBackground()
 {
-  int offset = style()->GetInternalOffset();
+  int offset = style()->GetInternalOffset(scale);
+
   return GetBackgroundGeometry().GetExpand(-offset, -offset);
 }
 
@@ -330,7 +355,9 @@
 
 void UnityWindowView::DrawBackground(nux::GraphicsEngine& GfxContext, nux::Geometry const& geo)
 {
-  int border = style()->GetBorderSize();
+  int border = style()->GetBorderSize(scale);
+
+  auto background_corner_textrue = style()->GetTexture(scale, WindowTextureType::BACKGROUND_CORNER)->GetDeviceTexture();
 
   GfxContext.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -344,7 +371,7 @@
   texxform.u1 = border;
   texxform.v1 = border;
   GfxContext.QRP_1Tex (geo.x, geo.y,
-                       border, border, style()->GetBackgroundCorner()->GetDeviceTexture(), texxform, nux::color::White);
+                       border, border, background_corner_textrue, texxform, nux::color::White);
 
   // Draw TOP-RIGHT CORNER
   texxform.u0 = 0;
@@ -354,7 +381,7 @@
   texxform.flip_u_coord = true;
   texxform.flip_v_coord = false;
   GfxContext.QRP_1Tex (geo.x + geo.width - border, geo.y,
-                       border, border, style()->GetBackgroundCorner()->GetDeviceTexture(), texxform, nux::color::White);
+                       border, border, background_corner_textrue, texxform, nux::color::White);
 
   // Draw BOTTOM-LEFT CORNER
   texxform.u0 = 0;
@@ -364,7 +391,7 @@
   texxform.flip_u_coord = false;
   texxform.flip_v_coord = true;
   GfxContext.QRP_1Tex (geo.x, geo.y + geo.height - border,
-                       border, border, style()->GetBackgroundCorner()->GetDeviceTexture(), texxform, nux::color::White);
+                       border, border, background_corner_textrue, texxform, nux::color::White);
 
   // Draw BOTTOM-RIGHT CORNER
   texxform.u0 = 0;
@@ -374,10 +401,11 @@
   texxform.flip_u_coord = true;
   texxform.flip_v_coord = true;
   GfxContext.QRP_1Tex (geo.x + geo.width - border, geo.y + geo.height - border,
-                       border, border, style()->GetBackgroundCorner()->GetDeviceTexture(), texxform, nux::color::White);
+                       border, border, background_corner_textrue, texxform, nux::color::White);
 
-  int top_width = style()->GetBackgroundTop()->GetWidth();
-  int top_height = style()->GetBackgroundTop()->GetHeight();
+  auto background_top = style()->GetTexture(scale, WindowTextureType::BACKGROUND_TOP);
+  int top_width  = background_top->GetWidth();
+  int top_height = background_top->GetHeight();
 
   // Draw TOP BORDER
   texxform.u0 = 0;
@@ -386,7 +414,7 @@
   texxform.v1 = top_height;
   texxform.flip_u_coord = false;
   texxform.flip_v_coord = false;
-  GfxContext.QRP_1Tex (geo.x + border, geo.y, geo.width - border - border, border, style()->GetBackgroundTop()->GetDeviceTexture(), texxform, nux::color::White);
+  GfxContext.QRP_1Tex (geo.x + border, geo.y, geo.width - border - border, border, background_top->GetDeviceTexture(), texxform, nux::color::White);
 
   // Draw BOTTOM BORDER
   texxform.u0 = 0;
@@ -395,11 +423,11 @@
   texxform.v1 = top_height;
   texxform.flip_u_coord = false;
   texxform.flip_v_coord = true;
-  GfxContext.QRP_1Tex (geo.x + border, geo.y + geo.height - border, geo.width - border - border, border, style()->GetBackgroundTop()->GetDeviceTexture(), texxform, nux::color::White);
-
-
-  int left_width = style()->GetBackgroundLeft()->GetWidth();
-  int left_height = style()->GetBackgroundLeft()->GetHeight();
+  GfxContext.QRP_1Tex (geo.x + border, geo.y + geo.height - border, geo.width - border - border, border, background_top->GetDeviceTexture(), texxform, nux::color::White);
+
+  auto background_left = style()->GetTexture(scale, WindowTextureType::BACKGROUND_LEFT);
+  int left_width  = background_left->GetWidth();
+  int left_height = background_left->GetHeight();
 
   // Draw LEFT BORDER
   texxform.u0 = 0;
@@ -408,7 +436,7 @@
   texxform.v1 = left_height;
   texxform.flip_u_coord = false;
   texxform.flip_v_coord = false;
-  GfxContext.QRP_1Tex (geo.x, geo.y + border, border, geo.height - border - border, style()->GetBackgroundLeft()->GetDeviceTexture(), texxform, nux::color::White);
+  GfxContext.QRP_1Tex (geo.x, geo.y + border, border, geo.height - border - border, background_left->GetDeviceTexture(), texxform, nux::color::White);
 
   // Draw RIGHT BORDER
   texxform.u0 = 0;
@@ -417,7 +445,7 @@
   texxform.v1 = left_height;
   texxform.flip_u_coord = true;
   texxform.flip_v_coord = false;
-  GfxContext.QRP_1Tex (geo.x + geo.width - border, geo.y + border, border, geo.height - border - border, style()->GetBackgroundLeft()->GetDeviceTexture(), texxform, nux::color::White);
+  GfxContext.QRP_1Tex (geo.x + geo.width - border, geo.y + border, border, geo.height - border - border, background_left->GetDeviceTexture(), texxform, nux::color::White);
 
   GfxContext.GetRenderStates().SetBlend(false);
 }

=== modified file 'unity-shared/UnityWindowView.h'
--- unity-shared/UnityWindowView.h	2013-11-21 16:06:58 +0000
+++ unity-shared/UnityWindowView.h	2014-05-14 15:52:49 +0000
@@ -23,6 +23,7 @@
 
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/IconTexture.h"
+
 #include "Introspectable.h"
 #include "UnityWindowStyle.h"
 #include <sigc++/sigc++.h>
@@ -41,6 +42,8 @@
   nux::Property<nux::Color> background_color;
   nux::Property<UnityWindowStyle::Ptr> style;
   nux::Property<bool> closable;
+  nux::Property<int> monitor;
+  nux::Property<double> scale;
 
   UnityWindowView(NUX_FILE_LINE_PROTO);
   virtual ~UnityWindowView();
@@ -64,6 +67,8 @@
   virtual nux::Geometry GetBlurredBackgroundGeometry();
   void SetBackgroundHelperGeometryGetter(BackgroundEffectHelper::GeometryGetterFunc const&);
 
+  void ReloadCloseButtonTexture();
+
   // Introspectable methods
   std::string GetName() const;
   void AddProperties(debug::IntrospectionData&);
@@ -71,6 +76,7 @@
 private:
   friend class TestUnityWindowView;
 
+  void OnDPIChanged();
   void OnClosableChanged(bool closable);
   void DrawBackground(nux::GraphicsEngine& GfxContext, nux::Geometry const& geo);