Merge lp:~thumper/unity/revert-r2960 into lp:unity

[Tim Penhey]

Revert r2960 which broke tooltip rendering.

r2960 broke the rendering of tooltips.

This branch is just a reverse merge of r2960. When the changes in that branch have been updated and no longer breaks tooltips, we can look to merge the changes again.

[Christopher Lee (veebers)]

review: Approve

=== modified file 'tests/test_static_cairo_text.cpp'
--- tests/test_static_cairo_text.cpp	2012-12-05 13:11:28 +0000
+++ tests/test_static_cairo_text.cpp	2012-12-10 00:35:27 +0000
@@ -33,29 +33,17 @@
 class MockStaticCairoText : public nux::StaticCairoText
 {
 public:
-  MOCK_METHOD2(SetBaseSize, void(int, int));
-
   MockStaticCairoText():StaticCairoText("") {}
 
   using StaticCairoText::GetTextureStartIndices;
   using StaticCairoText::GetTextureEndIndices;
-  using StaticCairoText::PreLayoutManagement;
-};
-
-class TestStaticCairoText : public ::testing::Test
-{
-  protected:
-    TestStaticCairoText() : Test()
-    {
-      text = new MockStaticCairoText();
-    }
-    nux::ObjectPtr<MockStaticCairoText> text;
-};
-
-TEST_F(TestStaticCairoText, TextTextureSize)
-{
-  EXPECT_CALL(*text.GetPointer(), SetBaseSize(_, _)).Times(AnyNumber());
+};
+
+TEST(TestStaticCairoText, TextTextureSize)
+{
   // Test multi-texture stitching support.
+
+  nux::ObjectPtr<MockStaticCairoText> text(new MockStaticCairoText());
   text->SetLines(-2000);
   text->SetMaximumWidth(100);
 
@@ -82,17 +70,4 @@
   }
 }
 
-TEST_F(TestStaticCairoText, TextPreLayoutManagementMultipleCalls)
-{
-  EXPECT_CALL(*text.GetPointer(), SetBaseSize(_, _)).Times(2);
-
-  text->PreLayoutManagement();
-
-  // the first prelayout methods should have called set base size and therefore
-  // we should not call it again
-  EXPECT_CALL(*text.GetPointer(), SetBaseSize(_, _)).Times(0);
-
-  text->PreLayoutManagement();
-}
-
 }
 
=== modified file 'unity-shared/StaticCairoText.cpp'
--- unity-shared/StaticCairoText.cpp	2012-12-07 16:21:14 +0000
+++ unity-shared/StaticCairoText.cpp	2012-12-10 00:35:27 +0000
@@ -228,21 +228,12 @@
 
 void StaticCairoText::PreLayoutManagement()
 {
-  Geometry const& geo = GetGeometry();
-
-  // only update the size if an only if and only if the width and height of
-  // the geo are diff
-  // FIXME: nux should be smart enough to not need this, we should get that
-  // fixed.
-  if(pimpl->pre_layout_size_.width != geo.width
-    || pimpl->pre_layout_size_.height != geo.height)
-  {
-    pimpl->pre_layout_size_.width = geo.width;
-    pimpl->pre_layout_size_.height = geo.height;
-
-    SetBaseSize(pimpl->cached_extent_.width,
-                pimpl->cached_extent_.height);
-  }
+  Geometry geo = GetGeometry();
+  pimpl->pre_layout_size_.width = geo.width;
+  pimpl->pre_layout_size_.height = geo.height;
+
+  SetBaseSize(pimpl->cached_extent_.width,
+              pimpl->cached_extent_.height);
 
   if (pimpl->textures2D_.empty())
   {