DashStyle: return ObjectPtr of textures

(bzr r3830.5.19)

7 files changed, 90 insertions, 89 deletions

diff --git a/unity-shared/CoverArt.cpp b/unity-shared/CoverArt.cpp
index 8d5b98f36..797c2d793 100644
--- a/unity-shared/CoverArt.cpp
+++ b/unity-shared/CoverArt.cpp
@@ -452,7 +452,7 @@ void CoverArt::SetupViews()
 overlay_text_->SetText(_("No Image Available"));
 
 dash::Style& style = dash::Style::Instance();
- spin_ = style.GetSearchSpinIcon();
+ spin_ = style.GetSearchSpinIcon().GetPointer();
 
 rotate_matrix_.Identity();
 rotate_matrix_.Rotate_z(0.0);
diff --git a/unity-shared/DashStyle.cpp b/unity-shared/DashStyle.cpp
index ec853d88a..de44ecc87 100755
--- a/unity-shared/DashStyle.cpp
+++ b/unity-shared/DashStyle.cpp
@@ -48,8 +48,6 @@
 
 #define DASH_WIDGETS_FILE DATADIR"/unity/themes/dash-widgets.json"
 
-typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
-
 namespace unity
 {
 namespace dash
@@ -106,7 +104,7 @@ class LazyLoadTexture
 {
 public:
 LazyLoadTexture(std::string const& filename, int size = -1);
- nux::BaseTexture* texture();
+ BaseTexturePtr const& texture();
 private:
 void LoadTexture();
 private:
@@ -2205,147 +2203,147 @@ RawPixel Style::GetTextLineHeight() const
 }
 
 
-nux::BaseTexture* Style::GetCategoryBackground()
+BaseTexturePtr const& Style::GetCategoryBackground() const
 {
 return pimpl->category_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetCategoryBackgroundNoFilters()
+BaseTexturePtr const& Style::GetCategoryBackgroundNoFilters() const
 {
 return pimpl->category_texture_no_filters_.texture(); 
 }
 
-nux::BaseTexture* Style::GetDashBottomTile()
+BaseTexturePtr const& Style::GetDashBottomTile() const
 {
 return pimpl->dash_bottom_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetDashBottomTileMask()
+BaseTexturePtr const& Style::GetDashBottomTileMask() const
 {
 return pimpl->dash_bottom_texture_mask_.texture();
 }
 
-nux::BaseTexture* Style::GetDashRightTile()
+BaseTexturePtr const& Style::GetDashRightTile() const
 {
 return pimpl->dash_right_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetDashRightTileMask()
+BaseTexturePtr const& Style::GetDashRightTileMask() const
 {
 return pimpl->dash_right_texture_mask_.texture();
 }
 
-nux::BaseTexture* Style::GetDashCorner()
+BaseTexturePtr const& Style::GetDashCorner() const
 {
 return pimpl->dash_corner_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetDashCornerMask()
+BaseTexturePtr const& Style::GetDashCornerMask() const
 {
 return pimpl->dash_corner_texture_mask_.texture();
 }
 
-nux::BaseTexture* Style::GetDashLeftEdge()
+BaseTexturePtr const& Style::GetDashLeftEdge() const
 {
 return pimpl->dash_left_edge_.texture();
 }
 
-nux::BaseTexture* Style::GetDashLeftCorner()
+BaseTexturePtr const& Style::GetDashLeftCorner() const
 {
 return pimpl->dash_left_corner_.texture();
 }
 
-nux::BaseTexture* Style::GetDashLeftCornerMask()
+BaseTexturePtr const& Style::GetDashLeftCornerMask() const
 {
 return pimpl->dash_left_corner_mask_.texture();
 }
 
-nux::BaseTexture* Style::GetDashLeftTile()
+BaseTexturePtr const& Style::GetDashLeftTile() const
 {
 return pimpl->dash_left_tile_.texture();
 }
 
-nux::BaseTexture* Style::GetDashTopCorner()
+BaseTexturePtr const& Style::GetDashTopCorner() const
 {
 return pimpl->dash_top_corner_.texture();
 }
 
-nux::BaseTexture* Style::GetDashTopCornerMask()
+BaseTexturePtr const& Style::GetDashTopCornerMask() const
 {
 return pimpl->dash_top_corner_mask_.texture();
 }
 
-nux::BaseTexture* Style::GetDashTopTile()
+BaseTexturePtr const& Style::GetDashTopTile() const
 {
 return pimpl->dash_top_tile_.texture();
 }
 
-nux::BaseTexture* Style::GetDashFullscreenIcon()
+BaseTexturePtr const& Style::GetDashFullscreenIcon() const
 {
 return pimpl->dash_fullscreen_icon_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchMagnifyIcon()
+BaseTexturePtr const& Style::GetSearchMagnifyIcon() const
 {
 return pimpl->search_magnify_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchCircleIcon()
+BaseTexturePtr const& Style::GetSearchCircleIcon() const
 {
 return pimpl->search_circle_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchCloseIcon()
+BaseTexturePtr const& Style::GetSearchCloseIcon() const
 {
 return pimpl->search_close_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchSpinIcon()
+BaseTexturePtr const& Style::GetSearchSpinIcon() const
 {
 return pimpl->search_spin_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetInformationTexture()
+BaseTexturePtr const& Style::GetInformationTexture() const
 {
 return pimpl->information_texture_.texture(); 
 }
 
-nux::BaseTexture* Style::GetRefineTextureCorner()
+BaseTexturePtr const& Style::GetRefineTextureCorner() const
 {
 return pimpl->refine_gradient_corner_.texture();
 }
 
-nux::BaseTexture* Style::GetRefineTextureDash()
+BaseTexturePtr const& Style::GetRefineTextureDash() const
 {
 return pimpl->refine_gradient_dash_.texture(); 
 }
 
-nux::BaseTexture* Style::GetGroupUnexpandIcon()
+BaseTexturePtr const& Style::GetGroupUnexpandIcon() const
 {
 return pimpl->group_unexpand_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetGroupExpandIcon()
+BaseTexturePtr const& Style::GetGroupExpandIcon() const
 {
 return pimpl->group_expand_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetStarDeselectedIcon()
+BaseTexturePtr const& Style::GetStarDeselectedIcon() const
 {
 return pimpl->star_deselected_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetStarSelectedIcon()
+BaseTexturePtr const& Style::GetStarSelectedIcon() const
 {
 return pimpl->star_selected_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetStarHighlightIcon()
+BaseTexturePtr const& Style::GetStarHighlightIcon() const
 {
 return pimpl->star_highlight_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetDashShine()
+BaseTexturePtr const& Style::GetDashShine() const
 {
 return pimpl->dash_shine_.texture();
 }
@@ -2504,11 +2502,11 @@ LazyLoadTexture::LazyLoadTexture(std::string const& filename, int size)
 {
 }
 
-nux::BaseTexture* LazyLoadTexture::texture()
+BaseTexturePtr const& LazyLoadTexture::texture()
 {
 if (!texture_)
 LoadTexture();
- return texture_.GetPointer();
+ return texture_;
 }
 
 void LazyLoadTexture::LoadTexture()
diff --git a/unity-shared/DashStyle.h b/unity-shared/DashStyle.h
index 50a5a4077..cd3a189c8 100755
--- a/unity-shared/DashStyle.h
+++ b/unity-shared/DashStyle.h
@@ -37,6 +37,7 @@ namespace unity
 {
 namespace dash
 {
+typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
 
 enum class StockIcon {
 CHECKMARK,
@@ -166,44 +167,45 @@ public:
 
 RawPixel GetTextLineHeight() const;
 
- nux::BaseTexture* GetCategoryBackground();
- nux::BaseTexture* GetCategoryBackgroundNoFilters();
- nux::BaseTexture* GetDashBottomTile();
- nux::BaseTexture* GetDashBottomTileMask();
- nux::BaseTexture* GetDashRightTile();
- nux::BaseTexture* GetDashRightTileMask();
- nux::BaseTexture* GetDashCorner();
- nux::BaseTexture* GetDashCornerMask();
- nux::BaseTexture* GetDashFullscreenIcon();
- nux::BaseTexture* GetDashLeftEdge();
- nux::BaseTexture* GetDashLeftCorner();
- nux::BaseTexture* GetDashLeftCornerMask();
- nux::BaseTexture* GetDashLeftTile();
- nux::BaseTexture* GetDashTopCorner();
- nux::BaseTexture* GetDashTopCornerMask();
- nux::BaseTexture* GetDashTopTile();
+ BaseTexturePtr const& GetCategoryBackground() const;
+ BaseTexturePtr const& GetCategoryBackgroundNoFilters() const;
+
+ BaseTexturePtr const& GetDashBottomTile() const;
+ BaseTexturePtr const& GetDashBottomTileMask() const;
+ BaseTexturePtr const& GetDashRightTile() const;
+ BaseTexturePtr const& GetDashRightTileMask() const;
+ BaseTexturePtr const& GetDashCorner() const;
+ BaseTexturePtr const& GetDashCornerMask() const;
+ BaseTexturePtr const& GetDashFullscreenIcon() const;
+ BaseTexturePtr const& GetDashLeftEdge() const;
+ BaseTexturePtr const& GetDashLeftCorner() const;
+ BaseTexturePtr const& GetDashLeftCornerMask() const;
+ BaseTexturePtr const& GetDashLeftTile() const;
+ BaseTexturePtr const& GetDashTopCorner() const;
+ BaseTexturePtr const& GetDashTopCornerMask() const;
+ BaseTexturePtr const& GetDashTopTile() const;
 
 RawPixel GetDashBottomTileHeight() const;
 RawPixel GetDashRightTileWidth() const;
 
- nux::BaseTexture* GetDashShine();
+ BaseTexturePtr const& GetDashShine() const;
 
- nux::BaseTexture* GetSearchMagnifyIcon();
- nux::BaseTexture* GetSearchCircleIcon();
- nux::BaseTexture* GetSearchCloseIcon();
- nux::BaseTexture* GetSearchSpinIcon();
+ BaseTexturePtr const& GetSearchMagnifyIcon() const;
+ BaseTexturePtr const& GetSearchCircleIcon() const;
+ BaseTexturePtr const& GetSearchCloseIcon() const;
+ BaseTexturePtr const& GetSearchSpinIcon() const;
 
- nux::BaseTexture* GetGroupUnexpandIcon();
- nux::BaseTexture* GetGroupExpandIcon();
+ BaseTexturePtr const& GetGroupUnexpandIcon() const;
+ BaseTexturePtr const& GetGroupExpandIcon() const;
 
- nux::BaseTexture* GetStarDeselectedIcon();
- nux::BaseTexture* GetStarSelectedIcon();
- nux::BaseTexture* GetStarHighlightIcon();
+ BaseTexturePtr const& GetStarDeselectedIcon() const;
+ BaseTexturePtr const& GetStarSelectedIcon() const;
+ BaseTexturePtr const& GetStarHighlightIcon() const;
 
- nux::BaseTexture* GetInformationTexture();
+ BaseTexturePtr const& GetInformationTexture() const;
 
- nux::BaseTexture* GetRefineTextureCorner();
- nux::BaseTexture* GetRefineTextureDash();
+ BaseTexturePtr const& GetRefineTextureCorner() const;
+ BaseTexturePtr const& GetRefineTextureDash() const;
 
 // Returns the width of the separator between the dash and the launcher.
 RawPixel GetVSeparatorSize() const;
diff --git a/unity-shared/DashStyleInterface.h b/unity-shared/DashStyleInterface.h
index 97ff5c194..3ff742ceb 100644
--- a/unity-shared/DashStyleInterface.h
+++ b/unity-shared/DashStyleInterface.h
@@ -26,6 +26,7 @@
 namespace nux {
 class AbstractPaintLayer;
 class BaseTexture;
+ template <class T> class ObjectPtr;
 }
 
 namespace unity {
@@ -38,11 +39,11 @@ public:
 
 virtual nux::AbstractPaintLayer* FocusOverlay(int width, int height) = 0;
 
- virtual nux::BaseTexture* GetCategoryBackground() = 0;
- virtual nux::BaseTexture* GetCategoryBackgroundNoFilters() = 0;
+ virtual nux::ObjectPtr<nux::BaseTexture> const& GetCategoryBackground() const = 0;
+ virtual nux::ObjectPtr<nux::BaseTexture> const& GetCategoryBackgroundNoFilters() const = 0;
 
- virtual nux::BaseTexture* GetGroupUnexpandIcon() = 0;
- virtual nux::BaseTexture* GetGroupExpandIcon() = 0;
+ virtual nux::ObjectPtr<nux::BaseTexture> const& GetGroupUnexpandIcon() const = 0;
+ virtual nux::ObjectPtr<nux::BaseTexture> const& GetGroupExpandIcon() const = 0;
 
 virtual RawPixel GetCategoryIconSize() const = 0;
 virtual RawPixel GetCategoryHeaderLeftPadding() const = 0;
diff --git a/unity-shared/OverlayRenderer.cpp b/unity-shared/OverlayRenderer.cpp
index 0eee56408..41959012a 100644
--- a/unity-shared/OverlayRenderer.cpp
+++ b/unity-shared/OverlayRenderer.cpp
@@ -142,9 +142,9 @@ void OverlayRendererImpl::UpdateTextures()
 }
 
 bg_darken_layer_ = std::make_shared<nux::ColorLayer>(darken_colour, false, rop);
- bg_shine_texture_ = unity::dash::Style::Instance().GetDashShine()->GetDeviceTexture();
+ bg_shine_texture_ = dash::Style::Instance().GetDashShine()->GetDeviceTexture();
 
- nux::BaseTexture* bg_refine_tex = unity::dash::Style::Instance().GetRefineTextureDash();
+ auto const& bg_refine_tex = dash::Style::Instance().GetRefineTextureDash();
 if (bg_refine_tex)
 {
 rop.Blend = true;
@@ -544,9 +544,9 @@ void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry c
 int gradien_width = std::min(bg_refine_gradient_->GetDeviceTexture()->GetWidth(), larger_content_geo.width);
 int gradien_height = std::min(bg_refine_gradient_->GetDeviceTexture()->GetHeight(), larger_content_geo.height);
 
- nux::Geometry geo_refine(larger_content_geo.x + larger_content_geo.width - gradien_width, 
+ nux::Geometry geo_refine(larger_content_geo.x + larger_content_geo.width - gradien_width,
 larger_content_geo.y,
- gradien_width, 
+ gradien_width,
 gradien_height);
 
 bg_refine_gradient_->SetGeometry(geo_refine);
@@ -566,18 +566,18 @@ void OverlayRendererImpl::Draw(nux::GraphicsEngine& gfx_context, nux::Geometry c
 gfx_context.GetRenderStates().SetPremultipliedBlend(nux::SRC_OVER);
 
 dash::Style& style = dash::Style::Instance();
- nux::BaseTexture* bottom = style.GetDashBottomTile();
- nux::BaseTexture* bottom_mask = style.GetDashBottomTileMask();
- nux::BaseTexture* right = style.GetDashRightTile();
- nux::BaseTexture* right_mask = style.GetDashRightTileMask();
- nux::BaseTexture* corner = style.GetDashCorner();
- nux::BaseTexture* corner_mask = style.GetDashCornerMask();
- nux::BaseTexture* left_corner = style.GetDashLeftCorner();
- nux::BaseTexture* left_corner_mask = style.GetDashLeftCornerMask();
- nux::BaseTexture* left_tile = style.GetDashLeftTile();
- nux::BaseTexture* top_corner = style.GetDashTopCorner();
- nux::BaseTexture* top_corner_mask = style.GetDashTopCornerMask();
- nux::BaseTexture* top_tile = style.GetDashTopTile();
+ auto const& bottom = style.GetDashBottomTile();
+ auto const& bottom_mask = style.GetDashBottomTileMask();
+ auto const& right = style.GetDashRightTile();
+ auto const& right_mask = style.GetDashRightTileMask();
+ auto const& corner = style.GetDashCorner();
+ auto const& corner_mask = style.GetDashCornerMask();
+ auto const& left_corner = style.GetDashLeftCorner();
+ auto const& left_corner_mask = style.GetDashLeftCornerMask();
+ auto const& left_tile = style.GetDashLeftTile();
+ auto const& top_corner = style.GetDashTopCorner();
+ auto const& top_corner_mask = style.GetDashTopCornerMask();
+ auto const& top_tile = style.GetDashTopTile();
 nux::TexCoordXForm texxform;
 
 int left_corner_offset = 10;
diff --git a/unity-shared/RatingsButton.cpp b/unity-shared/RatingsButton.cpp
index 9e30bc446..884d386ec 100644
--- a/unity-shared/RatingsButton.cpp
+++ b/unity-shared/RatingsButton.cpp
@@ -126,7 +126,7 @@ void RatingsButton::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 for (int index = 0; index < NUM_STARS; ++index)
 {
 dash::Style& style = dash::Style::Instance();
- nux::BaseTexture* texture = style.GetStarSelectedIcon();
+ auto texture = style.GetStarSelectedIcon();
 if (index < total_full_stars)
 {
 if (GetVisualState() == nux::ButtonVisualState::VISUAL_STATE_NORMAL)
diff --git a/unity-shared/SearchBarSpinner.cpp b/unity-shared/SearchBarSpinner.cpp
index edae3baa9..c352b5853 100644
--- a/unity-shared/SearchBarSpinner.cpp
+++ b/unity-shared/SearchBarSpinner.cpp
@@ -38,10 +38,10 @@ SearchBarSpinner::SearchBarSpinner()
 {
 dash::Style& style = dash::Style::Instance();
 
- magnify_ = style.GetSearchMagnifyIcon();
- circle_ = style.GetSearchCircleIcon();
- close_ = style.GetSearchCloseIcon();
- spin_ = style.GetSearchSpinIcon();
+ magnify_ = style.GetSearchMagnifyIcon().GetPointer();
+ circle_ = style.GetSearchCircleIcon().GetPointer();
+ close_ = style.GetSearchCloseIcon().GetPointer();
+ spin_ = style.GetSearchSpinIcon().GetPointer();
 
 rotate_.Identity();
 rotate_.Rotate_z(0.0);