aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/quickcontrols2/texteditor/fonts/fontello.ttfbin9188 -> 9496 bytes
-rw-r--r--examples/quickcontrols2/texteditor/qml/texteditor.qml30
2 files changed, 15 insertions, 15 deletions
diff --git a/examples/quickcontrols2/texteditor/fonts/fontello.ttf b/examples/quickcontrols2/texteditor/fonts/fontello.ttf
index 9871d4c5..d2914494 100644
--- a/examples/quickcontrols2/texteditor/fonts/fontello.ttf
+++ b/examples/quickcontrols2/texteditor/fonts/fontello.ttf
Binary files differ
diff --git a/examples/quickcontrols2/texteditor/qml/texteditor.qml b/examples/quickcontrols2/texteditor/qml/texteditor.qml
index ab56ae2b..72b5da1a 100644
--- a/examples/quickcontrols2/texteditor/qml/texteditor.qml
+++ b/examples/quickcontrols2/texteditor/qml/texteditor.qml
@@ -271,8 +271,21 @@ ApplicationWindow {
onClicked: document.underline = !document.underline
}
ToolButton {
+ id: fontFamilyToolButton
+ text: qsTr("\uE808")
+ font.family: "fontello"
+ font.bold: document.bold
+ font.italic: document.italic
+ font.underline: document.underline
+ onClicked: {
+ fontDialog.currentFont.family = document.fontFamily;
+ fontDialog.currentFont.pointSize = document.fontSize;
+ fontDialog.open();
+ }
+ }
+ ToolButton {
id: textColorButton
- text: "\uE808"
+ text: "\uF1FC"
font.family: "fontello"
focusPolicy: Qt.TabFocus
onClicked: colorDialog.open()
@@ -284,7 +297,7 @@ ApplicationWindow {
parent: textColorButton.contentItem
anchors.horizontalCenter: parent.horizontalCenter
anchors.baseline: parent.baseline
- anchors.baselineOffset: 4
+ anchors.baselineOffset: 6
TextMetrics {
id: aFontMetrics
@@ -293,19 +306,6 @@ ApplicationWindow {
}
}
}
- ToolButton {
- id: fontFamilyToolButton
- text: qsTr("F")
- font.family: document.fontFamily
- font.bold: document.bold
- font.italic: document.italic
- font.underline: document.underline
- onClicked: {
- fontDialog.currentFont.family = document.fontFamily;
- fontDialog.currentFont.pointSize = document.fontSize;
- fontDialog.open();
- }
- }
ToolSeparator {
contentItem.visible: formatRow.y === alignRow.y
}