Nux

Merge lp://qastaging/~unity-team/nux/nux-fixed-layout-logic into lp://qastaging/nux

nux-fixed-layout-logic
Merge into trunk

Proposed by Jay Taoko on 2012-12-13

Status:	Merged
Approved by:	Jay Taoko on 2012-12-18
Approved revision:	741
Merged at revision:	742
Proposed branch:	lp://qastaging/~unity-team/nux/nux-fixed-layout-logic
Merge into:	lp://qastaging/nux
Diff against target:	38 lines (+7/-3) 2 files modified Nux/HLayout.cpp (+3/-1) Nux/VLayout.cpp (+4/-2)
To merge this branch:	bzr merge lp://qastaging/~unity-team/nux/nux-fixed-layout-logic
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Eleni Maria Stea (community)		2012-12-13	Approve on 2012-12-17
PS Jenkins bot	continuous-integration		Pending
Review via email: mp+139786@code.qastaging.launchpad.net

Commit message

* Fixed logic error in layouts that was preventing the system from achieving a stable sizing solution.

Description of the change

* Fixed logic error in layouts that was preventing the system from achieving a stable sizing solution.

Revision history for this message

Manuel de la Peña (mandel) wrote on 2012-12-14:

I can assert that this branch fixes the issues I have seen happening with layouts in nux trunk. Awesome fix!

Revision history for this message

Eleni Maria Stea (hikiko) wrote on 2012-12-14:

I tried to compile unity trunk with that branch and got the following error:

/home/eleni/staging/jay/unity/dash/DashController.cpp: In constructor ‘unity::dash::Controller::Controller(const WindowCreator&)’:
/home/eleni/staging/jay/unity/dash/DashController.cpp:71:26: error: no matching function for call to ‘nux::animation::AnimateValue<double>::AnimateValue(int)’
/home/eleni/staging/jay/unity/dash/DashController.cpp:71:26: note: candidates are:
In file included from /home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation.h:114:0,
from /home/eleni/staging/jay/unity/dash/DashController.h:27,
from /home/eleni/staging/jay/unity/dash/DashController.cpp:20:
/home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-inl.h:41:1: note: nux::animation::AnimateValue<VALUE_TYPE>::AnimateValue(const VALUE_TYPE&, const VALUE_TYPE&, int) [with VALUE_TYPE = double]
/home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-inl.h:41:1: note: candidate expects 3 arguments, 1 provided
/home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-inl.h:31:1: note: nux::animation::AnimateValue<VALUE_TYPE>::AnimateValue() [with VALUE_TYPE = double]
/home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-inl.h:31:1: note: candidate expects 0 arguments, 1 provided
make[2]: *** [dash/CMakeFiles/dash-lib.dir/DashController.cpp.o] Error 1
make[1]: *** [dash/CMakeFiles/dash-lib.dir/all] Error 2
make: *** [all] Error 2

review: Needs Fixing

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2012-12-14:

> I tried to compile unity trunk with that branch and got the following error:
>
> /home/eleni/staging/jay/unity/dash/DashController.cpp: In constructor
> ‘unity::dash::Controller::Controller(const WindowCreator&)’:
> /home/eleni/staging/jay/unity/dash/DashController.cpp:71:26: error: no
> matching function for call to
> ‘nux::animation::AnimateValue<double>::AnimateValue(int)’
> /home/eleni/staging/jay/unity/dash/DashController.cpp:71:26: note: candidates
> are:
> In file included from /home/eleni/staging/jay/install/unity/include/Nux-4.0/Nu
> xCore/Animation.h:114:0,
> from /home/eleni/staging/jay/unity/dash/DashController.h:27,
> from
> /home/eleni/staging/jay/unity/dash/DashController.cpp:20:
> /home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-
> inl.h:41:1: note: nux::animation::AnimateValue<VALUE_TYPE>::AnimateValue(const
> VALUE_TYPE&, const VALUE_TYPE&, int) [with VALUE_TYPE = double]
> /home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-
> inl.h:41:1: note: candidate expects 3 arguments, 1 provided
> /home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-
> inl.h:31:1: note: nux::animation::AnimateValue<VALUE_TYPE>::AnimateValue()
> [with VALUE_TYPE = double]
> /home/eleni/staging/jay/install/unity/include/Nux-4.0/NuxCore/Animation-
> inl.h:31:1: note: candidate expects 0 arguments, 1 provided
> make[2]: *** [dash/CMakeFiles/dash-lib.dir/DashController.cpp.o] Error 1
> make[1]: *** [dash/CMakeFiles/dash-lib.dir/all] Error 2
> make: *** [all] Error 2