Some uncommited changes.

This commit is contained in:
Black Hat 2018-09-17 20:47:09 +08:00
parent 518fad088f
commit 317a6d6ec8
6 changed files with 12 additions and 14 deletions

@ -1 +1 @@
Subproject commit 875514ee865b00be67542849f94d2c2561ba4137 Subproject commit 9fb5fd1181fc74a040630df333a20ddd29cd7b28

View File

@ -3,7 +3,6 @@ import QtQuick 2.9
import Qt.labs.settings 1.0 import Qt.labs.settings 1.0
Settings { Settings {
property bool lazyLoad: true
property bool pressAndHold property bool pressAndHold
property bool rearrangeByActivity property bool rearrangeByActivity

View File

@ -15,7 +15,7 @@ Page {
RoomListModel { RoomListModel {
id: roomListModel id: roomListModel
onRoomAdded: if (!MSettings.lazyLoad) room.getPreviousContent(20) onRoomAdded: room.getPreviousContent(20)
onNewMessage: if (!window.active) matriqueController.showMessage(roomName, content, icon) onNewMessage: if (!window.active) matriqueController.showMessage(roomName, content, icon)
} }

View File

@ -191,13 +191,6 @@ Page {
padding: 64 padding: 64
Column { Column {
Switch {
text: "Lazy load at initial sync"
checked: MSettings.lazyLoad
onCheckedChanged: MSettings.lazyLoad = checked
}
Switch { Switch {
text: "Use press and hold instead of right click" text: "Use press and hold instead of right click"
checked: MSettings.pressAndHold checked: MSettings.pressAndHold

View File

@ -110,7 +110,7 @@ RowLayout {
spacing: 4 spacing: 4
Repeater { Repeater {
model: userMarker model: userMarker.length > 5 ? userMarker.slice(0, 5) : userMarker
ImageItem { ImageItem {
width: parent.height width: parent.height
@ -121,6 +121,14 @@ RowLayout {
} }
} }
AutoLabel {
visible: userMarker.length > 5
text: userMarker.length - 5 + "+"
coloredBackground: highlighted
Material.foreground: "grey"
font.pointSize: 8
}
AutoLabel { AutoLabel {
id: timeLabel id: timeLabel

View File

@ -120,7 +120,7 @@ Item {
spacing: 8 spacing: 8
boundsBehavior: Flickable.DragOverBounds boundsBehavior: Flickable.DragOverBounds
flickDeceleration: 2000 flickDeceleration: 4096
cacheBuffer: 200 cacheBuffer: 200
@ -479,6 +479,4 @@ Item {
} }
} }
} }
onCurrentRoomChanged: if (currentRoom && currentRoom.timelineSize === 0) currentRoom.getPreviousContent(20)
} }