lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText
- Get this branch:
- bzr branch lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText
Branch merges
- Ubuntu SDK team: Pending requested
-
Diff: 506 lines (+288/-41) (has conflicts)10 files modifiedsrc/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)
Branch information
Recent revisions
- 1978. By Cris Dywan
-
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
-
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
-
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
-
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
-
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. - 1972. By Tim Peeters
-
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
-
ToolbarButton example is specific to 1.3. Fixes: https:/
/bugs.launchpad .net/bugs/ 1576463. Approved by ubuntu-
sdk-build- bot, Zsombor Egri.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu-ui-toolkit