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
1=== removed file 'plugins/unityshell/resources/search_close_glow.png'
2Binary 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
3=== removed file 'plugins/unityshell/resources/search_spin_glow.png'
4Binary 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
5=== modified file 'plugins/unityshell/src/DashStyle.cpp'
6--- plugins/unityshell/src/DashStyle.cpp 2012-02-20 11:59:12 +0000
7+++ plugins/unityshell/src/DashStyle.cpp 2012-02-24 16:14:58 +0000
8@@ -206,9 +206,7 @@
9
10 LazyLoadTexture search_magnify_texture_;
11 LazyLoadTexture search_close_texture_;
12- LazyLoadTexture search_close_glow_texture_;
13 LazyLoadTexture search_spin_texture_;
14- LazyLoadTexture search_spin_glow_texture_;
15
16 LazyLoadTexture group_unexpand_texture_;
17 LazyLoadTexture group_expand_texture_;
18@@ -243,9 +241,7 @@
19 , dash_shine_("/dash_sheen.png")
20 , search_magnify_texture_("/search_magnify.png")
21 , search_close_texture_("/search_close.png")
22- , search_close_glow_texture_("/search_close_glow.png")
23 , search_spin_texture_("/search_spin.png")
24- , search_spin_glow_texture_("/search_spin_glow.png")
25 , group_unexpand_texture_("/dash_group_unexpand.png")
26 , group_expand_texture_("/dash_group_expand.png")
27 , star_deselected_texture_("/star_deselected.png")
28@@ -2114,21 +2110,11 @@
29 return pimpl->search_close_texture_.texture();
30 }
31
32-nux::BaseTexture* Style::GetSearchCloseGlowIcon()
33-{
34- return pimpl->search_close_glow_texture_.texture();
35-}
36-
37 nux::BaseTexture* Style::GetSearchSpinIcon()
38 {
39 return pimpl->search_spin_texture_.texture();
40 }
41
42-nux::BaseTexture* Style::GetSearchSpinGlowIcon()
43-{
44- return pimpl->search_spin_glow_texture_.texture();
45-}
46-
47 nux::BaseTexture* Style::GetGroupUnexpandIcon()
48 {
49 return pimpl->group_unexpand_texture_.texture();
50
51=== modified file 'plugins/unityshell/src/DashStyle.h'
52--- plugins/unityshell/src/DashStyle.h 2012-02-20 11:59:12 +0000
53+++ plugins/unityshell/src/DashStyle.h 2012-02-24 16:14:58 +0000
54@@ -179,9 +179,7 @@
55
56 nux::BaseTexture* GetSearchMagnifyIcon();
57 nux::BaseTexture* GetSearchCloseIcon();
58- nux::BaseTexture* GetSearchCloseGlowIcon();
59 nux::BaseTexture* GetSearchSpinIcon();
60- nux::BaseTexture* GetSearchSpinGlowIcon();
61
62 nux::BaseTexture* GetGroupUnexpandIcon();
63 nux::BaseTexture* GetGroupExpandIcon();
64
65=== modified file 'plugins/unityshell/src/SearchBarSpinner.cpp'
66--- plugins/unityshell/src/SearchBarSpinner.cpp 2012-02-21 04:32:46 +0000
67+++ plugins/unityshell/src/SearchBarSpinner.cpp 2012-02-24 16:14:58 +0000
68@@ -40,9 +40,7 @@
69
70 _magnify = style.GetSearchMagnifyIcon();
71 _close = style.GetSearchCloseIcon();
72- _close_glow = style.GetSearchCloseGlowIcon();
73 _spin = style.GetSearchSpinIcon();
74- _spin_glow = style.GetSearchSpinGlowIcon();
75
76 _2d_rotate.Identity();
77 _2d_rotate.Rotate_z(0.0);
78@@ -72,14 +70,6 @@
79 texxform.min_filter = nux::TEXFILTER_LINEAR;
80 texxform.mag_filter = nux::TEXFILTER_LINEAR;
81
82- GfxContext.QRP_1Tex(geo.x + ((geo.width - _spin_glow->GetWidth()) / 2),
83- geo.y + ((geo.height - _spin_glow->GetHeight()) / 2),
84- _spin_glow->GetWidth(),
85- _spin_glow->GetHeight(),
86- _spin_glow->GetDeviceTexture(),
87- texxform,
88- nux::color::White);
89-
90 if (_state == STATE_READY)
91 {
92 GfxContext.QRP_1Tex(geo.x + ((geo.width - _magnify->GetWidth()) / 2),
93@@ -138,14 +128,6 @@
94 nux::color::White);
95
96
97- GfxContext.QRP_1Tex(geo.x + ((geo.width - _close_glow->GetWidth()) / 2),
98- geo.y + ((geo.height - _close_glow->GetHeight()) / 2),
99- _close_glow->GetWidth(),
100- _close_glow->GetHeight(),
101- _close_glow->GetDeviceTexture(),
102- texxform,
103- nux::color::White);
104-
105 GfxContext.QRP_1Tex(geo.x + ((geo.width - _close->GetWidth()) / 2),
106 geo.y + ((geo.height - _close->GetHeight()) / 2),
107 _close->GetWidth(),