Unity

Merge lp:~townsend/unity/unity.cleanup-refactor-preview into lp:unity

  1. unity.cleanup-refactor-preview
  2. Merge into trunk
Proposed by Christopher Townsend
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 3007
Proposed branch: lp:~townsend/unity/unity.cleanup-refactor-preview
Merge into: lp:unity
Diff against target: 350 lines (+4/-126)
8 files modified
dash/previews/ApplicationPreview.cpp (+0/-23)
dash/previews/GenericPreview.cpp (+0/-23)
dash/previews/MoviePreview.cpp (+2/-25)
dash/previews/MoviePreview.h (+1/-1)
dash/previews/MusicPreview.cpp (+0/-23)
dash/previews/Preview.cpp (+0/-5)
dash/previews/Preview.h (+1/-3)
dash/previews/SocialPreview.cpp (+0/-23)
To merge this branch: bzr merge lp:~townsend/unity/unity.cleanup-refactor-preview
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+141124@code.launchpad.net

Commit message

Per Nick Dedekind's comments on revno. 3006:
* Make SetupViews() into a pure virtual function.
* Get rid of SetupBackground(), details_bg_layer_, and GetShadowBackgroundEnabled and associated code. This is no longer used, so it's not needed.

Description of the change

Nick Dedekind reviewed my MP that has already been merged as revno. 3006. He had a few comments and after discussing these with him, I made the following changes:

