diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-26 13:09:44 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-26 15:23:39 +0000 |
| commit | 7bc619bd07e80672f420610508fe60c64cf870d7 (patch) | |
| tree | 26bb2b41cebfccf2e419b4be200e535f767e011d /examples | |
| parent | c3097c1688ad9eee91cbeade3b466a68a4889568 (diff) | |
texteditor/touch: simplify the toolbar
A single Row positioner is sufficient.
Change-Id: Ib244ddf875e40df341cb99172995d1717cb6439f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml | 138 |
1 files changed, 66 insertions, 72 deletions
diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml index 11f0f306..46b84a2a 100644 --- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml @@ -150,85 +150,79 @@ ApplicationWindow { Flickable { anchors.fill: parent - contentWidth: rowLayout.implicitWidth - contentHeight: rowLayout.height + contentWidth: toolRow.implicitWidth flickableDirection: Qt.Horizontal boundsBehavior: Flickable.StopAtBounds - RowLayout { - id: rowLayout - height: parent.height - - RowLayout { - ToolButton { - id: boldButton - text: "\uE800" // icon-bold - font.family: "fontello" - // Don't want to close the virtual keyboard when this is clicked. - focusPolicy: Qt.NoFocus - checkable: true - checked: document.bold - onClicked: document.bold = !document.bold - } - ToolButton { - id: italicButton - text: "\uE801" // icon-italic - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.italic - onClicked: document.italic = !document.italic - } - ToolButton { - id: underlineButton - text: "\uF0CD" // icon-underline - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.underline - onClicked: document.underline = !document.underline - } + Row { + id: toolRow + + ToolButton { + id: boldButton + text: "\uE800" // icon-bold + font.family: "fontello" + // Don't want to close the virtual keyboard when this is clicked. + focusPolicy: Qt.NoFocus + checkable: true + checked: document.bold + onClicked: document.bold = !document.bold + } + ToolButton { + id: italicButton + text: "\uE801" // icon-italic + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.italic + onClicked: document.italic = !document.italic + } + ToolButton { + id: underlineButton + text: "\uF0CD" // icon-underline + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.underline + onClicked: document.underline = !document.underline } ToolSeparator {} - RowLayout { - ToolButton { - id: alignLeftButton - text: "\uE803" // icon-align-left - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.alignment == Qt.AlignLeft - onClicked: document.alignment = Qt.AlignLeft - } - ToolButton { - id: alignCenterButton - text: "\uE804" // icon-align-center - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.alignment == Qt.AlignHCenter - onClicked: document.alignment = Qt.AlignHCenter - } - ToolButton { - id: alignRightButton - text: "\uE805" // icon-align-right - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.alignment == Qt.AlignRight - onClicked: document.alignment = Qt.AlignRight - } - ToolButton { - id: alignJustifyButton - text: "\uE806" // icon-align-justify - font.family: "fontello" - focusPolicy: Qt.NoFocus - checkable: true - checked: document.alignment == Qt.AlignJustify - onClicked: document.alignment = Qt.AlignJustify - } + ToolButton { + id: alignLeftButton + text: "\uE803" // icon-align-left + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.alignment == Qt.AlignLeft + onClicked: document.alignment = Qt.AlignLeft + } + ToolButton { + id: alignCenterButton + text: "\uE804" // icon-align-center + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.alignment == Qt.AlignHCenter + onClicked: document.alignment = Qt.AlignHCenter + } + ToolButton { + id: alignRightButton + text: "\uE805" // icon-align-right + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.alignment == Qt.AlignRight + onClicked: document.alignment = Qt.AlignRight + } + ToolButton { + id: alignJustifyButton + text: "\uE806" // icon-align-justify + font.family: "fontello" + focusPolicy: Qt.NoFocus + checkable: true + checked: document.alignment == Qt.AlignJustify + onClicked: document.alignment = Qt.AlignJustify } } } |