Merge lp://staging/~nux-team/nux/nux.attempt-to-fix-widgets-new into lp://staging/nux
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~nux-team/nux/nux.attempt-to-fix-widgets-new |
| Merge into: | lp://staging/nux |
| Diff against target: |
4681 lines (+1137/-701) 59 files modified
Nux/AbstractCheckedButton.cpp (+6/-6) Nux/AbstractCheckedButton.h (+1/-1) Nux/AnimatedTextureArea.cpp (+2/-2) Nux/Area.cpp (+83/-14) Nux/Area.h (+25/-5) Nux/BaseWindow.cpp (+15/-15) Nux/BasicView.h (+1/-1) Nux/Button.cpp (+34/-5) Nux/Button.h (+12/-11) Nux/CheckBox.cpp (+5/-5) Nux/ColorEditor.cpp (+89/-82) Nux/ColorEditor.h (+3/-3) Nux/ColorPreview.cpp (+2/-3) Nux/ColorPreview.h (+1/-1) Nux/EditTextBox.cpp (+7/-7) Nux/FileSelector.cpp (+5/-5) Nux/FloatingWindow.cpp (+24/-23) Nux/GridHLayout.cpp (+3/-3) Nux/GroupBox.cpp (+14/-13) Nux/GroupBox2.cpp (+47/-79) Nux/GroupBox2.h (+5/-7) Nux/HLayout.cpp (+6/-6) Nux/HScrollBar.cpp (+4/-4) Nux/HSplitter.cpp (+47/-41) Nux/HSplitter.h (+1/-0) Nux/Layout.cpp (+47/-30) Nux/Layout.h (+6/-4) Nux/LinearLayout.h (+2/-2) Nux/Makefile.am (+2/-0) Nux/MenuBar.cpp (+21/-15) Nux/MenuPage.cpp (+10/-10) Nux/NumericValuator.cpp (+3/-3) Nux/PaintLayer.cpp (+6/-6) Nux/Panel.cpp (+2/-2) Nux/RGBValuator.cpp (+62/-60) Nux/RadioButton.cpp (+4/-6) Nux/RangeValue.cpp (+3/-3) Nux/RangeValueInteger.cpp (+3/-3) Nux/SceneComposer.cpp (+111/-0) Nux/SceneComposer.h (+78/-0) Nux/ScrollView.cpp (+47/-45) Nux/SpinBox.cpp (+7/-7) Nux/SpinBoxDouble.cpp (+7/-7) Nux/StaticText.cpp (+2/-2) Nux/StaticTextBox.cpp (+3/-3) Nux/TabView.cpp (+37/-32) Nux/TextureArea.cpp (+4/-4) Nux/VLayout.cpp (+9/-9) Nux/VScrollBar.cpp (+2/-2) Nux/VSplitter.cpp (+42/-31) Nux/VSplitter.h (+1/-0) Nux/View.cpp (+71/-40) Nux/View.h (+2/-1) Nux/WindowCompositor.cpp (+68/-15) Nux/WindowCompositor.h (+18/-2) NuxCore/NuxCore.cpp (+3/-3) NuxGraphics/GLRenderStates.h (+1/-1) NuxGraphics/GraphicsEngine.cpp (+1/-1) NuxGraphics/RenderingPipeGLSL.cpp (+10/-10) |
| To merge this branch: | bzr merge lp://staging/~nux-team/nux/nux.attempt-to-fix-widgets-new |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Jay Taoko | Pending | ||
|
Review via email:
|
|||
Description of the change
changed nux widgets to use relative coord system
related unity branch: https:/
needs testing :)
| PS Jenkins bot (ps-jenkins) wrote | # |
Unmerged revisions
- 717. By Eleni Maria Stea
-
local merge
- 716. By Eleni Maria Stea
-
added jay's fix for GroupBox2 from this branch:
http://bazaar. launchpad. net/~unity- team/nux/ nux.rebase- area-xy- rgbvaluator/ revision/ 704#Nux/ ClientArea. cpp - 715. By Eleni Maria Stea
-
!!work in progress!! the menu contents now appear but there are
still issues with the menupage position - 714. By Eleni Maria Stea
-
Paint2DQuadColor function finally calls a fragment
shader that needs the absolute pixel position therefore
we use absolute geometry - 713. By Eleni Maria Stea
-
text rendering in tabview needs
absolute geometry :-> - 712. By Eleni Maria Stea
-
reverted the events geometry
- 711. By Eleni Maria Stea
-
fixed tabview geometry (work in progress)
- 710. By Eleni Maria Stea
-
fixed groupbox2 layout geometry
- 709. By Eleni Maria Stea
-
Fixed captions of GroupBox2
- 708. By Eleni Maria Stea
-
removed comment
FAILED: Continuous integration, rev:717
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://