Merge lp:~brandontschaefer/unity/fix-lockscreen-hidpi-support into lp:unity

[Brandon Schaefer]

Get the scale value from the current monitor, and scale what we need.

* Warning * Need to test on multi monitor :)

Otherwise, this branch looks good on a single monitor. Just get the scale value from the current monitor, and scale what we need. Pretty simple.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3720
http://jenkins.qa.ubuntu.com/job/unity-ci/803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/337

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

review: Approve (continuous-integration)

Unmerged revisions

3720. By Brandon Schaefer on 2014-03-13

* Fix HiDPI in the Lockscreen

=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2014-03-07 18:34:03 +0000
+++ lockscreen/BackgroundSettings.cpp	2014-03-13 21:04:54 +0000
@@ -25,6 +25,7 @@
 #include "LockScreenSettings.h"
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/UScreen.h"
 
 namespace unity
@@ -51,20 +52,22 @@
 BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
 {
   nux::Geometry const& geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
   auto& settings = Settings::Instance();
 
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, geo.width, geo.height);
+  cairo_surface_set_device_scale(cairo_graphics.GetSurface(), scale, scale);
   cairo_t* c = cairo_graphics.GetInternalContext();
 
   cairo_surface_t* bg_surface = nullptr;
 
   if (settings.use_user_background())
   {
-    bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), geo.width, geo.height, FALSE);
+    bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), geo.width / scale, geo.height / scale, FALSE);
   }
   else if (!settings.background().empty())
   {
-    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(settings.background().c_str(), geo.width, geo.height, FALSE, NULL));
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(settings.background().c_str(), geo.width / scale, geo.height / scale, FALSE, NULL));
 
     if (pixbuf)
       bg_surface = gdk_cairo_surface_create_from_pixbuf(pixbuf, 0, NULL);

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-03-07 19:17:35 +0000
+++ lockscreen/LockScreenController.h	2014-03-13 21:04:54 +0000
@@ -57,6 +57,8 @@
   void OnUnlockRequested();
   void OnPrimaryShieldMotion(int x, int y);
 
+  void OnDPIChanged();
+
   std::vector<nux::ObjectPtr<AbstractShield>> shields_;
   nux::ObjectWeakPtr<AbstractShield> primary_shield_;
   session::Manager::Ptr session_manager_;
@@ -73,4 +75,4 @@
 }
 }
 
-#endif
\ No newline at end of file
+#endif

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2014-03-07 19:02:25 +0000
+++ lockscreen/LockScreenPanel.cpp	2014-03-13 21:04:54 +0000
@@ -91,8 +91,10 @@
 
 void Panel::BuildTexture()
 {
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
   int height = panel::Style::Instance().PanelHeight(monitor);
   nux::CairoGraphics context(CAIRO_FORMAT_ARGB32, 1, height);
+  cairo_surface_set_device_scale(context.GetSurface(), scale, scale);
   auto* cr = context.GetInternalContext();
   cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
   cairo_paint_with_alpha(cr, 0.4);

=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-03-07 19:35:46 +0000
+++ lockscreen/LockScreenShield.cpp	2014-03-13 21:04:54 +0000
@@ -28,6 +28,8 @@
 #include "LockScreenPanel.h"
 #include "LockScreenSettings.h"
 #include "UserPromptView.h"
+#include "unity-shared/RawPixel.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/WindowManager.h"
 
@@ -36,6 +38,15 @@
 namespace lockscreen
 {
 
+namespace
+{
+  // 10 is just a random number to center the prompt view.
+  RawPixel const LAYOUT_SPACE  = 10_em;
+  RawPixel const PROMPT_WIDTH  =  8_em;
+  RawPixel const PROMPT_HEIGHT =  3_em;
+  RawPixel const PROMPT_LR_PAD =  2_em;
+}
+
 Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, int monitor_num, bool is_primary)
   : AbstractShield(session_manager, indicators, monitor_num, is_primary)
   , bg_settings_(std::make_shared<BackgroundSettings>())
@@ -104,15 +115,15 @@
   main_layout->AddView(CreatePanel());
 
   nux::HLayout* prompt_layout = new nux::HLayout();
-  prompt_layout->SetLeftAndRightPadding(2 * Settings::GRID_SIZE);
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
+  prompt_layout->SetLeftAndRightPadding(PROMPT_LR_PAD.CP(scale) * Settings::GRID_SIZE);
 
   prompt_view_ = CreatePromptView();
   prompt_layout->AddView(prompt_view_);
 
-  // 10 is just a random number to center the prompt view.
-  main_layout->AddSpace(0, 10);
+  main_layout->AddSpace(0, LAYOUT_SPACE.CP(scale));
   main_layout->AddLayout(prompt_layout);
-  main_layout->AddSpace(0, 10);
+  main_layout->AddSpace(0, LAYOUT_SPACE.CP(scale));
 }
 
 void Shield::ShowSecondaryView()
