Fix UserSettings in QML
4 files changed, 5 insertions, 19 deletions
diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml
index 848e4974..ea2659b7 100644
--- a/resources/qml/Reactions.qml
+++ b/resources/qml/Reactions.qml
@@ -48,7 +48,7 @@ Flow {
TextMetrics {
id: textMetrics
- font.family: settings.emoji_font_family
+ font.family: settings.emojiFont
elide: Text.ElideRight
elideWidth: 150
text: model.key
@@ -58,7 +58,7 @@ Flow {
anchors.baseline: reactionCounter.baseline
id: reactionText
text: textMetrics.elidedText + (textMetrics.elidedText == textMetrics.text ? "" : "…")
- font.family: settings.emoji_font_family
+ font.family: settings.emojiFont
color: reaction.hovered ? colors.highlight : colors.text
maximumLineCount: 1
}
diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index e666c7cc..30bf9ac2 100644
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
@@ -71,7 +71,7 @@ MouseArea {
pixelDelta = wheel.pixelDelta.y
}
- pixelDelta = Math.round(pixelDelta)
+ pixelDelta = Math.round(pixelDelta)
if (!pixelDelta) {
return flickableItem.contentY;
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 12c8108a..9c0fd0b2 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -25,20 +25,6 @@ Page {
id: fontMetrics
}
- Settings {
- id: settings
- category: "user"
- property bool avatar_circles: true
- property string emoji_font_family: "default"
- }
-
- Settings {
- id: timelineSettings
- category: "user/timeline"
- property bool buttons: true
- property bool message_hover_highlight: false
- }
-
EmojiPicker {
id: emojiPopup
width: 7 * 52 + 20
diff --git a/resources/qml/emoji/EmojiPicker.qml b/resources/qml/emoji/EmojiPicker.qml
index b4c9640d..9c63aa79 100644
--- a/resources/qml/emoji/EmojiPicker.qml
+++ b/resources/qml/emoji/EmojiPicker.qml
@@ -76,7 +76,7 @@ Popup {
contentItem: Text {
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
- font.family: settings.emoji_font_family
+ font.family: settings.emojiFont
font.pixelSize: 36
text: model.unicode
@@ -276,7 +276,7 @@ Popup {
sourceSize.height: 32
fillMode: Image.Pad
smooth: true
- source: "image://colorimage/:/icons/icons/ui/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
+ source: "image://colorimage/:/icons/icons/emoji-categories/search.png?" + (parent.hovered ? colors.highlight : colors.buttonText)
}
MouseArea
|
