lp:~michihenning/nux/1056133

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:nux at revision 671

Jay Taoko (community): Approve on 2012-09-27

Daniel d'Andrada (community): Approve on 2012-09-27

Diff: 137 lines (+20/-30)

5 files modified

Nux/MainLoopGLib.cpp (+5/-11)
Nux/TextEntry.cpp (+2/-3)
Nux/WindowThread.cpp (+8/-9)
Nux/WindowThread.h (+1/-1)
tests/test-timeline.cpp (+4/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1056133: jenkins: fails to build on i386

High

Fix Released

Link a bug report

Related blueprints

667. By Michi Henning on 2012-09-26

Fixed problem with 32-bit builds.

Replacing the deprecated g_source_get_current_time() with get_time() in revision 665 broke the 32-bit build.
That's because GTimeVal is a 32-bit value on 32-bit machines and a 64-bit value on 64-bit machines, but
get_time() always returns a 64-bit value.

It turns out that GTimeVal is also deprecated (but not flagged as deprecated by gcc), so I replaced GTimeVal with
gint64 throughout. Also changed the parameter to ProcessTimelines() from a non-const pointer to a value because the
passed-in value was never modified, and it's clearer to pass the value than a pointer to the value.

Code builds without errors on both 32-bit and 64-bit machines now.

666. By Daniel d'Andrada on 2012-09-24

Removes useless code from WindowCompositor.. Fixes: . Approved by Jay Taoko.

665. By Michi Henning on 2012-09-24

Eliminated a whole bunch of compiler warnings reported by -Wextra.. Fixes: https://bugs.launchpad.net/bugs/1032313. Approved by Tim Penhey.

664. By Stephen M. Webb on 2012-09-19

Resolves unresolved libraries (lp: 680168).. Fixes: https://bugs.launchpad.net/bugs/680168. Approved by Brandon Schaefer.

663. By Sam Spilsbury on 2012-09-19

Added a method to WindowCompositor RestoreMainFramebuffer which either restores the reference framebuffer or binds us to the backbuffer depending on what is available.. Fixes: https://bugs.launchpad.net/bugs/1036521, https://bugs.launchpad.net/bugs/1036572. Approved by Daniel van Vugt.

662. By Didier Roche-Tolomelli on 2012-09-19

remove tags

661. By Jay Taoko on 2012-09-18

This branch introduces "Redirected Views" in Nux. Redirected views allows a view to be rendered inside its own texture and that texture is latter composited inside the main rendering.
This branch contains the required changes for redirected views. The opportunty was also taken to fix minor issues and introduce API changes.

== Core of the Redirected View
  Nux/Area.cpp
  Nux/Area.h
  Nux/Layout.cpp
  Nux/Layout.h
  Nux/View.cpp
  Nux/View.h

== Fixed ClientArea to work with RedirectedViews
  Nux/ClientArea.cpp
  Nux/ClientArea.h

== Concrete implementation of a view to replace InputArea in some locations
  Nux/BasicView.cpp
  Nux/BasicView.h

== Nux.h contains the Feature.h file of Nux
  Nux/Nux.h

== API change to frame buffer object architecture
  NuxGraphics/IOpenGLFrameBufferObject.cpp
  NuxGraphics/IOpenGLFrameBufferObject.h

== Added InitSlTexturePremultiplyShader shader
  NuxGraphics/RenderingPipeGLSL.cpp
  NuxGraphics/GraphicsEngine.cpp
  NuxGraphics/GraphicsEngine.h
  NuxGraphics/RenderingPipeAsm.cpp

== Fixed texture inversion
  NuxGraphics/RenderingPipe.cpp. Fixes: https://bugs.launchpad.net/bugs/1049593. Approved by Neil J. Patel.

660. By Marco Trevisan (Treviño) on 2012-09-14

WindowCompostior: use ObjectWeakPtr to handle focus and mouse areas

So they get automatically nullified when the handled objects are destroyed,
also Make Area to unset the key-focus paths on destroy.. Fixes: https://bugs.launchpad.net/bugs/1045059. Approved by Tim Penhey.

659. By Marco Trevisan (Treviño) on 2012-09-14

InputArea: remove the pending grabs on destroy (it could cause crash otherwise). Fixes: . Approved by Jay Taoko, Brandon Schaefer.

658. By Tim Penhey on 2012-09-14

Add the ability to log out the location (read stackstrace) that an object was created at when the process ends. This is good to catch leaks.

Also added stacktraces when trying to unreference objects held in smart pointers, or deallocating space we shouldn't be.. Fixes: . Approved by Michi Henning.