- Make SetupViews() into a pure virtual function since what we really want here is to force any derived previews to define SetupViews().
- Get rid of SetupBackground(), details_bg_layer_, and GetShadowBackgroundEnabled and associated code. This is no longer used, so it's not needed.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good to me :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/ApplicationPreview.cpp 2012-12-21 20:03:25 +0000
@@ -63,7 +63,6 @@
63ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)63ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)
64: Preview(preview_model)64: Preview(preview_model)
65{65{
66 SetupBackground();
67 SetupViews();66 SetupViews();
68}67}
6968
@@ -75,23 +74,9 @@
75{74{
76 nux::Geometry const& base = GetGeometry();75 nux::Geometry const& base = GetGeometry();
7776
78 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
79
80 gfx_engine.PushClippingRectangle(base);77 gfx_engine.PushClippingRectangle(base);
81 nux::GetPainter().PaintBackground(gfx_engine, base);78 nux::GetPainter().PaintBackground(gfx_engine, base);
8279
83 if (enable_bg_shadows && full_data_layout_)
84 {
85 unsigned int alpha, src, dest = 0;
86 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
87 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
88
89 details_bg_layer_->SetGeometry(full_data_layout_->GetGeometry());
90 nux::GetPainter().RenderSinglePaintLayer(gfx_engine, full_data_layout_->GetGeometry(), details_bg_layer_.get());
91
92 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
93 }
94
95 gfx_engine.PopClippingRectangle();80 gfx_engine.PopClippingRectangle();
96}81}
9782
@@ -100,11 +85,6 @@
100 nux::Geometry const& base = GetGeometry();85 nux::Geometry const& base = GetGeometry();
101 gfx_engine.PushClippingRectangle(base);86 gfx_engine.PushClippingRectangle(base);
10287
103 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
104
105 if (enable_bg_shadows && !IsFullRedraw())
106 nux::GetPainter().PushLayer(gfx_engine, details_bg_layer_->GetGeometry(), details_bg_layer_.get());
107
108 unsigned int alpha, src, dest = 0;88 unsigned int alpha, src, dest = 0;
109 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);89 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
110 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);90 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -114,9 +94,6 @@
11494
115 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);95 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
11696
117 if (enable_bg_shadows && !IsFullRedraw())
118 nux::GetPainter().PopBackground();
119
120 gfx_engine.PopClippingRectangle();97 gfx_engine.PopClippingRectangle();
121}98}
12299
123100
=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/GenericPreview.cpp 2012-12-21 20:03:25 +0000
@@ -57,7 +57,6 @@
57GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)57GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)
58: Preview(preview_model)58: Preview(preview_model)
59{59{
60 SetupBackground();
61 SetupViews();60 SetupViews();
62}61}
6362
@@ -69,23 +68,9 @@
69{68{
70 nux::Geometry const& base = GetGeometry();69 nux::Geometry const& base = GetGeometry();
7170
72 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
73
74 gfx_engine.PushClippingRectangle(base);71 gfx_engine.PushClippingRectangle(base);
75 nux::GetPainter().PaintBackground(gfx_engine, base);72 nux::GetPainter().PaintBackground(gfx_engine, base);
7673
77 if (enable_bg_shadows && full_data_layout_)
78 {
79 unsigned int alpha, src, dest = 0;
80 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
81 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
82
83 details_bg_layer_->SetGeometry(full_data_layout_->GetGeometry());
84 nux::GetPainter().RenderSinglePaintLayer(gfx_engine, full_data_layout_->GetGeometry(), details_bg_layer_.get());
85
86 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
87 }
88
89 gfx_engine.PopClippingRectangle(); 74 gfx_engine.PopClippingRectangle();
90}75}
9176
@@ -94,11 +79,6 @@
94 nux::Geometry const& base = GetGeometry();79 nux::Geometry const& base = GetGeometry();
95 gfx_engine.PushClippingRectangle(base);80 gfx_engine.PushClippingRectangle(base);
9681
97 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
98
99 if (enable_bg_shadows && !IsFullRedraw())
100 nux::GetPainter().PushLayer(gfx_engine, details_bg_layer_->GetGeometry(), details_bg_layer_.get());
101
102 unsigned int alpha, src, dest = 0;82 unsigned int alpha, src, dest = 0;
103 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);83 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
104 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);84 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -108,9 +88,6 @@
10888
109 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);89 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
11090
111 if (enable_bg_shadows && !IsFullRedraw())
112 nux::GetPainter().PopBackground();
113
114 gfx_engine.PopClippingRectangle();91 gfx_engine.PopClippingRectangle();
115}92}
11693
11794
=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/MoviePreview.cpp 2012-12-21 20:03:25 +0000
@@ -58,8 +58,7 @@
58MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)58MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)
59: Preview(preview_model)59: Preview(preview_model)
60{60{
61 SetupBackground();61 SetupViews();
62 SetupView();
63}62}
6463
65MoviePreview::~MoviePreview()64MoviePreview::~MoviePreview()
@@ -80,23 +79,9 @@
80{79{
81 nux::Geometry const& base = GetGeometry();80 nux::Geometry const& base = GetGeometry();
8281
83 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
84
85 gfx_engine.PushClippingRectangle(base);82 gfx_engine.PushClippingRectangle(base);
86 nux::GetPainter().PaintBackground(gfx_engine, base);83 nux::GetPainter().PaintBackground(gfx_engine, base);
8784
88 if (enable_bg_shadows && full_data_layout_)
89 {
90 unsigned int alpha, src, dest = 0;
91 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
92 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
93
94 details_bg_layer_->SetGeometry(full_data_layout_->GetGeometry());
95 nux::GetPainter().RenderSinglePaintLayer(gfx_engine, full_data_layout_->GetGeometry(), details_bg_layer_.get());
96
97 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
98 }
99
100 gfx_engine.PopClippingRectangle(); 85 gfx_engine.PopClippingRectangle();
101}86}
10287
@@ -105,11 +90,6 @@
105 nux::Geometry const& base = GetGeometry();90 nux::Geometry const& base = GetGeometry();
106 gfx_engine.PushClippingRectangle(base);91 gfx_engine.PushClippingRectangle(base);
10792
108 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
109
110 if (enable_bg_shadows && !IsFullRedraw())
111 nux::GetPainter().PushLayer(gfx_engine, details_bg_layer_->GetGeometry(), details_bg_layer_.get());
112
113 unsigned int alpha, src, dest = 0;93 unsigned int alpha, src, dest = 0;
114 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);94 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
115 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);95 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -119,9 +99,6 @@
11999
120 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);100 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
121101
122 if (enable_bg_shadows && !IsFullRedraw())
123 nux::GetPainter().PopBackground();
124
125 gfx_engine.PopClippingRectangle();102 gfx_engine.PopClippingRectangle();
126}103}
127104
@@ -133,7 +110,7 @@
133{110{
134}111}
135112
136void MoviePreview::SetupView()113void MoviePreview::SetupViews()
137{114{
138 dash::MoviePreview* movie_preview_model = dynamic_cast<dash::MoviePreview*>(preview_model_.get());115 dash::MoviePreview* movie_preview_model = dynamic_cast<dash::MoviePreview*>(preview_model_.get());
139 if (!movie_preview_model)116 if (!movie_preview_model)
140117
=== modified file 'dash/previews/MoviePreview.h'
--- dash/previews/MoviePreview.h 2012-12-20 18:51:09 +0000
+++ dash/previews/MoviePreview.h 2012-12-21 20:03:25 +0000
@@ -54,7 +54,7 @@
54 virtual void OnNavigateOut();54 virtual void OnNavigateOut();
55 virtual void OnNavigateInComplete();55 virtual void OnNavigateInComplete();
5656
57 virtual void SetupView();57 virtual void SetupViews();
58 58
59protected:59protected:
60 nux::ObjectPtr<PreviewRatingsWidget> rating_;60 nux::ObjectPtr<PreviewRatingsWidget> rating_;
6161
=== modified file 'dash/previews/MusicPreview.cpp'
--- dash/previews/MusicPreview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/MusicPreview.cpp 2012-12-21 20:03:25 +0000
@@ -47,7 +47,6 @@
47MusicPreview::MusicPreview(dash::Preview::Ptr preview_model)47MusicPreview::MusicPreview(dash::Preview::Ptr preview_model)
48: Preview(preview_model)48: Preview(preview_model)
49{49{
50 SetupBackground();
51 SetupViews();50 SetupViews();
52}51}
5352
@@ -59,23 +58,9 @@
59{58{
60 nux::Geometry const& base = GetGeometry();59 nux::Geometry const& base = GetGeometry();
6160
62 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
63
64 gfx_engine.PushClippingRectangle(base);61 gfx_engine.PushClippingRectangle(base);
65 nux::GetPainter().PaintBackground(gfx_engine, base);62 nux::GetPainter().PaintBackground(gfx_engine, base);
6663
67 if (enable_bg_shadows && full_data_layout_)
68 {
69 unsigned int alpha, src, dest = 0;
70 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
71 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
72
73 details_bg_layer_->SetGeometry(full_data_layout_->GetGeometry());
74 nux::GetPainter().RenderSinglePaintLayer(gfx_engine, full_data_layout_->GetGeometry(), details_bg_layer_.get());
75
76 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
77 }
78
79 gfx_engine.PopClippingRectangle();64 gfx_engine.PopClippingRectangle();
80}65}
8166
@@ -84,11 +69,6 @@
84 nux::Geometry const& base = GetGeometry();69 nux::Geometry const& base = GetGeometry();
85 gfx_engine.PushClippingRectangle(base);70 gfx_engine.PushClippingRectangle(base);
8671
87 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
88
89 if (enable_bg_shadows && !IsFullRedraw())
90 nux::GetPainter().PushLayer(gfx_engine, details_bg_layer_->GetGeometry(), details_bg_layer_.get());
91
92 unsigned int alpha, src, dest = 0;72 unsigned int alpha, src, dest = 0;
93 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);73 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
94 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);74 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -98,9 +78,6 @@
9878
99 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);79 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
10080
101 if (enable_bg_shadows && !IsFullRedraw())
102 nux::GetPainter().PopBackground();
103
104 gfx_engine.PopClippingRectangle();81 gfx_engine.PopClippingRectangle();
105}82}
10683
10784
=== modified file 'dash/previews/Preview.cpp'
--- dash/previews/Preview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/Preview.cpp 2012-12-21 20:03:25 +0000
@@ -368,11 +368,6 @@
368 nux::GetWindowCompositor().SetKeyFocusArea(default_focus);368 nux::GetWindowCompositor().SetKeyFocusArea(default_focus);
369}369}
370370
371void Preview::SetupBackground()
372{
373 details_bg_layer_.reset(dash::previews::Style::Instance().GetBackgroundLayer());
374}
375
376}371}
377}372}
378}373}
379374
=== modified file 'dash/previews/Preview.h'
--- dash/previews/Preview.h 2012-12-20 18:51:09 +0000
+++ dash/previews/Preview.h 2012-12-21 20:03:25 +0000
@@ -86,8 +86,7 @@
8686
87 virtual bool AcceptKeyNavFocus() { return false; }87 virtual bool AcceptKeyNavFocus() { return false; }
8888
89 virtual void SetupViews() {}89 virtual void SetupViews() = 0;
90 void SetupBackground();
9190
92 nux::Layout* BuildGridActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);91 nux::Layout* BuildGridActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
93 nux::Layout* BuildVerticalActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);92 nux::Layout* BuildVerticalActionsLayout(dash::Preview::ActionPtrList actions, std::list<nux::AbstractButton*>& buttons);
@@ -108,7 +107,6 @@
108 PreviewInfoHintWidget::Ptr preview_info_hints_;107 PreviewInfoHintWidget::Ptr preview_info_hints_;
109108
110 typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;109 typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
111 LayerPtr details_bg_layer_;
112110
113 friend class PreviewContent;111 friend class PreviewContent;
114};112};
115113
=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp 2012-12-20 18:51:09 +0000
+++ dash/previews/SocialPreview.cpp 2012-12-21 20:03:25 +0000
@@ -64,7 +64,6 @@
64SocialPreview::SocialPreview(dash::Preview::Ptr preview_model)64SocialPreview::SocialPreview(dash::Preview::Ptr preview_model)
65: Preview(preview_model)65: Preview(preview_model)
66{66{
67 SetupBackground();
68 SetupViews();67 SetupViews();
69}68}
7069
@@ -76,23 +75,9 @@
76{75{
77 nux::Geometry const& base = GetGeometry();76 nux::Geometry const& base = GetGeometry();
7877
79 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
80
81 gfx_engine.PushClippingRectangle(base);78 gfx_engine.PushClippingRectangle(base);
82 nux::GetPainter().PaintBackground(gfx_engine, base);79 nux::GetPainter().PaintBackground(gfx_engine, base);
8380
84 if (enable_bg_shadows && full_data_layout_)
85 {
86 unsigned int alpha, src, dest = 0;
87 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
88 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
89
90 details_bg_layer_->SetGeometry(full_data_layout_->GetGeometry());
91 nux::GetPainter().RenderSinglePaintLayer(gfx_engine, full_data_layout_->GetGeometry(), details_bg_layer_.get());
92
93 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
94 }
95
96 gfx_engine.PopClippingRectangle();81 gfx_engine.PopClippingRectangle();
97}82}
9883
@@ -101,11 +86,6 @@
101 nux::Geometry const& base = GetGeometry();86 nux::Geometry const& base = GetGeometry();
102 gfx_engine.PushClippingRectangle(base);87 gfx_engine.PushClippingRectangle(base);
10388
104 bool enable_bg_shadows = dash::previews::Style::Instance().GetShadowBackgroundEnabled();
105
106 if (enable_bg_shadows && !IsFullRedraw())
107 nux::GetPainter().PushLayer(gfx_engine, details_bg_layer_->GetGeometry(), details_bg_layer_.get());
108
109 unsigned int alpha, src, dest = 0;89 unsigned int alpha, src, dest = 0;
110 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);90 gfx_engine.GetRenderStates().GetBlend(alpha, src, dest);
111 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);91 gfx_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
@@ -115,9 +95,6 @@
11595
116 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);96 gfx_engine.GetRenderStates().SetBlend(alpha, src, dest);
11797
118 if (enable_bg_shadows && !IsFullRedraw())
119 nux::GetPainter().PopBackground();
120
121 gfx_engine.PopClippingRectangle();98 gfx_engine.PopClippingRectangle();
122}99}
123100