Peter M. Groen / dali-demo

Commit 88eb6ec11b7bd9a5de79f117efbfad24358d9997

Authored by Jeongmin Lee
Committed by Gerrit Code Review
2 parents 4b728a67 b585d468

Merge "Apply changed API of BackgroundBlurEffect" into devel/master

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
examples/render-effects/render-effects-example.cpp
  View file @88eb6ec
@@ -75,7 +75,7 @@ public: @@ -75,7 +75,7 @@ public:
75 UIPanel.SetProperty(Actor::Property::SIZE, size * 0.8f); 75 UIPanel.SetProperty(Actor::Property::SIZE, size * 0.8f);
76 UIPanel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER); 76 UIPanel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
77 window.Add(UIPanel); 77 window.Add(UIPanel);
78 - UIPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 78 + UIPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
79 79
80 // Welcome message 80 // Welcome message
81 { 81 {
@@ -132,7 +132,7 @@ public: @@ -132,7 +132,7 @@ public:
132 label.Add(unitLabel); 132 label.Add(unitLabel);
133 133
134 UIPanel.Add(weatherPanel); 134 UIPanel.Add(weatherPanel);
135 - weatherPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 135 + weatherPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
136 } 136 }
137 137
138 // Icon mini panels 138 // Icon mini panels
@@ -146,25 +146,25 @@ public: @@ -146,25 +146,25 @@ public:
146 control.SetProperty(Actor::Property::POSITION, Vector2(-x_incrementer, y_starter)); 146 control.SetProperty(Actor::Property::POSITION, Vector2(-x_incrementer, y_starter));
147 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); 147 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
148 UIPanel.Add(control); 148 UIPanel.Add(control);
149 - control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 149 + control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
150 150
151 control = CreateIconPanel("BlueTooth", "2 devices", true, DEMO_IMAGE_DIR "application-icon-14.png", iconPanelSize); 151 control = CreateIconPanel("BlueTooth", "2 devices", true, DEMO_IMAGE_DIR "application-icon-14.png", iconPanelSize);
152 control.SetProperty(Actor::Property::POSITION, Vector2(x_incrementer, y_starter)); 152 control.SetProperty(Actor::Property::POSITION, Vector2(x_incrementer, y_starter));
153 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); 153 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
154 UIPanel.Add(control); 154 UIPanel.Add(control);
155 - control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 155 + control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
156 156
157 control = CreateIconPanel("Wi-Fi", "TizenUIFW", true, DEMO_IMAGE_DIR "application-icon-55.png", iconPanelSize); 157 control = CreateIconPanel("Wi-Fi", "TizenUIFW", true, DEMO_IMAGE_DIR "application-icon-55.png", iconPanelSize);
158 control.SetProperty(Actor::Property::POSITION, Vector2(-x_incrementer, y_starter + y_incrementer)); 158 control.SetProperty(Actor::Property::POSITION, Vector2(-x_incrementer, y_starter + y_incrementer));
159 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); 159 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
160 UIPanel.Add(control); 160 UIPanel.Add(control);
161 - control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 161 + control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
162 162
163 control = CreateIconPanel("Lighting", "5 devices", true, DEMO_IMAGE_DIR "application-icon-21.png", iconPanelSize); 163 control = CreateIconPanel("Lighting", "5 devices", true, DEMO_IMAGE_DIR "application-icon-21.png", iconPanelSize);
164 control.SetProperty(Actor::Property::POSITION, Vector2(x_incrementer, y_starter + y_incrementer)); 164 control.SetProperty(Actor::Property::POSITION, Vector2(x_incrementer, y_starter + y_incrementer));
165 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); 165 control.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
166 UIPanel.Add(control); 166 UIPanel.Add(control);
167 - control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 167 + control.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
168 } 168 }
169 169
170 // Air conditioner 170 // Air conditioner
@@ -213,7 +213,7 @@ public: @@ -213,7 +213,7 @@ public:
213 airConPanel.SetProperty(Toolkit::Control::Property::BACKGROUND, airConPanelDimmer); 213 airConPanel.SetProperty(Toolkit::Control::Property::BACKGROUND, airConPanelDimmer);
214 214
215 UIPanel.Add(airConPanel); 215 UIPanel.Add(airConPanel);
216 - airConPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40, 10.0f)); 216 + airConPanel.SetRenderEffect(Toolkit::BackgroundBlurEffect::New(0.4f, 40));
217 } 217 }
218 218
219 // lower background layer 219 // lower background layer