lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://qastaging/ubuntu-ui-toolkit/staging

Ubuntu SDK team: Pending requested 2016-05-25

Diff: 506 lines (+288/-41) (has conflicts)

10 files modified

src/Ubuntu/Components/1.3/InputHandler.qml (+5/-2)
src/Ubuntu/Components/1.3/TextArea.qml (+2/-1)
src/Ubuntu/Components/1.3/TextArea14.qml (+77/-0)
src/Ubuntu/Components/1.3/TextCursor.qml (+6/-30)
src/Ubuntu/Components/1.3/TextField.qml (+2/-0)
src/Ubuntu/Components/1.3/TextField14.qml (+108/-0)
src/Ubuntu/Components/ComponentModule.pro (+2/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+0/-2)
src/Ubuntu/Components/qmldir (+4/-2)
tests/unit_x11/tst_components/tst_textinput_common13.qml (+82/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1980. By Cris Dywan on 2016-05-25

Simplify TextArea14 and add a reference ScrollView/Flickable/TextEdit

1979. By Cris Dywan on 2016-05-20

Tiny Text* components for experimenting

1978. By Cris Dywan on 2016-05-16

Interactive Scrollbar in TextArea with spacing. Fixes: https://bugs.launchpad.net/bugs/1526726.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

1977. By Tim Peeters on 2016-05-13

Fix flickable topMargin adjustments by PullToRefreshStyle. Fixes: https://bugs.launchpad.net/bugs/1578619.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

1976. By Tim Peeters on 2016-05-11

Postpone setting MainPage.active to true until the components are loaded to avoid initialization problems. Fixes: https://bugs.launchpad.net/bugs/1570886.

Approved by ubuntu-sdk-build-bot, Benjamin Zeller.

1975. By Zsombor Egri on 2016-05-10

AdaptivePageLayout vertical divider occludes with ListItem's visuals. Fixes: https://bugs.launchpad.net/bugs/1575060.

Approved by ubuntu-sdk-build-bot, Tim Peeters.

1974. By Cris Dywan on 2016-05-09

TextField flickable mustn't have the height of the parent. Fixes: https://bugs.launchpad.net/bugs/1370557, https://bugs.launchpad.net/bugs/1571576.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.

1973. By Zoltan Balogh on 2016-05-06

sync with trunk

1972. By Tim Peeters on 2016-05-03

Remove old code from Tabs example. Fixes: https://bugs.launchpad.net/bugs/1566736.

Approved by ubuntu-sdk-build-bot, Christian Dywan.

1971. By Cris Dywan on 2016-05-03

ToolbarButton example is specific to 1.3. Fixes: https://bugs.launchpad.net/bugs/1576463.

Approved by ubuntu-sdk-build-bot, Zsombor Egri.