Merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-quad into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Loïc Molinari
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-quad |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Diff against target: |
7380 lines (+6275/-617) 51 files modified
src/UbuntuToolkit/UbuntuToolkit.pro (+43/-8) src/UbuntuToolkit/privates/shaders/color.frag (+7/-0) src/UbuntuToolkit/privates/shaders/color.vert (+12/-0) src/UbuntuToolkit/privates/shaders/color_opaque.frag (+6/-0) src/UbuntuToolkit/privates/shaders/colormask.frag (+10/-0) src/UbuntuToolkit/privates/shaders/colormask.vert (+15/-0) src/UbuntuToolkit/privates/shaders/colormask_opaque.frag (+9/-0) src/UbuntuToolkit/privates/shaders/fillcenterborder.frag (+14/-0) src/UbuntuToolkit/privates/shaders/fillcenterborder.vert (+18/-0) src/UbuntuToolkit/privates/shaders/fillcenterborder_opaque.frag (+12/-0) src/UbuntuToolkit/privates/shaders/fillcentershadow.frag (+16/-0) src/UbuntuToolkit/privates/shaders/fillcentershadow.vert (+21/-0) src/UbuntuToolkit/privates/shaders/fillcentershadow_opaque.frag (+14/-0) src/UbuntuToolkit/privates/shaders/fillcentershadowborder.frag (+22/-0) src/UbuntuToolkit/privates/shaders/fillcentershadowborder.vert (+27/-0) src/UbuntuToolkit/privates/shaders/fillcentershadowborder_opaque.frag (+20/-0) src/UbuntuToolkit/privates/shaders/fillcornersborder.frag (+17/-0) src/UbuntuToolkit/privates/shaders/fillcornersborder.vert (+21/-0) src/UbuntuToolkit/privates/shaders/fillcornersborder_opaque.frag (+16/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadow.frag (+18/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadow.vert (+24/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadow_opaque.frag (+17/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadowborder.frag (+24/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadowborder.vert (+30/-0) src/UbuntuToolkit/privates/shaders/fillcornersshadowborder_opaque.frag (+23/-0) src/UbuntuToolkit/privates/shaders/frame.frag (+10/-28) src/UbuntuToolkit/privates/shaders/frame.vert (+0/-34) src/UbuntuToolkit/privates/shaders/texture2.vert (+18/-0) src/UbuntuToolkit/privates/ucshape.cpp (+434/-0) src/UbuntuToolkit/privates/ucshape_p.h (+162/-0) src/UbuntuToolkit/privates/ucshapedropshadownodes.cpp (+175/-0) src/UbuntuToolkit/privates/ucshapedropshadownodes_p.h (+57/-0) src/UbuntuToolkit/privates/ucshapefillnodes.cpp (+1431/-0) src/UbuntuToolkit/privates/ucshapefillnodes_p.h (+999/-0) src/UbuntuToolkit/privates/ucshapeframenodes.cpp (+392/-326) src/UbuntuToolkit/privates/ucshapeframenodes_p.h (+67/-78) src/UbuntuToolkit/privates/ucshaperesources.cpp (+19/-0) src/UbuntuToolkit/privates/ucshaperesources_p.h (+285/-0) src/UbuntuToolkit/privates/ucshapetexturefactory.cpp (+728/-0) src/UbuntuToolkit/privates/ucshapetexturefactory_p.h (+142/-0) src/UbuntuToolkit/privates/ucshapeutils_p.h (+134/-0) src/UbuntuToolkit/resources.qrc (+28/-4) src/UbuntuToolkit/tools/privates/createprivateshapetextures.cpp (+0/-125) src/UbuntuToolkit/tools/privates/privates.pro (+0/-5) src/UbuntuToolkit/ubuntutoolkitmodule.cpp (+2/-2) src/UbuntuToolkit/ucbottomedge.cpp (+1/-0) src/UbuntuToolkit/ucbottomedge_p.h (+0/-2) src/UbuntuToolkit/ucbottomedgeregion.cpp (+2/-0) src/imports/Components/Themes/Ambiance/1.3/FocusShape.qml (+3/-5) tests/resources/ubuntushape/QuadTest.qml (+549/-0) tests/resources/ubuntushape/ZoomPan.qml (+181/-0) |
| To merge this branch: | bzr merge lp://qastaging/~loic.molinari/ubuntu-ui-toolkit/uitk-quad |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Emanuele Antonio Faraone (community) | Approve | ||
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Added new nodes and item with fast and dynamic shadow rendering.
Description of the change
Added new nodes and item with fast and dynamic shadow rendering.
To post a comment you must log in.
Revision history for this message
| Emanuele Antonio Faraone (emanueleant03) | # |
review:
Approve
Unmerged revisions
- 2159. By Loïc Molinari
-
Cleaned up alignment strategies.
- 2158. By Loïc Molinari
-
Replaced shadow blur with extended box filtering algorithm.
- 2157. By Loïc Molinari
-
Fixed drop shadow visiblity states.
- 2156. By Loïc Molinari
-
Fixed 0 radius and shadow size issues.
- 2155. By Loïc Molinari
-
Shadow texture fixes.
- 2154. By Loïc Molinari
-
Cleaned up shadow texture creation code.
- 2153. By Loïc Molinari
-
Reverted to 0 default radius in quad tweak.
- 2152. By Loïc Molinari
-
Fixed and cleaned up mask texture creation when radius=0.
- 2151. By Loïc Molinari
-
Fixed Quad Tweak color picking system.
- 2150. By Loïc Molinari
-
Improved quad tdeak colors.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
