Merge lp:~sladen/unity/unity-3d-no-glow-lp933578 into lp:unity

[Paul Sladen]

No glow updates and associate code/asset removal (LP: #933578)

[Andrea Cimitan (cimi)]

Approve design on my side, code removal is ok too... Waiting an approval from other mates

review: Approve (design)

[Gord Allott (gordallott)]

ta

review: Approve

=== removed file 'plugins/unityshell/resources/search_close_glow.png'
 Binary files plugins/unityshell/resources/search_close_glow.png	2011-04-10 22:12:46 +0000 and plugins/unityshell/resources/search_close_glow.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'plugins/unityshell/resources/search_spin_glow.png'
 Binary files plugins/unityshell/resources/search_spin_glow.png	2011-04-10 22:12:46 +0000 and plugins/unityshell/resources/search_spin_glow.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-02-20 11:59:12 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2012-02-24 16:14:58 +0000
@@ -206,9 +206,7 @@
 
   LazyLoadTexture search_magnify_texture_;
   LazyLoadTexture search_close_texture_;
-  LazyLoadTexture search_close_glow_texture_;
   LazyLoadTexture search_spin_texture_;
-  LazyLoadTexture search_spin_glow_texture_;
 
   LazyLoadTexture group_unexpand_texture_;
   LazyLoadTexture group_expand_texture_;
@@ -243,9 +241,7 @@
   , dash_shine_("/dash_sheen.png")
   , search_magnify_texture_("/search_magnify.png")
   , search_close_texture_("/search_close.png")
-  , search_close_glow_texture_("/search_close_glow.png")
   , search_spin_texture_("/search_spin.png")
-  , search_spin_glow_texture_("/search_spin_glow.png")
   , group_unexpand_texture_("/dash_group_unexpand.png")
   , group_expand_texture_("/dash_group_expand.png")
   , star_deselected_texture_("/star_deselected.png")
@@ -2114,21 +2110,11 @@
   return pimpl->search_close_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchCloseGlowIcon()
-{
-  return pimpl->search_close_glow_texture_.texture();
-}
-
 nux::BaseTexture* Style::GetSearchSpinIcon()
 {
   return pimpl->search_spin_texture_.texture();
 }
 
-nux::BaseTexture* Style::GetSearchSpinGlowIcon()
-{
-  return pimpl->search_spin_glow_texture_.texture();
-}
-
 nux::BaseTexture* Style::GetGroupUnexpandIcon()
 {
   return pimpl->group_unexpand_texture_.texture();
 
=== modified file 'plugins/unityshell/src/DashStyle.h'
--- plugins/unityshell/src/DashStyle.h	2012-02-20 11:59:12 +0000
+++ plugins/unityshell/src/DashStyle.h	2012-02-24 16:14:58 +0000
@@ -179,9 +179,7 @@
 
   nux::BaseTexture* GetSearchMagnifyIcon();
   nux::BaseTexture* GetSearchCloseIcon();
-  nux::BaseTexture* GetSearchCloseGlowIcon();
   nux::BaseTexture* GetSearchSpinIcon();
-  nux::BaseTexture* GetSearchSpinGlowIcon();
 
   nux::BaseTexture* GetGroupUnexpandIcon();
   nux::BaseTexture* GetGroupExpandIcon();
 
=== modified file 'plugins/unityshell/src/SearchBarSpinner.cpp'
--- plugins/unityshell/src/SearchBarSpinner.cpp	2012-02-21 04:32:46 +0000
+++ plugins/unityshell/src/SearchBarSpinner.cpp	2012-02-24 16:14:58 +0000
@@ -40,9 +40,7 @@
 
   _magnify = style.GetSearchMagnifyIcon();
   _close = style.GetSearchCloseIcon();
-  _close_glow = style.GetSearchCloseGlowIcon();
   _spin = style.GetSearchSpinIcon();
-  _spin_glow = style.GetSearchSpinGlowIcon();
 
   _2d_rotate.Identity();
   _2d_rotate.Rotate_z(0.0);
@@ -72,14 +70,6 @@
   texxform.min_filter = nux::TEXFILTER_LINEAR;
   texxform.mag_filter = nux::TEXFILTER_LINEAR;
 
-  GfxContext.QRP_1Tex(geo.x + ((geo.width - _spin_glow->GetWidth()) / 2),
-                      geo.y + ((geo.height - _spin_glow->GetHeight()) / 2),
-                      _spin_glow->GetWidth(),
-                      _spin_glow->GetHeight(),
-                      _spin_glow->GetDeviceTexture(),
-                      texxform,
-                      nux::color::White);
-
   if (_state == STATE_READY)
   {
     GfxContext.QRP_1Tex(geo.x + ((geo.width - _magnify->GetWidth()) / 2),
@@ -138,14 +128,6 @@
                         nux::color::White);
 
 
-    GfxContext.QRP_1Tex(geo.x + ((geo.width - _close_glow->GetWidth()) / 2),
-                        geo.y + ((geo.height - _close_glow->GetHeight()) / 2),
-                        _close_glow->GetWidth(),
-                        _close_glow->GetHeight(),
-                        _close_glow->GetDeviceTexture(),
-                        texxform,
-                        nux::color::White);
-
     GfxContext.QRP_1Tex(geo.x + ((geo.width - _close->GetWidth()) / 2),
                         geo.y + ((geo.height - _close->GetHeight()) / 2),
                         _close->GetWidth(),