Fix sizing of the floating dash

(bzr r1065.1.12)

2 files changed, 3 insertions, 3 deletions

diff --git a/src/PlacesController.cpp b/src/PlacesController.cpp
index cb0cbc81c..d4366583b 100644
--- a/src/PlacesController.cpp
+++ b/src/PlacesController.cpp
@@ -252,7 +252,7 @@ PlacesController::GetWindowSize (int *out_width, int *out_height)
 width += tile_width;
 
 width = MAX (width, tile_width * 7);
- height = ((width/tile_width) - 3) * tile_width;
+ height = MIN (rect.height, (style->GetTileHeight () * 5.5) + 12);
 
 _view->SetSizeMode (PlacesView::SIZE_MODE_HOVER);
 style->SetDefaultNColumns (6);
diff --git a/src/PlacesSettings.cpp b/src/PlacesSettings.cpp
index 030678a0c..c20d54e30 100644
--- a/src/PlacesSettings.cpp
+++ b/src/PlacesSettings.cpp
@@ -20,6 +20,7 @@
 #include "gdk/gdk.h"
 
 #include "PlacesSettings.h"
+#include "PlacesStyle.h"
 
 #define HOME_EXPANDED "home-expanded"
 
@@ -91,8 +92,7 @@ PlacesSettings::GetFormFactor ()
 int
 PlacesSettings::GetDefaultTileWidth ()
 {
- //FIXME: We want to calculate this from DPI
- return 140;
+ return PlacesStyle::GetDefault ()->GetTileWidth ();
 }
 
 PlacesSettings::DashBlurType