Merge lp:~nux-team/nuxplayground/nuxplayground.removed-deprecated into lp:nuxplayground

Proposed by Eleni Maria Stea on 2012-11-05
Status: Needs review
Proposed branch: lp:~nux-team/nuxplayground/nuxplayground.removed-deprecated
Merge into: lp:nuxplayground
Diff against target: 638 lines (+121/-121)
12 files modified
src/common/ColorGradient.cpp (+2/-2)
src/grid-layout/grid-layout.cpp (+4/-4)
src/kinetic-scrollview/kinetic-scrollview.cpp (+2/-2)
src/nux-widgets/MatrixGroupBox.cpp (+1/-1)
src/nux-widgets/nux-widgets.cpp (+26/-26)
src/scrollview/scrollview.cpp (+3/-3)
src/shader-lighting/main.cpp (+51/-51)
src/shader-test-src/main.cpp (+1/-1)
src/text-input/text-input.cpp (+1/-1)
src/tweening-animations/main.cpp (+1/-1)
src/view-canvas/ViewCanvas.cpp (+1/-1)
src/visual-fx/main.cpp (+28/-28)
To merge this branch: bzr merge lp:~nux-team/nuxplayground/nuxplayground.removed-deprecated
Reviewer Review Type Date Requested Status
Eleni Maria Stea (community) Approve on 2012-11-05
Review via email: mp+132853@code.launchpad.net

Description of the change

removed deprecated enumerations that have been removed already from nux and unity

To post a comment you must log in.
Eleni Maria Stea (hikiko) :
review: Approve

Unmerged revisions

33. By Eleni Maria Stea on 2012-11-05

