lp:~thumper/nux/next-changes

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:nux

Unity Team: Pending requested 2011-08-22

Diff: 69 lines (+10/-4)

3 files modified

Nux/Painter.cpp (+6/-1)
Nux/Painter.h (+2/-2)
NuxGraphics/RenderingPipeGLSL.cpp (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

445. By Tim Penhey on 2011-08-22

Merge object cleanup branch.

444. By Tim Penhey on 2011-08-19

make the background stack private, and make sure the layers get deleted when the object is destroyed.

443. By Tim Penhey on 2011-08-19

Delete the shader_prog once we are done.

442. By Tim Penhey on 2011-08-18

Merge trunk.

441. By Tim Penhey on 2011-08-18

fix the initialization order.

440. By Tim Penhey on 2011-08-18

Use the protected variable rather than the methods (which have been deleted).

439. By Tim Penhey on 2011-08-18

Missed a closing bracket.

438. By Tim Penhey on 2011-08-18

Merge trunk.

437. By Tim Penhey on 2011-08-18

Static cast, not reinterpret cast.

436. By Tim Penhey on 2011-08-17

Update ScrollView to initialize all its members.

The m_ViewContentWidth was being accessed in the PreLayout method
which is before it had a value set in the PostLayout method.
By initializing it, at least it is in a known state initially.

I removed the protected functions for setting and getting the
protected members. It seemed somewhat unnecessary.

Also removed three unused private member variables.