Merge lp://qastaging/~jaytaoko/nux/nux-event-architecture-final into lp://qastaging/nux
Proposed by
Jay Taoko
| Status: | Merged |
|---|---|
| Merged at revision: | 386 |
| Proposed branch: | lp://qastaging/~jaytaoko/nux/nux-event-architecture-final |
| Merge into: | lp://qastaging/nux |
| Diff against target: |
12994 lines (+5125/-2793) 128 files modified
Nux/AbstractButton.cpp (+0/-1) Nux/ActionItem.cpp (+1/-1) Nux/Area.cpp (+198/-25) Nux/Area.h (+134/-7) Nux/BaseWindow.cpp (+31/-0) Nux/BaseWindow.h (+6/-2) Nux/Button.cpp (+1/-1) Nux/Canvas.cpp (+2/-1) Nux/CheckBox.cpp (+14/-6) Nux/CheckBox.h (+3/-0) Nux/ClientArea.cpp (+5/-1) Nux/ClientArea.h (+3/-0) Nux/ColorEditor.cpp (+4/-0) Nux/ColorEditor.h (+3/-0) Nux/ComboBoxSimple.cpp (+56/-17) Nux/ComboBoxSimple.h (+5/-1) Nux/EditTextBox.cpp (+48/-3) Nux/EditTextBox.h (+8/-0) Nux/FloatingWindow.cpp (+126/-56) Nux/FloatingWindow.h (+12/-9) Nux/Focusable.cpp (+4/-4) Nux/GridHLayout.cpp (+198/-39) Nux/GridHLayout.h (+1/-0) Nux/GridVLayout.cpp (+166/-0) Nux/GridVLayout.h (+5/-0) Nux/GroupBox.cpp (+4/-0) Nux/GroupBox.h (+3/-0) Nux/GroupBox2.cpp (+5/-0) Nux/GroupBox2.h (+3/-1) Nux/HLayout.cpp (+115/-3) Nux/HLayout.h (+2/-1) Nux/HScrollBar.cpp (+90/-84) Nux/HScrollBar.h (+13/-12) Nux/HSplitter.cpp (+156/-7) Nux/HSplitter.h (+5/-0) Nux/InputArea.cpp (+212/-501) Nux/InputArea.h (+75/-28) Nux/LayeredLayout.cpp (+90/-21) Nux/LayeredLayout.h (+5/-0) Nux/Layout.cpp (+30/-7) Nux/Layout.h (+16/-26) Nux/Matrix3Editor.cpp (+1/-1) Nux/Matrix4Editor.cpp (+23/-25) Nux/Matrix4Editor.h (+1/-0) Nux/MenuBar.cpp (+36/-35) Nux/MenuPage.cpp (+38/-11) Nux/MenuPage.h (+35/-12) Nux/MouseHandler.cpp (+4/-1) Nux/MouseHandler.h (+2/-1) Nux/Nux.h (+1/-0) Nux/Panel.cpp (+10/-6) Nux/Panel.h (+2/-0) Nux/PushButton.cpp (+1/-1) Nux/RGBValuator.cpp (+7/-3) Nux/RGBValuator.h (+2/-0) Nux/RadioButton.cpp (+41/-28) Nux/RadioButton.h (+7/-2) Nux/RadioButtonGroup.cpp (+57/-51) Nux/RadioButtonGroup.h (+2/-2) Nux/ScrollBar.cpp (+5/-0) Nux/ScrollBar.h (+6/-1) Nux/ScrollView.cpp (+214/-169) Nux/ScrollView.h (+12/-5) Nux/StaticTextBox.cpp (+4/-0) Nux/StaticTextBox.h (+1/-0) Nux/TabView.cpp (+128/-92) Nux/TabView.h (+11/-8) Nux/TableCtrl.cpp (+9/-9) Nux/TextEntry.cpp (+60/-4) Nux/TextEntry.h (+10/-1) Nux/TextView/TextView.cpp (+2/-2) Nux/Timeline.h (+90/-0) Nux/ToolButton.cpp (+4/-3) Nux/VLayout.cpp (+117/-4) Nux/VLayout.h (+2/-1) Nux/VScrollBar.cpp (+92/-86) Nux/VScrollBar.h (+13/-12) Nux/VSplitter.cpp (+151/-6) Nux/VSplitter.h (+5/-0) Nux/ValuatorDouble.cpp (+1/-1) Nux/ValuatorInt.cpp (+1/-1) Nux/Vector3ValuatorDouble.cpp (+1/-1) Nux/View.cpp (+71/-9) Nux/View.h (+12/-1) Nux/WindowCompositor.cpp (+981/-733) Nux/WindowCompositor.h (+155/-130) Nux/WindowThread.cpp (+2/-2) Nux/nux.pc.in (+1/-1) NuxCore/Color.cpp (+2/-2) NuxCore/LoggingWriter.cpp (+16/-4) NuxCore/Math/Quaternion.cpp (+47/-47) NuxCore/Math/Quaternion.h (+13/-13) NuxCore/NuxCore.h (+19/-12) NuxCore/Object.h (+3/-1) NuxCore/PropertyTraits.h (+32/-2) NuxCore/Rect.cpp (+18/-10) NuxGraphics/Events.h (+5/-5) NuxGraphics/FontRenderer.cpp (+2/-2) NuxGraphics/GLRenderStates.h (+0/-3) NuxGraphics/GLResource.cpp (+4/-4) NuxGraphics/GLResource.h (+21/-35) NuxGraphics/GLShaderParameter.cpp (+1/-2) NuxGraphics/GLShaderParameter.h (+13/-1) NuxGraphics/GLVertexResourceManager.cpp (+50/-10) NuxGraphics/GLVertexResourceManager.h (+13/-2) NuxGraphics/GpuDevice.h (+1/-3) NuxGraphics/GpuDeviceVertex.cpp (+245/-268) NuxGraphics/GraphicsDisplayWin.cpp (+1/-1) NuxGraphics/GraphicsDisplayX11.cpp (+2/-2) NuxGraphics/GraphicsEngine.cpp (+5/-0) NuxGraphics/IOpenGLGLSLShader.cpp (+15/-3) NuxGraphics/IOpenGLVertexBuffer.h (+1/-0) NuxGraphics/IOpenGLVertexDeclaration.cpp (+55/-11) NuxGraphics/IOpenGLVertexDeclaration.h (+13/-4) NuxGraphics/Makefile.am (+2/-0) NuxGraphics/MeshData.cpp (+39/-8) NuxGraphics/MeshData.h (+16/-1) NuxGraphics/MeshFileLoader-OBJ.cpp (+156/-0) NuxGraphics/MeshFileLoader-OBJ.h (+12/-0) NuxGraphics/nux-graphics.pc.in (+1/-1) NuxImage/DDS.cpp (+4/-4) NuxImage/DDS.h (+1/-1) NuxImage/ImageSurface.cpp (+4/-0) configure.ac (+2/-0) examples/Makefile.am (+0/-3) examples/canvas.cpp (+1/-0) tests/Makefile.am (+0/-1) tests/test-nux.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jaytaoko/nux/nux-event-architecture-final |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jason Smith (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
A new event architecture for Nux
This branch is making all of the previous event system obsolete
* What is out:
* What is in:
Remember that you have to make sure that all widgets have a parent:
- When a widgets is added to a layout, the layout becomes it parent. You have nothing to do in this case.
- If you have a Button widget inside another widget class MyWidget, then you need to call button-
- To un-parent a widget call UnParentObject. For now do not call UnParentObject on a widget that is in a layout. Always match a call to UnParent object with a previous call to SetParentObject
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Reviewed with jay over skype, looks good with small changes (useless casting)