lp://qastaging/~unity-team/nux/nux.redirected-views

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/nux at revision 661

Neil J. Patel (community): Approve on 2012-09-18

Diff: 6727 lines (+2510/-1026)

96 files modified

Nux/AbstractCheckedButton.cpp (+1/-1)
Nux/AbstractComboBox.cpp (+2/-2)
Nux/AbstractComboBox.h (+2/-2)
Nux/Area.cpp (+211/-25)
Nux/Area.h (+113/-8)
Nux/BaseWindow.h (+0/-1)
Nux/BasicView.cpp (+46/-0)
Nux/BasicView.h (+42/-0)
Nux/Button.cpp (+25/-8)
Nux/CheckBox.cpp (+0/-2)
Nux/ClientArea.cpp (+74/-125)
Nux/ClientArea.h (+0/-1)
Nux/ColorEditor.cpp (+29/-53)
Nux/ColorPreview.cpp (+1/-1)
Nux/ComboBoxSimple.cpp (+1/-1)
Nux/Coverflow.cpp (+3/-3)
Nux/Coverflow.h (+1/-1)
Nux/CoverflowItem.h (+1/-1)
Nux/EditTextBox.cpp (+1/-1)
Nux/FloatingWindow.cpp (+11/-11)
Nux/FloatingWindow.h (+5/-5)
Nux/GridHLayout.cpp (+1/-1)
Nux/GridVLayout.cpp (+1/-1)
Nux/GroupBox.h (+1/-1)
Nux/GroupBox2.cpp (+1/-1)
Nux/GroupBox2.h (+1/-1)
Nux/HScrollBar.cpp (+4/-4)
Nux/HScrollBar.h (+4/-4)
Nux/HSplitter.cpp (+0/-20)
Nux/HSplitter.h (+1/-1)
Nux/InputArea.cpp (+4/-2)
Nux/InputArea.h (+0/-2)
Nux/LayeredLayout.cpp (+2/-7)
Nux/Layout.cpp (+306/-63)
Nux/Layout.h (+26/-9)
Nux/LinearLayout.cpp (+3/-3)
Nux/MainLoopGLib.cpp (+0/-1)
Nux/Makefile.am (+3/-0)
Nux/MenuBar.cpp (+5/-5)
Nux/MenuBar.h (+1/-1)
Nux/MouseAreaCtrl.cpp (+1/-1)
Nux/MouseAreaCtrl.h (+1/-1)
Nux/Nux.cpp (+1/-0)
Nux/Nux.h (+5/-0)
Nux/NuxTimerTickSource.h (+54/-0)
Nux/PaintLayer.cpp (+9/-0)
Nux/Painter.cpp (+42/-4)
Nux/Painter.h (+7/-0)
Nux/RGBValuator.cpp (+10/-21)
Nux/RGBValuator.h (+9/-9)
Nux/RadioButton.cpp (+1/-3)
Nux/RangeValue.cpp (+1/-1)
Nux/RangeValue.h (+1/-1)
Nux/RangeValueInteger.cpp (+1/-1)
Nux/RangeValueInteger.h (+1/-1)
Nux/ScrollView.cpp (+0/-2)
Nux/SpinBox_Logic.cpp (+2/-2)
Nux/SpinBox_Logic.h (+2/-2)
Nux/TabView.cpp (+3/-3)
Nux/TabView.h (+3/-3)
Nux/TextEntry.cpp (+6/-7)
Nux/TextEntry.h (+1/-1)
Nux/Theme.cpp (+1/-1)
Nux/VScrollBar.cpp (+4/-4)
Nux/VScrollBar.h (+4/-4)
Nux/VSplitter.cpp (+0/-19)
Nux/VSplitter.h (+1/-1)
Nux/View.cpp (+290/-36)
Nux/View.h (+22/-14)
Nux/WindowCompositor.cpp (+12/-12)
Nux/WindowCompositor.h (+0/-1)
Nux/WindowThread.cpp (+0/-1)
Nux/WindowThread.h (+0/-1)
NuxCore/Animation.cpp (+3/-2)
NuxCore/AnimationController.cpp (+1/-0)
NuxCore/AnimationController.h (+6/-1)
NuxCore/Color.cpp (+1/-1)
NuxCore/EasingCurve.cpp (+14/-0)
NuxCore/EasingCurve.h (+6/-0)
NuxGraphics/GLWindowManager.cpp (+2/-2)
NuxGraphics/GLWindowManager.h (+2/-2)
NuxGraphics/GpuDevice.cpp (+27/-4)
NuxGraphics/GpuDevice.h (+10/-1)
NuxGraphics/GpuDeviceTexture.cpp (+11/-0)
NuxGraphics/GraphicsDisplayWin.cpp (+233/-244)
NuxGraphics/GraphicsDisplayWin.h (+32/-37)
NuxGraphics/GraphicsDisplayX11.cpp (+54/-55)
NuxGraphics/GraphicsDisplayX11.h (+13/-15)
NuxGraphics/GraphicsEngine.cpp (+7/-0)
NuxGraphics/GraphicsEngine.h (+38/-2)
NuxGraphics/IOpenGLFrameBufferObject.cpp (+190/-90)
NuxGraphics/IOpenGLFrameBufferObject.h (+24/-9)
NuxGraphics/RenderingPipe.cpp (+32/-6)
NuxGraphics/RenderingPipeAsm.cpp (+120/-0)
NuxGraphics/RenderingPipeGLSL.cpp (+254/-18)
configure.ac (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1049593: [FFE][UIFE]Dash - Finesse the placement, movement and behaviour of the 12.10 Dash

Critical

Fix Released

Link a bug report

Related blueprints

684. By Eleni Maria Stea on 2012-10-03

reverted

683. By Eleni Maria Stea on 2012-10-03

renamed BaseWindow

682. By Eleni Maria Stea on 2012-10-03

replaced BaseWindow class with Frame class everywhere in nux and tested

681. By Stephen M. Webb on 2012-10-02

Fixes undefined behaviour caused by the use of undefined variables.. Fixes: . Approved by Brandon Schaefer.

680. By Nick Dedekind on 2012-10-02

Fixed drag delta processing in mouse event cycle.
(LP: #1057995). Fixes: https://bugs.launchpad.net/bugs/1057995. Approved by Daniel van Vugt.

679. By Michi Henning on 2012-10-02

Fixed catch clause and removed #ifdef because it can be the same for Windows and Linux.

Removed duplicate -Werror flag from maintainer flags.. Fixes: https://bugs.launchpad.net/bugs/937583. Approved by Michi Henning.

678. By Michi Henning on 2012-10-02

Added -Wextra to compiler flags and removed a large number of warnings about unused parameters. Code compiles clean now without warnings, except for one remaining warning (see bug #1052765).. Fixes: https://bugs.launchpad.net/bugs/1056633. Approved by Michi Henning.

677. By Eleni Maria Stea on 2012-10-01

Resolved conflicts, merged to trunk. Fixes: . Approved by Jay Taoko.

676. By Jay Taoko on 2012-10-01

* Removing instances of NString.
* Fixed integer to pointer convertion in GpuDevice::DrawIndexedPrimitive.
* Fixed bug in Them.cpp: Check that a pointer is NULL before calling UnReference.
* Use proper member variables naming.
* GpuDevice: Changed code for detection of OpenGL minor and minor version.. Fixes: https://bugs.launchpad.net/bugs/1052765. Approved by Nicolas d'Offay, Eleni Maria Stea, Michi Henning.

675. By Eleni Maria Stea on 2012-09-29

The textures of the widgets are now loaded the first time that GetImage or GetImageGeometry are called.. Fixes: https://bugs.launchpad.net/bugs/816692. Approved by Jay Taoko.