lp:~jaytaoko/unity/unity-linaro-merge

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:unity

Unity Team: Pending requested 2012-01-09

Diff: 961 lines (+269/-148) (has conflicts)

9 files modified

CMakeLists.txt (+4/-0)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+18/-20)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h (+1/-1)
plugins/unitydialog/src/unitydialog.cpp (+54/-50)
plugins/unitydialog/src/unitydialog.h (+12/-7)
plugins/unityshell/src/IconRenderer.cpp (+24/-9)
plugins/unityshell/src/unityshell.cpp (+143/-58)
plugins/unityshell/src/unityshell.h (+12/-3)
tests/CMakeLists.txt (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1814. By Jay Taoko on 2012-01-05

* Merge Linaro's Unity branch with Unity trunk. This branch as the effect of porting the Linaro's branch to Unity 5.0.
* This branch needs Linaro's version of Compiz to build.

1813. By Andrea Cimitan on 2012-01-04

First step, increasing saturation of the average color. Fixes: https://bugs.launchpad.net/bugs/865239. Appoved by Gord Allott.

1812. By Andrea Azzarone on 2012-01-03

Add a missing break.. Fixes: . Appoved by Marco Trevisan (Treviño).

1811. By Alejandro Piñeiro on 2012-01-03

. Fixes: https://bugs.launchpad.net/bugs/856392. Appoved by Alex Launi.

1810. By Alejandro Piñeiro on 2012-01-03

. Fixes: https://bugs.launchpad.net/bugs/842033. Appoved by Alex Launi.

1809. By Jay Taoko on 2012-01-03

* Deprecated the following:
    nux::GetWindow
    nux::GetGraphicsThread
    nux::GetGraphicsEngine
  The entry point to Nux internal component is nux::GetWindowThread().

* IMTextEntry:
  changed _text to text_ and _preedit to preedit_ as per Nux.
. Fixes: . Appoved by Jason Smith.

1808. By Jay Taoko on 2012-01-03

* Changes to Nux API
* Dependant on branch https://code.launchpad.net/~jaytaoko/nux/nux-windowthread-cleanup1/+merge/86981. Fixes: . Appoved by Jason Smith.

1807. By Sam Spilsbury on 2012-01-03

Adds test for animation code. Fixes: . Appoved by Thomas Voß.

1806. By Sam Spilsbury on 2012-01-02

Adds test for conditional show/hide. Fixes: . Appoved by Thomas Voß.

1805. By Sam Spilsbury on 2012-01-02

Added Google Test and Google Mocks for layout algorithm. Fixes: . Appoved by Thomas Voß.