Merge lp:~3v1n0/unity/shortcuts-hidpi into lp:unity

[Marco Trevisan (Treviño)]

ShortcutView: use RawPixel's for the size values and convert them to match current scaling

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

Here the overlay appears different before and after the fix.

https://www.dropbox.com/s/0is33cmdjf6uj19/before.png
https://www.dropbox.com/s/9dph4shu4p3ym5r/after.png

review: Needs Fixing

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

> Here the overlay appears different before and after the fix.
>
> https://www.dropbox.com/s/0is33cmdjf6uj19/before.png
> https://www.dropbox.com/s/9dph4shu4p3ym5r/after.png

This is because both in English and many localized versions the keys
or descriptions are cut, while there's no reason to limit the
horizontal size, since most of netbooks will still be able to see it.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'shortcuts/ShortcutController.cpp'
--- shortcuts/ShortcutController.cpp	2014-05-16 00:33:37 +0000
+++ shortcuts/ShortcutController.cpp	2014-05-16 00:33:37 +0000
@@ -70,11 +70,11 @@
   if (!view_)
     return;
 
+  model->Fill();
   view_->SetModel(model);
 
   if (Visible())
   {
-    model->Fill();
     auto const& offset = GetOffsetPerMonitor(view_->monitor());
 
     if (offset.x < 0 || offset.y < 0)
 
=== modified file 'shortcuts/ShortcutView.cpp'
--- shortcuts/ShortcutView.cpp	2013-11-16 11:44:23 +0000
+++ shortcuts/ShortcutView.cpp	2014-05-16 00:33:37 +0000
@@ -38,10 +38,16 @@
   const unsigned MAIN_TITLE_FONT_SIZE = 15;
   const unsigned SECTION_NAME_FONT_SIZE = 12;
   const unsigned SHORTKEY_ENTRY_FONT_SIZE = 9;
-  const unsigned INTER_SPACE_SHORTKEY_DESCRIPTION = 10;
-  const unsigned SHORTKEY_COLUMN_WIDTH = 150;
-  const unsigned DESCRIPTION_COLUMN_WIDTH = 265;
-  const unsigned LINE_SPACING = 5;
+  const RawPixel INTER_SPACE_SHORTKEY_DESCRIPTION = 10_em;
+  const RawPixel SHORTKEY_COLUMN_DEFAULT_WIDTH = 150_em;
+  const RawPixel SHORTKEY_COLUMN_MAX_WIDTH = 350_em;
+  const RawPixel DESCRIPTION_COLUMN_DEFAULT_WIDTH = 265_em;
+  const RawPixel DESCRIPTION_COLUMN_MAX_WIDTH = 500_em;
+  const RawPixel LINE_SPACING = 3_em;
+  const RawPixel MAIN_HORIZONTAL_PADDING = 30_em;
+  const RawPixel MAIN_VERTICAL_PADDING = 18_em;
+  const RawPixel MAIN_CHILDREN_SPACE = 20_em;
+  const RawPixel COLUMNS_CHILDREN_SPACE = 30_em;
 
   // We need this class because SetVisible doesn't work for layouts.
   class SectionView : public nux::View
@@ -72,8 +78,8 @@
   : ui::UnityWindowView()
 {
   auto main_layout = new nux::VLayout();
-  main_layout->SetPadding(30, 18);
-  main_layout->SetSpaceBetweenChildren(20);
+  main_layout->SetPadding(MAIN_HORIZONTAL_PADDING.CP(scale), MAIN_VERTICAL_PADDING.CP(scale));
+  main_layout->SetSpaceBetweenChildren(MAIN_CHILDREN_SPACE.CP(scale));
   SetLayout(main_layout);
 
   std::string header = "<b>"+std::string(_("Keyboard Shortcuts"))+"</b>";
@@ -81,13 +87,22 @@
   auto* header_view = new StaticCairoText(header, NUX_TRACKER_LOCATION);
   header_view->SetFont(FONT_NAME+" "+std::to_string(MAIN_TITLE_FONT_SIZE));
   header_view->SetLines(-1);
+  header_view->SetScale(scale);
   main_layout->AddView(header_view, 1 , nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   main_layout->AddView(new HSeparator(), 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   columns_layout_ = new nux::HLayout();
-  columns_layout_->SetSpaceBetweenChildren(30);
+  columns_layout_->SetSpaceBetweenChildren(COLUMNS_CHILDREN_SPACE.CP(scale));
   main_layout->AddLayout(columns_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
+  scale.changed.connect([this, main_layout, header_view] (double scale) {
+    main_layout->SetPadding(MAIN_HORIZONTAL_PADDING.CP(scale), MAIN_VERTICAL_PADDING.CP(scale));
+    main_layout->SetSpaceBetweenChildren(MAIN_CHILDREN_SPACE.CP(scale));
+    columns_layout_->SetSpaceBetweenChildren(COLUMNS_CHILDREN_SPACE.CP(scale));
+    header_view->SetScale(scale);
+    RenderColumns();
+  });
 }
 
 void View::SetModel(Model::Ptr model)
@@ -114,14 +129,17 @@
   auto* section_name_view = new StaticCairoText(name, NUX_TRACKER_LOCATION);
   section_name_view->SetFont(FONT_NAME+" "+std::to_string(SECTION_NAME_FONT_SIZE));
   section_name_view->SetLines(-1);
-  layout->AddView(new nux::SpaceLayout(10, 10, 10, 10), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
+  section_name_view->SetScale(scale);
+  const int top_space = (10_em).CP(scale);
+  const int bottom_space = (15_em).CP(scale);
+  layout->AddView(new nux::SpaceLayout(top_space, top_space, top_space, top_space), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
   layout->AddView(section_name_view, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
-  layout->AddView(new nux::SpaceLayout(15, 15, 15, 15), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
+  layout->AddView(new nux::SpaceLayout(bottom_space, bottom_space, bottom_space, bottom_space), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
 
   return layout;
 }
 
-nux::View* View::CreateShortKeyEntryView(AbstractHint::Ptr const& hint)
+nux::View* View::CreateShortKeyEntryView(AbstractHint::Ptr const& hint, StaticCairoText* shortkey_view, StaticCairoText* description_view)
 {
   auto* view = new SectionView(NUX_TRACKER_LOCATION);
 
@@ -131,56 +149,56 @@
   nux::HLayout* shortkey_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
   nux::HLayout* description_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  glib::String shortkey(g_markup_escape_text(hint->shortkey().c_str(), -1));
-
-  std::string skey = "<b>"+shortkey.Str()+"</b>";
-  auto* shortkey_view = new StaticCairoText(skey, NUX_TRACKER_LOCATION);
-  shortkey_view->SetTextAlignment(StaticCairoText::AlignState::NUX_ALIGN_LEFT);
-  shortkey_view->SetFont(FONT_NAME+" "+std::to_string(SHORTKEY_ENTRY_FONT_SIZE));
-  shortkey_view->SetLines(-1);
-  shortkey_view->SetMinimumWidth(SHORTKEY_COLUMN_WIDTH);
-  shortkey_view->SetMaximumWidth(SHORTKEY_COLUMN_WIDTH);
-
-  glib::String es_desc(g_markup_escape_text(hint->description().c_str(), -1));
-
-  auto* description_view = new StaticCairoText(es_desc.Str(), NUX_TRACKER_LOCATION);
-  description_view->SetTextAlignment(StaticCairoText::AlignState::NUX_ALIGN_LEFT);
-  description_view->SetFont(FONT_NAME+" "+std::to_string(SHORTKEY_ENTRY_FONT_SIZE));
-  description_view->SetLines(-1);
-  description_view->SetMinimumWidth(DESCRIPTION_COLUMN_WIDTH);
-  description_view->SetMaximumWidth(DESCRIPTION_COLUMN_WIDTH);
-
   shortkey_layout->AddView(shortkey_view, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   shortkey_layout->SetContentDistribution(nux::MAJOR_POSITION_START);
-  shortkey_layout->SetMinimumWidth(SHORTKEY_COLUMN_WIDTH);
-  shortkey_layout->SetMaximumWidth(SHORTKEY_COLUMN_WIDTH);
 
   description_layout->AddView(description_view, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   description_layout->SetContentDistribution(nux::MAJOR_POSITION_START);
-  description_layout->SetMinimumWidth(DESCRIPTION_COLUMN_WIDTH);
-  description_layout->SetMaximumWidth(DESCRIPTION_COLUMN_WIDTH);
 
   layout->AddLayout(shortkey_layout, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
   layout->AddLayout(description_layout, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
-  layout->SetSpaceBetweenChildren(INTER_SPACE_SHORTKEY_DESCRIPTION);
+  layout->SetSpaceBetweenChildren(INTER_SPACE_SHORTKEY_DESCRIPTION.CP(scale));
   description_layout->SetContentDistribution(nux::MAJOR_POSITION_START);
 
-  view->key_changed_conn_ = hint->shortkey.changed.connect([this, view, shortkey_view] (std::string const& new_key) {
-    bool enabled = !new_key.empty();
-    shortkey_view->SetText(enabled ? "<b>"+new_key+"</b>" : "");
-    view->SetVisible(enabled);
+  view->key_changed_conn_ = hint->shortkey.changed.connect([this, view, shortkey_view] (std::string const& key) {
+    std::string escaped = glib::String(g_markup_escape_text(key.c_str(), -1)).Str();
+
+    if (!escaped.empty())
+      escaped = "<b>"+escaped+"</b>";
+
+    shortkey_view->SetText(escaped);
+    shortkey_view->SetVisible(!escaped.empty());
+    view->SetVisible(shortkey_view->IsVisible());
     QueueRelayout();
+    QueueDraw();
   });
 
-  view->SetVisible(!shortkey.Str().empty());
+  view->SetVisible(shortkey_view->IsVisible());
 
   return view;
 }
 
+StaticCairoText* View::CreateShortcutTextView(std::string const& text, bool bold)
+{
+  std::string escaped = glib::String(g_markup_escape_text(text.c_str(), -1)).Str();
+
+  if (bold && !text.empty())
+    escaped = "<b>"+escaped+"</b>";
+
+  auto* text_view = new StaticCairoText(escaped, NUX_TRACKER_LOCATION);
+  text_view->SetTextAlignment(StaticCairoText::AlignState::NUX_ALIGN_LEFT);
+  text_view->SetFont(FONT_NAME+" "+std::to_string(SHORTKEY_ENTRY_FONT_SIZE));
+  text_view->SetLines(-1);
+  text_view->SetScale(scale);
+  text_view->SetVisible(!escaped.empty());
+
+  return text_view;
+}
+
 nux::LinearLayout* View::CreateIntermediateLayout()
 {
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  layout->SetSpaceBetweenChildren(LINE_SPACING);
+  layout->SetSpaceBetweenChildren(LINE_SPACING.CP(scale));
 
   return layout;
 }
@@ -195,9 +213,38 @@
   view_layout_->ProcessDraw(GfxContext, force_draw);
 }
 
+void View::PreLayoutManagement()
+{
+  UnityWindowView::PreLayoutManagement();
+
+  for (auto const& column : shortkeys_)
+  {
+    int min_width = SHORTKEY_COLUMN_DEFAULT_WIDTH.CP(scale);
+
+    for (auto* shortkey : column)
+      min_width = std::min(std::max(min_width, shortkey->GetTextExtents().width), shortkey->GetMaximumWidth());
+
+    for (auto* shortkey : column)
+      shortkey->SetMinimumWidth(min_width);
+  }
+
+  for (auto const& column : descriptions_)
+  {
+    int min_width = DESCRIPTION_COLUMN_DEFAULT_WIDTH.CP(scale);
+
+    for (auto* description : column)
+      min_width = std::min(std::max(min_width, description->GetTextExtents().width), description->GetMaximumWidth());
+
+    for (auto* description : column)
+      description->SetMinimumWidth(min_width);
+  }
+}
+
 void View::RenderColumns()
 {
   columns_layout_->Clear();
+  shortkeys_.clear();
+  descriptions_.clear();
 
   if (!model_)
   {
@@ -209,11 +256,21 @@
   int i = 0;
   int column_idx = 0;
   auto const& columns = columns_layout_->GetChildren();
-
-  for (auto const& category : model_->categories())
+  auto const& categories = model_->categories();
+  const int categories_per_column = model_->categories_per_column();
+  const int columns_number = categories.size() / categories_per_column + 1;
+  const int top_space = (23_em).CP(scale);
+  const int bottom_space = (20_em).CP(scale);
+  const int max_shortkeys_width = SHORTKEY_COLUMN_MAX_WIDTH.CP(scale);
+  const int max_descriptions_width = DESCRIPTION_COLUMN_MAX_WIDTH.CP(scale);
+
+  shortkeys_.resize(columns_number);
+  descriptions_.resize(columns_number);
+
+  for (auto const& category : categories)
   {
     // Computing column index based on current index
-    column_idx = i/model_->categories_per_column();
+    column_idx = i/categories_per_column;
 
     nux::LinearLayout* section_layout = CreateSectionLayout(category);
     nux::LinearLayout* intermediate_layout = CreateIntermediateLayout();
@@ -221,19 +278,27 @@
 
     for (auto const& hint : model_->hints().at(category))
     {
-      nux::View* view = CreateShortKeyEntryView(hint);
+      StaticCairoText* shortkey = CreateShortcutTextView(hint->shortkey(), true);
+      shortkey->SetMaximumWidth(max_shortkeys_width);
+      shortkeys_[column_idx].push_back(shortkey);
+
+      StaticCairoText* description = CreateShortcutTextView(hint->description(), false);
+      description->SetMaximumWidth(max_descriptions_width);
+      descriptions_[column_idx].push_back(description);
+
+      nux::View* view = CreateShortKeyEntryView(hint, shortkey, description);
       intermediate_layout->AddView(view, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
     }
 
     section_layout->AddLayout(intermediate_layout, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-    if ((i + 1) % model_->categories_per_column() != 0 && category != model_->categories().back())
+    if ((i + 1) % categories_per_column != 0 && category != categories.back())
     {
       // Add a line with some padding after and before each category that is not
       // the last of the column.
-      section_layout->AddView(new nux::SpaceLayout(23, 23, 23, 23), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
+      section_layout->AddView(new nux::SpaceLayout(top_space, top_space, top_space, top_space), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
       section_layout->AddView(new HSeparator(), 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-      section_layout->AddView(new nux::SpaceLayout(20, 20, 20, 20), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
+      section_layout->AddView(new nux::SpaceLayout(bottom_space, bottom_space, bottom_space, bottom_space), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
     }
 
     nux::VLayout* column = nullptr;
@@ -251,7 +316,7 @@
 
     column->AddView(section_layout, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
 
-    i++;
+    ++i;
   }
 
   ComputeContentSize();
 
=== modified file 'shortcuts/ShortcutView.h'
--- shortcuts/ShortcutView.h	2013-11-16 11:44:23 +0000
+++ shortcuts/ShortcutView.h	2014-05-16 00:33:37 +0000
@@ -29,6 +29,8 @@
 
 namespace unity
 {
+class StaticCairoText;
+
 namespace shortcut
 {
 
@@ -47,8 +49,9 @@
 
 protected:
   // Protected methods
-  void DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry const& clip);
-  nux::Geometry GetBackgroundGeometry();
+  void DrawOverlay(nux::GraphicsEngine& GfxContext, bool force_draw, nux::Geometry const& clip) override;
+  nux::Geometry GetBackgroundGeometry() override;
+  void PreLayoutManagement() override;
 
   // Introspectable methods
   std::string GetName() const;
@@ -56,7 +59,8 @@
 private:
   // Private methods
   nux::LinearLayout* CreateSectionLayout(std::string const& section_name);
-  nux::View* CreateShortKeyEntryView(AbstractHint::Ptr const& hint);
+  nux::View* CreateShortKeyEntryView(AbstractHint::Ptr const&, StaticCairoText* shortkey, StaticCairoText* description);
+  StaticCairoText* CreateShortcutTextView(std::string const& text, bool bold);
   nux::LinearLayout* CreateIntermediateLayout();
 
   void RenderColumns();
@@ -64,6 +68,8 @@
   // Private members
   Model::Ptr model_;
   nux::HLayout* columns_layout_;
+  std::vector<std::vector<StaticCairoText*>> shortkeys_;
+  std::vector<std::vector<StaticCairoText*>> descriptions_;
 
   friend class TestShortcutView;
 };
 
=== 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-16 00:33:37 +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/UnityWindowStyle.cpp'
--- unity-shared/UnityWindowStyle.cpp	2014-05-16 00:33:37 +0000
+++ unity-shared/UnityWindowStyle.cpp	2014-05-16 00:33:37 +0000
@@ -21,9 +21,13 @@
 
 #include <NuxCore/Logger.h>
 
+#include "UnitySettings.h"
 #include "UnityWindowStyle.h"
+#include "UScreen.h"
 #include "config.h"
 
+#include <unordered_set>
+
 namespace unity
 {
 namespace ui
@@ -38,14 +42,31 @@
   const char* const DIALOG_HIGHLIGHT = PKGDATADIR"/dialog_close_highlight.png";
   const char* const DIALOG_PRESS     = PKGDATADIR"/dialog_close_press.png";
 
-  double const DEFAULT_SCALE = 1.0;
+
+  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()
 {
-  LoadAllTextureInScale(DEFAULT_SCALE);
+  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)
@@ -76,6 +97,35 @@
   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()
 {
   // This is set only the first time;
@@ -83,19 +133,19 @@
   return instance;
 }
 
-int UnityWindowStyle::GetBorderSize() const
-{
-  return 30; // as measured from textures
-}
-
-int UnityWindowStyle::GetInternalOffset() const
-{
-  return 20;
-}
-
-int UnityWindowStyle::GetCloseButtonPadding() const
-{
-  return 3;
+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)
 
=== modified file 'unity-shared/UnityWindowStyle.h'
--- unity-shared/UnityWindowStyle.h	2014-05-16 00:33:37 +0000
+++ unity-shared/UnityWindowStyle.h	2014-05-16 00:33:37 +0000
@@ -52,9 +52,9 @@
   static UnityWindowStyle::Ptr const& Get();
 
   BaseTexturePtr GetTexture(double scale, WindowTextureType const& type);
-  int GetCloseButtonPadding() const;
-  int GetBorderSize() const;
-  int GetInternalOffset() const;
+  int GetCloseButtonPadding(double scale) const;
+  int GetBorderSize(double scale) const;
+  int GetInternalOffset(double scale) const;
 
 private:
   UnityWindowStyle();
@@ -63,6 +63,9 @@
   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_;
 
=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2014-05-16 00:33:37 +0000
+++ unity-shared/UnityWindowView.cpp	2014-05-16 00:33:37 +0000
@@ -70,7 +70,7 @@
 
   if (internal_layout_)
   {
-    int offset = RawPixel(style()->GetInternalOffset()).CP(scale);
+    int offset = style()->GetInternalOffset(scale);
     view_layout_->SetPadding(offset, offset);
   }
 }
@@ -138,7 +138,7 @@
   }
 
   auto const& texture = style()->GetTexture(scale, WindowTextureType::CLOSE_ICON);
-  int padding = RawPixel(style()->GetCloseButtonPadding()).CP(scale);
+  int padding = style()->GetCloseButtonPadding(scale);
 
   close_button_ = new IconTexture(texture);
   close_button_->SetBaseXY(padding, padding);
@@ -179,7 +179,7 @@
 {
   if (layout && layout->IsLayout())
   {
-    int offset = RawPixel(style()->GetInternalOffset()).CP(scale);
+    int offset = style()->GetInternalOffset(scale);
 
     // We wrap the internal layout adding some padding, so that inherited classes
     // can ignore the offsets we define here.
@@ -204,7 +204,8 @@
 
 nux::Geometry UnityWindowView::GetInternalBackground()
 {
-  int offset = RawPixel(style()->GetInternalOffset()).CP(scale);
+  int offset = style()->GetInternalOffset(scale);
+
   return GetBackgroundGeometry().GetExpand(-offset, -offset);
 }
 
@@ -354,7 +355,8 @@
 
 void UnityWindowView::DrawBackground(nux::GraphicsEngine& GfxContext, nux::Geometry const& geo)
 {
-  int border = RawPixel(style()->GetBorderSize()).CP(scale);
+  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);