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

Proposed by Paul Sladen on 2012-02-24
Status: Merged
Approved by: Gord Allott on 2012-02-24
Approved revision: 2020
Merged at revision: 2019
Proposed branch: lp:~sladen/unity/unity-3d-no-glow-lp933578
Merge into: lp:unity
Diff against target: 107 lines (+0/-34)
3 files modified
plugins/unityshell/src/DashStyle.cpp (+0/-14)
plugins/unityshell/src/DashStyle.h (+0/-2)
plugins/unityshell/src/SearchBarSpinner.cpp (+0/-18)
To merge this branch: bzr merge lp:~sladen/unity/unity-3d-no-glow-lp933578
Reviewer Review Type Date Requested Status
Gord Allott (community) 2012-02-24 Approve on 2012-02-24
Andrea Cimitan (community) design 2012-02-24 Approve on 2012-02-24
Review via email: mp+94579@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Andrea Cimitan (cimi) wrote :

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

review: Approve (design)
Gord Allott (gordallott) wrote :

ta

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'plugins/unityshell/resources/search_close_glow.png'
0Binary 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 differ0Binary 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'
1Binary 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 differ1Binary 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 @@
206206
207 LazyLoadTexture search_magnify_texture_;207 LazyLoadTexture search_magnify_texture_;
208 LazyLoadTexture search_close_texture_;208 LazyLoadTexture search_close_texture_;
209 LazyLoadTexture search_close_glow_texture_;
210 LazyLoadTexture search_spin_texture_;209 LazyLoadTexture search_spin_texture_;
211 LazyLoadTexture search_spin_glow_texture_;
212210
213 LazyLoadTexture group_unexpand_texture_;211 LazyLoadTexture group_unexpand_texture_;
214 LazyLoadTexture group_expand_texture_;212 LazyLoadTexture group_expand_texture_;
@@ -243,9 +241,7 @@
243 , dash_shine_("/dash_sheen.png")241 , dash_shine_("/dash_sheen.png")
244 , search_magnify_texture_("/search_magnify.png")242 , search_magnify_texture_("/search_magnify.png")
245 , search_close_texture_("/search_close.png")243 , search_close_texture_("/search_close.png")
246 , search_close_glow_texture_("/search_close_glow.png")
247 , search_spin_texture_("/search_spin.png")244 , search_spin_texture_("/search_spin.png")
248 , search_spin_glow_texture_("/search_spin_glow.png")
249 , group_unexpand_texture_("/dash_group_unexpand.png")245 , group_unexpand_texture_("/dash_group_unexpand.png")
250 , group_expand_texture_("/dash_group_expand.png")246 , group_expand_texture_("/dash_group_expand.png")
251 , star_deselected_texture_("/star_deselected.png")247 , star_deselected_texture_("/star_deselected.png")
@@ -2114,21 +2110,11 @@
2114 return pimpl->search_close_texture_.texture();2110 return pimpl->search_close_texture_.texture();
2115}2111}
21162112
2117nux::BaseTexture* Style::GetSearchCloseGlowIcon()
2118{
2119 return pimpl->search_close_glow_texture_.texture();
2120}
2121
2122nux::BaseTexture* Style::GetSearchSpinIcon()2113nux::BaseTexture* Style::GetSearchSpinIcon()
2123{2114{
2124 return pimpl->search_spin_texture_.texture();2115 return pimpl->search_spin_texture_.texture();
2125}2116}
21262117
2127nux::BaseTexture* Style::GetSearchSpinGlowIcon()
2128{
2129 return pimpl->search_spin_glow_texture_.texture();
2130}
2131
2132nux::BaseTexture* Style::GetGroupUnexpandIcon()2118nux::BaseTexture* Style::GetGroupUnexpandIcon()
2133{2119{
2134 return pimpl->group_unexpand_texture_.texture();2120 return pimpl->group_unexpand_texture_.texture();
21352121
=== 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 @@
179179
180 nux::BaseTexture* GetSearchMagnifyIcon();180 nux::BaseTexture* GetSearchMagnifyIcon();
181 nux::BaseTexture* GetSearchCloseIcon();181 nux::BaseTexture* GetSearchCloseIcon();
182 nux::BaseTexture* GetSearchCloseGlowIcon();
183 nux::BaseTexture* GetSearchSpinIcon();182 nux::BaseTexture* GetSearchSpinIcon();
184 nux::BaseTexture* GetSearchSpinGlowIcon();
185183
186 nux::BaseTexture* GetGroupUnexpandIcon();184 nux::BaseTexture* GetGroupUnexpandIcon();
187 nux::BaseTexture* GetGroupExpandIcon();185 nux::BaseTexture* GetGroupExpandIcon();
188186
=== 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 @@
4040
41 _magnify = style.GetSearchMagnifyIcon();41 _magnify = style.GetSearchMagnifyIcon();
42 _close = style.GetSearchCloseIcon();42 _close = style.GetSearchCloseIcon();
43 _close_glow = style.GetSearchCloseGlowIcon();
44 _spin = style.GetSearchSpinIcon();43 _spin = style.GetSearchSpinIcon();
45 _spin_glow = style.GetSearchSpinGlowIcon();
4644
47 _2d_rotate.Identity();45 _2d_rotate.Identity();
48 _2d_rotate.Rotate_z(0.0);46 _2d_rotate.Rotate_z(0.0);
@@ -72,14 +70,6 @@
72 texxform.min_filter = nux::TEXFILTER_LINEAR;70 texxform.min_filter = nux::TEXFILTER_LINEAR;
73 texxform.mag_filter = nux::TEXFILTER_LINEAR;71 texxform.mag_filter = nux::TEXFILTER_LINEAR;
7472
75 GfxContext.QRP_1Tex(geo.x + ((geo.width - _spin_glow->GetWidth()) / 2),
76 geo.y + ((geo.height - _spin_glow->GetHeight()) / 2),
77 _spin_glow->GetWidth(),
78 _spin_glow->GetHeight(),
79 _spin_glow->GetDeviceTexture(),
80 texxform,
81 nux::color::White);
82
83 if (_state == STATE_READY)73 if (_state == STATE_READY)
84 {74 {
85 GfxContext.QRP_1Tex(geo.x + ((geo.width - _magnify->GetWidth()) / 2),75 GfxContext.QRP_1Tex(geo.x + ((geo.width - _magnify->GetWidth()) / 2),
@@ -138,14 +128,6 @@
138 nux::color::White);128 nux::color::White);
139129
140130
141 GfxContext.QRP_1Tex(geo.x + ((geo.width - _close_glow->GetWidth()) / 2),
142 geo.y + ((geo.height - _close_glow->GetHeight()) / 2),
143 _close_glow->GetWidth(),
144 _close_glow->GetHeight(),
145 _close_glow->GetDeviceTexture(),
146 texxform,
147 nux::color::White);
148
149 GfxContext.QRP_1Tex(geo.x + ((geo.width - _close->GetWidth()) / 2),131 GfxContext.QRP_1Tex(geo.x + ((geo.width - _close->GetWidth()) / 2),
150 geo.y + ((geo.height - _close->GetHeight()) / 2),132 geo.y + ((geo.height - _close->GetHeight()) / 2),
151 _close->GetWidth(),133 _close->GetWidth(),