removed deprecated enumerations

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/common/ColorGradient.cpp'
2--- src/common/ColorGradient.cpp 2012-11-03 12:07:26 +0000
3+++ src/common/ColorGradient.cpp 2012-11-05 09:50:17 +0000
4@@ -74,8 +74,8 @@
5 //SetMaximumHeight(20);
6 // Set layout
7
8- hlayout->AddView (m_ValueString, 0, eCenter, eFull);
9- hlayout->AddView (m_Percentage, 4, eCenter, eFull);
10+ hlayout->AddView (m_ValueString, 0, MINOR_POSITION_CENTER, MINOR_SIZE_FULL);
11+ hlayout->AddView (m_Percentage, 4, MINOR_POSITION_CENTER, MINOR_SIZE_FULL);
12 //hlayout->AddLayout(&vlayout, 4);
13 hlayout->SetHorizontalExternalMargin (0);
14 hlayout->SetHorizontalInternalMargin (2);
15
16=== modified file 'src/grid-layout/grid-layout.cpp'
17--- src/grid-layout/grid-layout.cpp 2012-08-02 23:51:49 +0000
18+++ src/grid-layout/grid-layout.cpp 2012-11-05 09:50:17 +0000
19@@ -19,7 +19,7 @@
20 nux::TextureArea* texture_area = new nux::TextureArea ();
21 texture_area->SetPaintLayer (&color);
22
23- grid_h_layout->AddView (texture_area, 1, nux::eLeft, nux::eFull);
24+ grid_h_layout->AddView (texture_area, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
25 }
26
27 grid_h_layout->SetFillingOrder(nux::GridHLayout::FILL_HORIZONTAL);
28@@ -39,7 +39,7 @@
29 // nux::TextureArea* texture_area = new nux::TextureArea();
30 // texture_area->SetPaintLayer (&color);
31 //
32-// grid_v_layout->AddView(texture_area, 1, nux::eLeft, nux::eFull);
33+// grid_v_layout->AddView(texture_area, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
34 // }
35 //
36 // grid_v_layout->ForceChildrenSize (true);
37@@ -54,7 +54,7 @@
38
39 main_layout->AddLayout (grid_h_layout, 1);
40 //main_layout->AddLayout (grid_v_layout, 1);
41- //main_layout->SetContentDistribution (nux::eStackCenter);
42+ //main_layout->SetContentDistribution (nux::MAJOR_POSITION_CENTER);
43
44 nux::GetWindowThread ()->SetLayout(main_layout);
45 }
46@@ -67,4 +67,4 @@
47 wt->Run(NULL);
48 delete wt;
49 return 0;
50-}
51\ No newline at end of file
52+}
53
54=== modified file 'src/kinetic-scrollview/kinetic-scrollview.cpp'
55--- src/kinetic-scrollview/kinetic-scrollview.cpp 2012-10-12 03:41:13 +0000
56+++ src/kinetic-scrollview/kinetic-scrollview.cpp 2012-11-05 09:50:17 +0000
57@@ -38,7 +38,7 @@
58 Button *button = new TestButton(buffer, NUX_TRACKER_LOCATION);
59 button->SetMinimumHeight(50);
60
61- layout->AddView(button, 1, eLeft, eFull);
62+ layout->AddView(button, 1, MINOR_POSITION_START, MINOR_SIZE_FULL);
63 }
64
65 KineticScrollView *kinetic_scroll_view = new KineticScrollView(NUX_TRACKER_LOCATION);
66@@ -52,7 +52,7 @@
67 {
68
69 HLayout* mainLayout = new HLayout(NUX_TRACKER_LOCATION);
70- mainLayout->AddView(CreateKineticScrollView(), 1, eCenter, eFull);
71+ mainLayout->AddView(CreateKineticScrollView(), 1, MINOR_POSITION_CENTER, MINOR_SIZE_FULL);
72
73 GetWindowThread()->SetLayout(mainLayout);
74 }
75
76=== modified file 'src/nux-widgets/MatrixGroupBox.cpp'
77--- src/nux-widgets/MatrixGroupBox.cpp 2012-07-12 19:13:53 +0000
78+++ src/nux-widgets/MatrixGroupBox.cpp 2012-11-05 09:50:17 +0000
79@@ -222,7 +222,7 @@
80 (*it)->ComputeContentSize();
81 }
82
83- ret = nux::eCompliantHeight | nux::eCompliantWidth;
84+ ret = nux::SIZE_EQUAL_HEIGHT | nux::SIZE_EQUAL_WIDTH;
85 return ret;
86 }
87
88
89=== modified file 'src/nux-widgets/nux-widgets.cpp'
90--- src/nux-widgets/nux-widgets.cpp 2012-07-12 19:13:53 +0000
91+++ src/nux-widgets/nux-widgets.cpp 2012-11-05 09:50:17 +0000
92@@ -59,7 +59,7 @@
93 nux::TextureArea* texture_area = new nux::TextureArea ();
94 texture_area->SetPaintLayer (&color);
95
96- grid_h_layout->AddView (texture_area, 1, nux::eLeft, nux::eFull);
97+ grid_h_layout->AddView (texture_area, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
98 }
99
100 grid_h_layout->ForceChildrenSize (true);
101@@ -92,8 +92,8 @@
102
103 // layout->AddView (combobox, 0);
104 layout->AddView (GetMenuBar (g_proxy), 1);
105- layout->AddView(scroll_view, 1, nux::eCenter, nux::eFull);
106- layout->SetContentDistribution(nux::eStackCenter);
107+ layout->AddView(scroll_view, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
108+ layout->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
109
110 AboutWindow->SetLayout(layout);
111 }
112@@ -365,11 +365,11 @@
113 // radio_Wireframe->sigStateChanged.connect(sigc::bind(sigc::ptr_fun(SetWireframeMode), proxy));
114 // radio_Point->sigStateChanged.connect(sigc::bind(sigc::ptr_fun(SetPointMode), proxy));
115
116- polygon_mode_layout->AddView(radio_Fill, 0, nux::eLeft, nux::eFix);
117- polygon_mode_layout->AddView(radio_Wireframe, 0, nux::eLeft, nux::eFix);
118- polygon_mode_layout->AddView(radio_Point, 0, nux::eLeft, nux::eFix);
119- polygon_mode_layout->AddView(new nux::CheckBox("Test", false, NUX_TRACKER_LOCATION), 0, nux::eLeft, nux::eFix);
120- polygon_mode_layout->AddView(new nux::Button("Test", NUX_TRACKER_LOCATION), 0, nux::eLeft, nux::eFix);
121+ polygon_mode_layout->AddView(radio_Fill, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
122+ polygon_mode_layout->AddView(radio_Wireframe, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
123+ polygon_mode_layout->AddView(radio_Point, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
124+ polygon_mode_layout->AddView(new nux::CheckBox("Test", false, NUX_TRACKER_LOCATION), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
125+ polygon_mode_layout->AddView(new nux::Button("Test", NUX_TRACKER_LOCATION), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
126
127 polygon_mode_layout->SetVerticalInternalMargin(4);
128
129@@ -386,11 +386,11 @@
130
131 nux::VLayout* parameters_layout(new nux::VLayout("", NUX_TRACKER_LOCATION));
132 parameters_layout->SetVerticalInternalMargin(4);
133- parameters_layout->AddView(new nux::SpinBox(), 0, nux::eLeft, nux::eFix);
134- // parameters_layout->AddView(combobox_ui, 0, nux::eLeft, nux::eFull);
135- parameters_layout->AddView(new nux::SpinBox(), 0, nux::eLeft, nux::eFix);
136- parameters_layout->AddView(new nux::SpinBoxDouble(), 0, nux::eLeft, nux::eFix);
137- parameters_layout->AddView(new nux::ColorEditor(), 0, nux::eLeft, nux::eFix);
138+ parameters_layout->AddView(new nux::SpinBox(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
139+ // parameters_layout->AddView(combobox_ui, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
140+ parameters_layout->AddView(new nux::SpinBox(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
141+ parameters_layout->AddView(new nux::SpinBoxDouble(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
142+ parameters_layout->AddView(new nux::ColorEditor(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
143
144 group_box2_0->SetLayout(parameters_layout);
145 }
146@@ -420,26 +420,26 @@
147
148 nux::VLayout* parameters_layout(new nux::VLayout());
149 parameters_layout->SetVerticalInternalMargin(4);
150- //parameters_layout->AddView(fileselector, 1, nux::eLeft, nux::eFull);
151- // parameters_layout->AddView(combobox_ui, 0, nux::eLeft, nux::eFix);
152- parameters_layout->AddView(checkbox, 0, nux::eLeft, nux::eFix);
153- parameters_layout->AddView(radio_button, 0, nux::eLeft, nux::eFix);
154- parameters_layout->AddView(button, 0, nux::eLeft, nux::eFull);
155- parameters_layout->AddView(checkablebutton, 0, nux::eLeft, nux::eFull);
156- parameters_layout->AddView(rgbvaluator, 0, nux::eLeft, nux::MINOR_SIZE_MATCHCONTENT);
157+ //parameters_layout->AddView(fileselector, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
158+ // parameters_layout->AddView(combobox_ui, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
159+ parameters_layout->AddView(checkbox, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
160+ parameters_layout->AddView(radio_button, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
161+ parameters_layout->AddView(button, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
162+ parameters_layout->AddView(checkablebutton, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
163+ parameters_layout->AddView(rgbvaluator, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
164
165- parameters_layout->AddView(new nux::RangeValueInteger(0, 0, 10), 1, nux::eLeft, nux::eFull);
166- parameters_layout->AddView(new nux::RangeValue(), 1, nux::eLeft, nux::eFull);
167-// parameters_layout->AddView(new nux::ColorPreview(), 0, nux::eLeft, nux::eFix);
168+ parameters_layout->AddView(new nux::RangeValueInteger(0, 0, 10), 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
169+ parameters_layout->AddView(new nux::RangeValue(), 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
170+// parameters_layout->AddView(new nux::ColorPreview(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FIX);
171
172 group_box2_1->SetLayout(parameters_layout);
173 }
174
175 FinalLayout->SetHorizontalInternalMargin(6);
176 polygon_mode_group_box2->SetBaseHeight(200);
177- FinalLayout->AddView(polygon_mode_group_box2, 0, nux::eAbove, nux::eMatchContent);
178- FinalLayout->AddView(group_box2_0, 0, nux::eAbove, nux::eMatchContent);
179- FinalLayout->AddView(group_box2_1, 1, nux::eAbove, nux::eMatchContent);
180+ FinalLayout->AddView(polygon_mode_group_box2, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
181+ FinalLayout->AddView(group_box2_0, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
182+ FinalLayout->AddView(group_box2_1, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
183
184 return FinalLayout;
185 }
186
187=== modified file 'src/scrollview/scrollview.cpp'
188--- src/scrollview/scrollview.cpp 2012-10-25 10:34:48 +0000
189+++ src/scrollview/scrollview.cpp 2012-11-05 09:50:17 +0000
190@@ -39,7 +39,7 @@
191 nux::TextureArea* texture_area = new nux::TextureArea ();
192 texture_area->SetPaintLayer (&color);
193
194- grid_h_layout->AddView (texture_area, 1, nux::eLeft, nux::eFull);
195+ grid_h_layout->AddView (texture_area, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
196 }
197
198 grid_h_layout->ForceChildrenSize (true);
199@@ -53,8 +53,8 @@
200 grid_h_layout->SetScaleFactor(1);
201 scroll_view->SetLayout(grid_h_layout);
202
203- MainVLayout->AddView(scroll_view, 1, nux::eCenter, nux::eFull);
204- MainVLayout->SetContentDistribution(nux::eStackCenter);
205+ MainVLayout->AddView(scroll_view, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
206+ MainVLayout->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
207
208 nux::GetWindowThread ()->SetLayout(MainVLayout);
209 nux::ColorLayer background(nux::Color(0xFF4D4D4D));
210
211=== modified file 'src/shader-lighting/main.cpp'
212--- src/shader-lighting/main.cpp 2012-10-12 03:41:13 +0000
213+++ src/shader-lighting/main.cpp 2012-11-05 09:50:17 +0000
214@@ -262,15 +262,15 @@
215 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
216
217 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Ambient Coefficient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
218- // ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::eLeft, nux::eFull);
219+ // ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
220 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Ambient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
221- // ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::eLeft, nux::eFull);
222+ // ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
223 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
224- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
225+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
226 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
227- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
228+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
229 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Specular Exponent", NUX_TRACKER_LOCATION)), 0);
230- ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::eLeft, nux::eFull);
231+ ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
232
233 return ShaderCtrlLayout;
234 }
235@@ -301,15 +301,15 @@
236 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
237
238 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Ambient Coefficient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
239-// ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::eLeft, nux::eFull);
240+// ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
241 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Ambient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
242-// ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::eLeft, nux::eFull);
243+// ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
244 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
245- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
246+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
247 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
248- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
249+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
250 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Specular Exponent", NUX_TRACKER_LOCATION)), 0);
251- ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::eLeft, nux::eFull);
252+ ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
253
254 return ShaderCtrlLayout;
255 }
256@@ -340,15 +340,15 @@
257 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
258
259 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Ambient Coefficient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
260-// ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::eLeft, nux::eFull);
261+// ShaderCtrlLayout->AddView(AmbientCoefficient, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
262 // ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Ambient"), 0xFFC8C8C8, nux::GetSysBoldFont()), 0);
263-// ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::eLeft, nux::eFull);
264+// ShaderCtrlLayout->AddView(MaterialAmbientColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
265 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
266- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
267+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
268 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
269- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
270+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
271 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Specular Exponent", NUX_TRACKER_LOCATION)), 0);
272- ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::eLeft, nux::eFull);
273+ ShaderCtrlLayout->AddView(SpecularExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
274
275 return ShaderCtrlLayout;
276 }
277@@ -378,13 +378,13 @@
278 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
279
280 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
281- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
282+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
283 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
284- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
285+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
286 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Roughness (m)", NUX_TRACKER_LOCATION)), 0);
287- ShaderCtrlLayout->AddView(Roughness, 0, nux::eLeft, nux::eFull);
288+ ShaderCtrlLayout->AddView(Roughness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
289 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Fresnel at Normal Incidence (F0)", NUX_TRACKER_LOCATION)), 0);
290- ShaderCtrlLayout->AddView(FresnelF0, 0, nux::eLeft, nux::eFull);
291+ ShaderCtrlLayout->AddView(FresnelF0, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
292
293 return ShaderCtrlLayout;
294 }
295@@ -411,11 +411,11 @@
296 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
297
298 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
299- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
300+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
301 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
302- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
303+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
304 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Roughness (m)", NUX_TRACKER_LOCATION)), 0);
305- ShaderCtrlLayout->AddView(Roughness, 0, nux::eLeft, nux::eFull);
306+ ShaderCtrlLayout->AddView(Roughness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
307
308 return ShaderCtrlLayout;
309 }
310@@ -447,15 +447,15 @@
311 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
312
313 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
314- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
315+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
316 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
317- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
318+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
319 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Smoothness", NUX_TRACKER_LOCATION)), 0);
320- ShaderCtrlLayout->AddView(Smoothness, 0, nux::eLeft, nux::eFull);
321+ ShaderCtrlLayout->AddView(Smoothness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
322 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Metalness", NUX_TRACKER_LOCATION)), 0);
323- ShaderCtrlLayout->AddView(Metalness, 0, nux::eLeft, nux::eFull);
324+ ShaderCtrlLayout->AddView(Metalness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
325 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Transparency", NUX_TRACKER_LOCATION)), 0);
326- ShaderCtrlLayout->AddView(Transparency, 0, nux::eLeft, nux::eFull);
327+ ShaderCtrlLayout->AddView(Transparency, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
328
329 return ShaderCtrlLayout;
330 }
331@@ -484,11 +484,11 @@
332 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
333
334 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
335- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
336+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
337 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
338- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
339+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
340 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Roughness (m)", NUX_TRACKER_LOCATION)), 0);
341- ShaderCtrlLayout->AddView(Roughness, 0, nux::eLeft, nux::eFull);
342+ ShaderCtrlLayout->AddView(Roughness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
343
344 return ShaderCtrlLayout;
345 }
346@@ -520,13 +520,13 @@
347 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
348
349 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
350- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
351+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
352 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
353- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
354+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
355 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Roughness (X)", NUX_TRACKER_LOCATION)), 0);
356- ShaderCtrlLayout->AddView(RoughnessX, 0, nux::eLeft, nux::eFull);
357+ ShaderCtrlLayout->AddView(RoughnessX, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
358 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Roughness (Y)", NUX_TRACKER_LOCATION)), 0);
359- ShaderCtrlLayout->AddView(RoughnessY, 0, nux::eLeft, nux::eFull);
360+ ShaderCtrlLayout->AddView(RoughnessY, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
361
362 return ShaderCtrlLayout;
363 }
364@@ -558,13 +558,13 @@
365 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
366
367 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Diffuse", NUX_TRACKER_LOCATION)), 0);
368- ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::eLeft, nux::eFull);
369+ ShaderCtrlLayout->AddView(MaterialDiffuseColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
370 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Material Specular", NUX_TRACKER_LOCATION)), 0);
371- ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::eLeft, nux::eFull);
372+ ShaderCtrlLayout->AddView(MaterialSpecularColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
373 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Exponent U", NUX_TRACKER_LOCATION)), 0);
374- ShaderCtrlLayout->AddView(ExponentU, 0, nux::eLeft, nux::eFull);
375+ ShaderCtrlLayout->AddView(ExponentU, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
376 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Exponent V", NUX_TRACKER_LOCATION)), 0);
377- ShaderCtrlLayout->AddView(ExponentV, 0, nux::eLeft, nux::eFull);
378+ ShaderCtrlLayout->AddView(ExponentV, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
379
380 return ShaderCtrlLayout;
381 }
382@@ -593,8 +593,8 @@
383 RadioGroup->ConnectButton(ShowVertexNormalColorButton);
384
385 nux::VLayout* vlayout(new nux::VLayout(NUX_TRACKER_LOCATION));
386- vlayout->AddView(ShowAllShadersButton, 1, nux::eLeft, nux::eMatchContent);
387- vlayout->AddView(ShowVertexNormalColorButton, 1, nux::eLeft, nux::eMatchContent);
388+ vlayout->AddView(ShowAllShadersButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
389+ vlayout->AddView(ShowVertexNormalColorButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
390 vlayout->SetVerticalInternalMargin(4);
391 vlayout->SetVerticalExternalMargin(8);
392
393@@ -671,37 +671,37 @@
394
395 ShadingGroup->SetActiveButton(TeapotMeshButton, true);
396
397- LightingModelLayout->AddView(SphereMeshButton, 1, nux::eLeft, nux::eMatchContent);
398- LightingModelLayout->AddView(VenusMeshButton, 1, nux::eLeft, nux::eMatchContent);
399- LightingModelLayout->AddView(DragonMeshButton, 1, nux::eLeft, nux::eMatchContent);
400- LightingModelLayout->AddView(TeapotMeshButton, 1, nux::eLeft, nux::eMatchContent);
401+ LightingModelLayout->AddView(SphereMeshButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
402+ LightingModelLayout->AddView(VenusMeshButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
403+ LightingModelLayout->AddView(DragonMeshButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
404+ LightingModelLayout->AddView(TeapotMeshButton, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
405
406 LightingModelLayout->AddView(new nux::SpaceLayout(1, 1, 1, 28, NUX_TRACKER_LOCATION));
407- LightingModelLayout->AddView(rotate_camera_button, 1, nux::eLeft, nux::eMatchContent);
408- LightingModelLayout->AddView(rotate_mesh_button, 1, nux::eLeft, nux::eMatchContent);
409+ LightingModelLayout->AddView(rotate_camera_button, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
410+ LightingModelLayout->AddView(rotate_mesh_button, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
411 LightingModelLayout->AddView(new nux::SpaceLayout(1, 1, 1, 28, NUX_TRACKER_LOCATION));
412- LightingModelLayout->AddView(ShowBackground, 1, nux::eLeft, nux::eMatchContent);
413- LightingModelLayout->AddView(real_time_checkbox, 1, nux::eLeft, nux::eMatchContent);
414+ LightingModelLayout->AddView(ShowBackground, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
415+ LightingModelLayout->AddView(real_time_checkbox, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
416
417 nux::Button* reset_position_button(new nux::Button("Reset Position", NUX_TRACKER_LOCATION));
418 reset_position_button->click.connect(sigc::mem_fun(g_app, &Application::ResetPosition));
419 reset_position_button->SetMinimumWidth(100);
420 reset_position_button->SetMinimumHeight(24);
421
422- LightingModelLayout->AddView(reset_position_button, 1, nux::eLeft, nux::eMatchContent);
423+ LightingModelLayout->AddView(reset_position_button, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
424
425 nux::Button* reload_shaders_button(new nux::Button("Reload Shaders", NUX_TRACKER_LOCATION));
426 reload_shaders_button->click.connect(sigc::mem_fun(g_app, &Application::LoadShader));
427 reload_shaders_button->SetMinimumWidth(100);
428 reload_shaders_button->SetMinimumHeight(24);
429
430- LightingModelLayout->AddView(reload_shaders_button, 1, nux::eLeft, nux::eMatchContent);
431+ LightingModelLayout->AddView(reload_shaders_button, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
432
433 LightingModelLayout->SetVerticalInternalMargin(4);
434 LightingModelLayout->SetHorizontalExternalMargin(8);
435 LightingModelGroupBox->SetLayout(LightingModelLayout);
436
437- ControlLayout->AddView(LightingModelGroupBox, 0, nux::eLeft, nux::eFull);
438+ ControlLayout->AddView(LightingModelGroupBox, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
439
440 ShowBackground->Activate();
441
442
443=== modified file 'src/shader-test-src/main.cpp'
444--- src/shader-test-src/main.cpp 2012-05-29 16:13:07 +0000
445+++ src/shader-test-src/main.cpp 2012-11-05 09:50:17 +0000
446@@ -60,7 +60,7 @@
447 layout->AddView (
448 event_type_text_,
449 1,
450- nux::MINOR_POSITION_LEFT,
451+ nux::MINOR_POSITION_START,
452 nux::MINOR_SIZE_FULL);
453
454 layout->AddView (
455
456=== modified file 'src/text-input/text-input.cpp'
457--- src/text-input/text-input.cpp 2012-10-01 04:33:48 +0000
458+++ src/text-input/text-input.cpp 2012-11-05 09:50:17 +0000
459@@ -94,7 +94,7 @@
460
461 //main_layout->AddView(GetAnimationTypeLayout(), 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
462 main_layout->AddLayout(layout_, 0);
463- main_layout->AddView(text_color_ui_, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_MATCHCONTENT);
464+ main_layout->AddView(text_color_ui_, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
465 //main_layout->AddView(color_sphere_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_MATCHCONTENT);
466
467 main_layout->SetPadding(4, 4);
468
469=== modified file 'src/tweening-animations/main.cpp'
470--- src/tweening-animations/main.cpp 2012-07-04 16:30:56 +0000
471+++ src/tweening-animations/main.cpp 2012-11-05 09:50:17 +0000
472@@ -552,7 +552,7 @@
473 layout_->AddView(
474 label_,
475 0,
476- nux::MINOR_POSITION_LEFT,
477+ nux::MINOR_POSITION_START,
478 nux::MINOR_SIZE_FULL);
479 layout_->SetContentDistribution(nux::MAJOR_POSITION_CENTER);
480
481
482=== modified file 'src/view-canvas/ViewCanvas.cpp'
483--- src/view-canvas/ViewCanvas.cpp 2012-10-01 04:33:48 +0000
484+++ src/view-canvas/ViewCanvas.cpp 2012-11-05 09:50:17 +0000
485@@ -96,7 +96,7 @@
486 (*it)->ComputeContentSize();
487 }
488
489- ret = eCompliantHeight | eCompliantWidth;
490+ ret = SIZE_EQUAL_HEIGHT | SIZE_EQUAL_WIDTH;
491 return ret;
492 }
493
494
495=== modified file 'src/visual-fx/main.cpp'
496--- src/visual-fx/main.cpp 2012-05-29 16:13:07 +0000
497+++ src/visual-fx/main.cpp 2012-11-05 09:50:17 +0000
498@@ -203,13 +203,13 @@
499 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
500
501 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Color", NUX_TRACKER_LOCATION)), 0);
502- ShaderCtrlLayout->AddView(GlowColor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
503+ ShaderCtrlLayout->AddView(GlowColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
504 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Radius", NUX_TRACKER_LOCATION)), 0);
505- ShaderCtrlLayout->AddView(GlowRadius, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
506+ ShaderCtrlLayout->AddView(GlowRadius, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
507 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Exponent", NUX_TRACKER_LOCATION)), 0);
508- ShaderCtrlLayout->AddView(GlowExponent, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
509+ ShaderCtrlLayout->AddView(GlowExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
510 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Brightness", NUX_TRACKER_LOCATION)), 0);
511- ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
512+ ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
513
514 return ShaderCtrlLayout;
515 }
516@@ -233,11 +233,11 @@
517 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
518
519 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Radius", NUX_TRACKER_LOCATION)), 0);
520- ShaderCtrlLayout->AddView(Radius, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
521+ ShaderCtrlLayout->AddView(Radius, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
522 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Exponent", NUX_TRACKER_LOCATION)), 0);
523- ShaderCtrlLayout->AddView(Exponent, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
524+ ShaderCtrlLayout->AddView(Exponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
525 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Brightness", NUX_TRACKER_LOCATION)), 0);
526- ShaderCtrlLayout->AddView(Brightness, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
527+ ShaderCtrlLayout->AddView(Brightness, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
528
529 return ShaderCtrlLayout;
530 }
531@@ -270,17 +270,17 @@
532 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
533
534 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Noise Factor"), NUX_TRACKER_LOCATION)), 0);
535- ShaderCtrlLayout->AddView(noise_factor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
536+ ShaderCtrlLayout->AddView(noise_factor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
537 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Noise H Modulation"), NUX_TRACKER_LOCATION)), 0);
538- ShaderCtrlLayout->AddView(noise_horizontal_factor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
539+ ShaderCtrlLayout->AddView(noise_horizontal_factor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
540 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Noise V Modulation"), NUX_TRACKER_LOCATION)), 0);
541- ShaderCtrlLayout->AddView(noise_vertical_factor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
542+ ShaderCtrlLayout->AddView(noise_vertical_factor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
543 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Gaussian Sigma"), NUX_TRACKER_LOCATION)), 0);
544- ShaderCtrlLayout->AddView(gaussian_sigma, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
545+ ShaderCtrlLayout->AddView(gaussian_sigma, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
546 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Num Passes"), NUX_TRACKER_LOCATION)), 0);
547- ShaderCtrlLayout->AddView(blur_passes, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
548+ ShaderCtrlLayout->AddView(blur_passes, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
549 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Color Modulation"), NUX_TRACKER_LOCATION)), 0);
550- ShaderCtrlLayout->AddView(rgb_valuator, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
551+ ShaderCtrlLayout->AddView(rgb_valuator, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
552 return ShaderCtrlLayout;
553 }
554
555@@ -300,9 +300,9 @@
556 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
557
558 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Pixel Blocks Size"), NUX_TRACKER_LOCATION)), 0);
559- ShaderCtrlLayout->AddView(pixel_block_size, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
560+ ShaderCtrlLayout->AddView(pixel_block_size, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
561 ShaderCtrlLayout->AddView((new nux::StaticTextBox(TEXT("Color Modulation"), NUX_TRACKER_LOCATION)), 0);
562- ShaderCtrlLayout->AddView(rgb_valuator, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
563+ ShaderCtrlLayout->AddView(rgb_valuator, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
564 return ShaderCtrlLayout;
565 }
566
567@@ -326,13 +326,13 @@
568 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
569
570 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Color", NUX_TRACKER_LOCATION)), 0);
571- ShaderCtrlLayout->AddView(DropShadowColor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
572+ ShaderCtrlLayout->AddView(DropShadowColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
573 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Radius", NUX_TRACKER_LOCATION)), 0);
574- ShaderCtrlLayout->AddView(DropShadowRadius, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
575+ ShaderCtrlLayout->AddView(DropShadowRadius, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
576 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Exponent", NUX_TRACKER_LOCATION)), 0);
577- ShaderCtrlLayout->AddView(DropShadowExponent, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
578+ ShaderCtrlLayout->AddView(DropShadowExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
579 ShaderCtrlLayout->AddView((new nux::StaticTextBox("Brightness", NUX_TRACKER_LOCATION)), 0);
580- ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
581+ ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
582
583 return ShaderCtrlLayout;
584 }
585@@ -347,9 +347,9 @@
586 fxaa_quality_edge_threshold->sigFloatChanged.connect(sigc::bind(sigc::mem_fun(App->fxaa_effect_, &FXAAEffect::SetEdgeThresholdValue), App->scene_view_));
587
588 control_layout->AddView((new nux::StaticTextBox("Fxaa SubPixel", NUX_TRACKER_LOCATION)), 0);
589- control_layout->AddView(fxaa_quality_subpix, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
590+ control_layout->AddView(fxaa_quality_subpix, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
591 control_layout->AddView((new nux::StaticTextBox("Fxaa Edge Threshold", NUX_TRACKER_LOCATION)), 0);
592- control_layout->AddView(fxaa_quality_edge_threshold, 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
593+ control_layout->AddView(fxaa_quality_edge_threshold, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
594
595 control_layout->SetSpaceBetweenChildren(4);
596
597@@ -376,13 +376,13 @@
598 nux::VLayout* ShaderCtrlLayout(new nux::VLayout(NUX_TRACKER_LOCATION));
599
600 /*ShaderCtrlLayout->AddView((new StaticTextBox("Color", NUX_TRACKER_LOCATION)), 0);
601- ShaderCtrlLayout->AddView(DropShadowColor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
602+ ShaderCtrlLayout->AddView(DropShadowColor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
603 ShaderCtrlLayout->AddView((new StaticTextBox("Radius", NUX_TRACKER_LOCATION)), 0);
604- ShaderCtrlLayout->AddView(DropShadowRadius, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
605+ ShaderCtrlLayout->AddView(DropShadowRadius, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
606 ShaderCtrlLayout->AddView((new StaticTextBox("Exponent", NUX_TRACKER_LOCATION)), 0);
607- ShaderCtrlLayout->AddView(DropShadowExponent, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
608+ ShaderCtrlLayout->AddView(DropShadowExponent, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
609 ShaderCtrlLayout->AddView((new StaticTextBox("Brightness", NUX_TRACKER_LOCATION)), 0);
610- ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::eLeft, nux::MINOR_SIZE_FULL);*/
611+ ShaderCtrlLayout->AddView(BrightnessFactor, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);*/
612
613
614 return ShaderCtrlLayout;
615@@ -414,7 +414,7 @@
616 ShowBackground->state_change.connect(sigc::mem_fun(g_app, &Application::ShowBackground));
617
618
619- LightingModelLayout->AddView(ShowBackground, 1, nux::eLeft, nux::eMatchContent);
620+ LightingModelLayout->AddView(ShowBackground, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
621
622 nux::Button* ReloadShader(new nux::Button("Reload Shader", NUX_TRACKER_LOCATION));
623 ReloadShader->click.connect(sigc::mem_fun(g_app, &Application::ReloadShader));
624@@ -422,13 +422,13 @@
625 ReloadShader->SetMinimumWidth(100);
626 ReloadShader->SetMinimumHeight(24);
627
628- LightingModelLayout->AddView(ReloadShader, 1, nux::eLeft, nux::eMatchContent);
629+ LightingModelLayout->AddView(ReloadShader, 1, nux::MINOR_POSITION_START, nux::MINOR_SIZE_MATCHCONTENT);
630
631 LightingModelLayout->SetVerticalInternalMargin(4);
632 LightingModelLayout->SetHorizontalExternalMargin(8);
633 LightingModelGroupBox->SetLayout(LightingModelLayout);
634
635- ControlLayout->AddView(LightingModelGroupBox, 0, nux::eLeft, nux::MINOR_SIZE_FULL);
636+ ControlLayout->AddView(LightingModelGroupBox, 0, nux::MINOR_POSITION_START, nux::MINOR_SIZE_FULL);
637
638 ShowBackground->Activate();
639

Subscribers

People subscribed via source and target branches

to all changes: