Merge lp:~nick-dedekind/unity/lp1045243.preview-fixed-size into lp:unity

[Nick Dedekind]

Fixed the size of the previews to 770x380 pixels. (LP#1045243)

Fixed the size of the previews to 770x380 pixels. Resizing dash will not alter size. (LP#1045243)

[Brandon Schaefer (brandontschaefer)]

Hmm instead of returning hardcoded values could you make variables at the top of the class?

ie:
const int preview_width = 770;
etc...

[Brandon Schaefer (brandontschaefer)]

Also this happens:
http://i.imgur.com/h29v5.jpg

When you:
Start the dash and set it to fullscreen
Right click an icon to open preview
Now take the dash out of fullscreen and open a preview.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

The resize issue in that image is fixed by a related bug.
https://bugs.launchpad.net/unity/+bug/1038944

[Nick Dedekind (nick-dedekind)]

While I do find it a bit redundant having a style class for values, then defining them somewhere other than the accessors, I have complied with the width/height values. :)

[Brandon Schaefer (brandontschaefer)]

Yeah, I figure if someone needs to use that value more then once in this class it's now in a varaible :)

Looks good!

review: Approve

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2012-08-31 11:52:52 +0000
+++ dash/previews/PreviewContainer.cpp	2012-09-06 07:07:18 +0000
@@ -149,9 +149,9 @@
 
         nux::Geometry swipeOut = geometry;
         if (swipe_.direction == Navigation::RIGHT)
-          swipeOut.OffsetPosition(-(curve_progress * (geometry.GetWidth() + parent_->nav_left_->GetGeometry().GetWidth())), 0);
+          swipeOut.OffsetPosition(-(curve_progress * (parent_->GetGeometry().width - geometry.x)), 0);
         else if (swipe_.direction == Navigation::LEFT)
-          swipeOut.OffsetPosition(curve_progress* (geometry.GetWidth() + parent_->nav_right_->GetGeometry().GetWidth()), 0);
+          swipeOut.OffsetPosition(curve_progress* (parent_->GetGeometry().width - geometry.x), 0);
         current_preview_->SetGeometry(swipeOut);
       }
  
@@ -162,9 +162,9 @@
 
         nux::Geometry swipeIn = geometry;
         if (swipe_.direction == Navigation::RIGHT)
-          swipeIn.OffsetPosition(float(geometry.GetWidth() + parent_->nav_right_->GetGeometry().GetWidth()) - (curve_progress * (geometry.GetWidth() + parent_->nav_right_->GetGeometry().GetWidth())), 0);
+          swipeIn.OffsetPosition(float(parent_->GetGeometry().width - geometry.x) - (curve_progress * (parent_->GetGeometry().width - geometry.x)), 0);
         else if (swipe_.direction == Navigation::LEFT)
-          swipeIn.OffsetPosition(-((1.0-curve_progress)*(geometry.GetWidth() + parent_->nav_left_->GetGeometry().GetWidth())), 0);
+          swipeIn.OffsetPosition(-((1.0-curve_progress)*(parent_->GetGeometry().width - geometry.x)), 0);
         swipe_.preview->SetGeometry(swipeIn);
       }
     }
@@ -355,7 +355,6 @@
   : View(NUX_FILE_LINE_PARAM)
   , content_layout_(nullptr)
   , nav_disabled_(Navigation::NONE)
-  , last_calc_height_(0)
   , navigation_progress_speed_(0.0)
   , navigation_count_(0)
 {
@@ -411,7 +410,7 @@
 
   layout_ = new nux::HLayout();
   SetLayout(layout_);
-  layout_->AddSpace(0, 0);
+  layout_->AddSpace(0, 1);
 
   nav_left_ = new PreviewNavigator(Orientation::LEFT, NUX_TRACKER_LOCATION);
   AddChild(nav_left_);
@@ -421,8 +420,9 @@
   layout_->AddView(nav_left_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   content_layout_ = new PreviewContent(this);
+  content_layout_->SetMinMaxSize(style.GetPreviewWidth(), style.GetPreviewHeight());
   AddChild(content_layout_);
-  layout_->AddLayout(content_layout_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  layout_->AddLayout(content_layout_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   nav_right_ = new PreviewNavigator(Orientation::RIGHT, NUX_TRACKER_LOCATION);
   AddChild(nav_right_);
@@ -431,7 +431,7 @@
   nav_right_->activated.connect([&]() { navigate_right.emit(); });
   layout_->AddView(nav_right_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  layout_->AddSpace(0, 0);
+  layout_->AddSpace(0, 1);
 
   content_layout_->start_navigation.connect([&]()
   {
@@ -497,32 +497,6 @@
   gfx_engine.PopClippingRectangle();
 }
 
-void PreviewContainer::PreLayoutManagement()
-{
-  previews::Style& style = previews::Style::Instance();
-  nux::Geometry const& geo = GetGeometry();
-
-  int available_preview_width = MAX(1, geo.width - nav_left_->GetGeometry().width - nav_right_->GetGeometry().width);
-  int aspect_altered_height = available_preview_width / style.GetPreviewAspectRatio();
-
-  aspect_altered_height = CLAMP(aspect_altered_height, 1, geo.height);
-  if (last_calc_height_ != aspect_altered_height)
-  {
-    last_calc_height_ = aspect_altered_height;
-
-    content_layout_->SetMinimumHeight(aspect_altered_height);
-    content_layout_->SetMaximumHeight(aspect_altered_height);
-
-    nav_left_->SetMinimumHeight(aspect_altered_height);
-    nav_left_->SetMaximumHeight(aspect_altered_height);
-
-    nav_right_->SetMinimumHeight(aspect_altered_height);
-    nav_right_->SetMaximumHeight(aspect_altered_height);
-  }
-
-  View::PreLayoutManagement();
-}
-
 bool PreviewContainer::AnimationInProgress()
 {
    // short circuit to avoid unneeded calculations

=== modified file 'dash/previews/PreviewContainer.h'
--- dash/previews/PreviewContainer.h	2012-08-17 07:28:10 +0000
+++ dash/previews/PreviewContainer.h	2012-09-06 07:07:18 +0000
@@ -81,7 +81,6 @@
 protected:
   void Draw(nux::GraphicsEngine& gfx_engine, bool force_draw);
   void DrawContent(nux::GraphicsEngine& gfx_engine, bool force_draw);
-  void PreLayoutManagement();
 
   bool InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character);
   void OnKeyDown(unsigned long event_type, unsigned long event_keysym, unsigned long event_state, const TCHAR* character, unsigned short key_repeat_count);
@@ -101,7 +100,6 @@
   PreviewNavigator* nav_right_;
   PreviewContent* content_layout_;
   Navigation nav_disabled_;
-  int last_calc_height_;
 
   // Animation
   struct timespec  last_progress_time_;

=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2012-08-20 13:04:20 +0000
+++ unity-shared/PreviewStyle.cpp	2012-09-06 07:07:18 +0000
@@ -39,6 +39,9 @@
 {
 Style* style_instance = nullptr;
 
+const int preview_width = 770;
+const int preview_height = 380;
+
 nux::logging::Logger logger("unity.dash.previews.style");
 
 typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
@@ -159,9 +162,14 @@
   return 24;  
 }
 
-float Style::GetPreviewAspectRatio() const
-{
-  return static_cast<float>(796)/390;
+int Style::GetPreviewWidth() const
+{
+  return preview_width;
+}
+
+int Style::GetPreviewHeight() const
+{
+  return preview_height;
 }
 
 int Style::GetDetailsTopMargin() const
@@ -186,7 +194,7 @@
 
 int Style::GetPanelSplitWidth() const
 {
-  return 16;
+  return 10;
 }
 
 int Style::GetAppIconAreaWidth() const

=== modified file 'unity-shared/PreviewStyle.h'
--- unity-shared/PreviewStyle.h	2012-08-20 13:04:20 +0000
+++ unity-shared/PreviewStyle.h	2012-09-06 07:07:18 +0000
@@ -60,7 +60,8 @@
   int GetNavigatorWidth() const;
   int GetNavigatorIconSize() const;
   
-  float GetPreviewAspectRatio() const;
+  int GetPreviewWidth() const;
+  int GetPreviewHeight() const;
 
   int GetDetailsTopMargin() const;
   int GetDetailsBottomMargin() const;