@@ -159,14 +170,13 @@
 
 UserPromptView* Shield::CreatePromptView()
 {
-  auto* prompt_view = new UserPromptView(session_manager_);
-
-  auto width = 8 * Settings::GRID_SIZE;
-  auto height = 3 * Settings::GRID_SIZE;
-
-  prompt_view->SetMinimumWidth(width);
-  prompt_view->SetMaximumWidth(width);
-  prompt_view->SetMinimumHeight(height);
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
+  auto* prompt_view = new UserPromptView(session_manager_, scale);
+
+  auto width  = PROMPT_WIDTH.CP(scale)  * Settings::GRID_SIZE;
+  auto height = PROMPT_HEIGHT.CP(scale) * Settings::GRID_SIZE;
+
+  prompt_view->SetMinMaxSize(width, height);
 
   return prompt_view;
 }

=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-03-07 19:17:35 +0000
+++ lockscreen/LockScreenShield.h	2014-03-13 21:04:54 +0000
@@ -64,4 +64,4 @@
 }
 }
 
-#endif
\ No newline at end of file
+#endif

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-03-06 21:37:45 +0000
+++ lockscreen/UserPromptView.cpp	2014-03-13 21:04:54 +0000
@@ -34,15 +34,16 @@
 {
 namespace
 {
-const RawPixel PADDING = 10_em;
-const RawPixel LAYOUT_MARGIN = 10_em;
-const RawPixel MSG_LAYOUT_MARGIN = 15_em;
-const RawPixel PROMPT_LAYOUT_MARGIN = 5_em;
-const int PROMPT_FONT_SIZE = 13;
+const RawPixel PADDING              = 10_em;
+const RawPixel LAYOUT_MARGIN        = 10_em;
+const RawPixel MSG_LAYOUT_MARGIN    = 15_em;
+const RawPixel PROMPT_LAYOUT_MARGIN =  5_em;
+const RawPixel PROMPT_FONT_SIZE     = 13_em;
 
-nux::AbstractPaintLayer* CrateBackgroundLayer(int width, int height)
+nux::AbstractPaintLayer* CreateBackgroundLayer(int width, int height, double scale)
 {
   nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
+  cairo_surface_set_device_scale(cg.GetSurface(), scale, scale);
   cairo_t* cr = cg.GetInternalContext();
 
   cairo_set_source_rgba(cr, 0.1, 0.1, 0.1, 0.4);
@@ -51,7 +52,7 @@
                           1.0,
                           0, 0,
                           Settings::GRID_SIZE * 0.3,
-                          width, height);
+                          width / scale, height / scale);
 
   cairo_fill_preserve(cr);
 
@@ -95,9 +96,10 @@
 
 }
 
-UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager)
+UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager, double scale)
   : nux::View(NUX_TRACKER_LOCATION)
   , session_manager_(session_manager)
