UnityWindowStyle: use theme settings for getting the textures and cleanup them on theme change

Also export RawPixel's and cleanup the API a little (bzr r4093.2.13)

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/test_thumbnail_generator.cpp b/tests/test_thumbnail_generator.cpp
index c807392ad..19dc75a4a 100644
--- a/tests/test_thumbnail_generator.cpp
+++ b/tests/test_thumbnail_generator.cpp
@@ -121,8 +121,8 @@ TEST(TestThumbnailGenerator, TestGetManyFileThumbnail)
 ThumbnailGenerator thumbnail_generator;
 
 const char* thumbs[] = { "file://" SOURCEDATADIR "/switcher_background.png" , "file://" SOURCEDATADIR "/star_highlight.png",
- "file://" SOURCEDATADIR "/launcher_bfb.png", "file://" SOURCEDATADIR "/switcher_corner.png",
- "file://" SOURCEDATADIR "/switcher_top.png", "file://" SOURCEDATADIR "/switcher_left.png",
+ "file://" SOURCEDATADIR "/launcher_bfb.png", "file://" SOURCEDATADIR "/dialog_border_corner.png",
+ "file://" SOURCEDATADIR "/dialog_border_top.png", "file://" SOURCEDATADIR "/dialog_border_left.png",
 "file://" SOURCEDATADIR "/dash_bottom_left_corner.png", "file://" SOURCEDATADIR "/dash_bottom_right_corner.png"};
 
 std::vector<LoadResult> results;
diff --git a/tests/test_unity_window_view.cpp b/tests/test_unity_window_view.cpp
index 1eb0d2562..9b49c9573 100644
--- a/tests/test_unity_window_view.cpp
+++ b/tests/test_unity_window_view.cpp
@@ -85,7 +85,7 @@ TEST_F(TestUnityWindowView, Closable)
 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(view.scale);
+ int padding = view.style()->GetCloseButtonPadding().CP(view.scale);
 EXPECT_EQ(view.close_button_->GetBaseX(), padding);
 EXPECT_EQ(view.close_button_->GetBaseY(), padding);
 }
@@ -185,7 +185,7 @@ TEST_F(TestUnityWindowView, SetLayoutWrapsOriginalLayout)
 view.SetLayout(layout);
 view.ComputeContentSize();
 
- int offset = view.style()->GetInternalOffset(view.scale);
+ int offset = view.style()->GetInternalOffset().CP(view.scale);
 EXPECT_EQ(layout->GetBaseX(), offset);
 EXPECT_EQ(layout->GetBaseY(), offset);
 }
@@ -199,7 +199,7 @@ TEST_F(TestUnityWindowView, GetLayout)
 
 TEST_F(TestUnityWindowView, GetInternalBackground)
 {
- int offset = view.style()->GetInternalOffset(view.scale);
+ int offset = view.style()->GetInternalOffset().CP(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));
 }