lp:~njpatel/nux/nux.redirected-views-3.0
- Get this branch:
- bzr branch lp:~njpatel/nux/nux.redirected-views-3.0
Branch merges
- Jay Taoko: Approve
-
Diff: 6727 lines (+2510/-1026)96 files modifiedNux/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)
Branch information
Recent revisions
- 656. By Neil J. Patel
-
This branch introduces "Redirected Views" in Nux. Redirected views allows a
view to be rendered inside its own texture and that texture is latter
composited inside the main rendering.This branch contains the required changes for redirected views. The opportunty
was also taken to fix minor issues and introduce API changes. - 655. By Neil J. Patel
-
WindowCompostior: use ObjectWeakPtr to handle focus and mouse areas
So they get automatically nullified when the handled objects are destroyed,
also Make Area to unset the key-focus paths on destroy. - 654. By Neil J. Patel
-
InputArea: remove the pending grabs on destroy (it could cause crash otherwise)
- 651. By Nick Dedekind
-
Fixed scrollview child mouse hit-test cut-off when using hidden scrollbars (LP#1039480). Fixes: https:/
/bugs.launchpad .net/bugs/ 1039480. Approved by Andrea Azzarone. - 649. By Tim Penhey
-
* Introducing NuxCore animation famework.
* Added tests
* TODO: parallel and serial groups.. Fixes: . Approved by Jay Taoko.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:nux