+  , scale_(scale)
 {
   user_authenticator_.echo_on_requested.connect([this](std::string const& message, PromiseAuthCodePtr const& promise){
     AddPrompt(message, /* visible */ true, promise);
@@ -131,24 +133,25 @@
 
   SetLayout(new nux::VLayout());
 
-  GetLayout()->SetLeftAndRightPadding(PADDING);
-  GetLayout()->SetTopAndBottomPadding(PADDING);
-  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(LAYOUT_MARGIN);
+  GetLayout()->SetLeftAndRightPadding(PADDING.CP(scale_));
+  GetLayout()->SetTopAndBottomPadding(PADDING.CP(scale_));
+  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(LAYOUT_MARGIN.CP(scale_));
 
   auto const& real_name = session_manager_->RealName();
   auto const& name = (real_name.empty() ? session_manager_->UserName() : real_name);
 
   unity::StaticCairoText* username = new unity::StaticCairoText(name);
+  username->SetScale(scale_);
   username->SetFont("Ubuntu "+std::to_string(PROMPT_FONT_SIZE));
   GetLayout()->AddView(username);
 
   msg_layout_ = new nux::VLayout();
-  msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN);
+  msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN.CP(scale_));
   msg_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(msg_layout_);
 
   prompt_layout_ = new nux::VLayout();
-  prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN);
+  prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN.CP(scale_));
   prompt_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(prompt_layout_);
 
@@ -180,7 +183,7 @@
   graphics_engine.PushClippingRectangle(geo);
   nux::GetPainter().PaintBackground(graphics_engine, geo);
 
-  bg_layer_.reset(CrateBackgroundLayer(geo.width, geo.height));
+  bg_layer_.reset(CreateBackgroundLayer(geo.width, geo.height, scale_));
   nux::GetPainter().PushDrawLayer(graphics_engine, geo, bg_layer_.get());
 
   nux::GetPainter().PopBackground();
@@ -194,7 +197,7 @@
 
   if (!IsFullRedraw())
   {
-    bg_layer_.reset(CrateBackgroundLayer(geo.width, geo.height));
+    bg_layer_.reset(CreateBackgroundLayer(geo.width, geo.height, scale_));
     nux::GetPainter().PushLayer(graphics_engine, geo, bg_layer_.get());
   }
 
@@ -225,13 +228,14 @@
   auto* text_entry = text_input->text_entry();
 
   text_input->input_hint = SanitizeMessage(message);
-  text_input->hint_font_size = PROMPT_FONT_SIZE;
+  text_input->hint_font_size = PROMPT_FONT_SIZE.CP(scale_);
+  text_entry->SetFontSize(PROMPT_FONT_SIZE.CP(scale_));
   text_entry->SetPasswordMode(!visible);
   text_entry->SetPasswordChar("•");
   text_entry->SetToggleCursorVisibilityOnKeyFocus(true);
 
-  text_input->SetMinimumHeight(Settings::GRID_SIZE);
-  text_input->SetMaximumHeight(Settings::GRID_SIZE);
+  text_input->SetMinimumHeight(Settings::GRID_SIZE * scale_);
+  text_input->SetMaximumHeight(Settings::GRID_SIZE * scale_);
   prompt_layout_->AddView(text_input, 1);
   focus_queue_.push_back(text_entry);
 
@@ -266,6 +270,7 @@
 void UserPromptView::AddMessage(std::string const& message, nux::Color const& color)
 {
   auto* view = new unity::StaticCairoText("");
+  view->SetScale(scale_);
   view->SetFont(Settings::Instance().font_name());
   view->SetTextColor(color);
   view->SetText(message);

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-03-05 04:09:13 +0000
+++ lockscreen/UserPromptView.h	2014-03-13 21:04:54 +0000
@@ -48,7 +48,7 @@
 class UserPromptView : public nux::View
 {
 public:
-  UserPromptView(session::Manager::Ptr const& session_manager);
+  UserPromptView(session::Manager::Ptr const& session_manager, double scale);
   ~UserPromptView() {};
 
   nux::View* focus_view();
@@ -73,6 +73,7 @@
   StaticCairoText* error_;
   StaticCairoText* invalid_login_;
   std::deque<IMTextEntry*> focus_queue_;
+  double scale_;
 };
 
 }