Change Settings to singleton and add AutoMouseArea.

Also fixes acceptInvitation issue.
This commit is contained in:
Black Hat
2018-08-21 22:57:15 +08:00
parent fa4db065f2
commit e428e9f005
17 changed files with 104 additions and 48 deletions

View File

@@ -2,6 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import Matrique 0.1
import MatriqueSettings 0.1
import "qrc:/qml/form"
@@ -13,7 +14,7 @@ Page {
RoomListModel {
id: roomListModel
onRoomAdded: setting.lazyLoad ? {} : room.getPreviousContent(20)
onRoomAdded: MatriqueSettings.lazyLoad ? {} : room.getPreviousContent(20)
onNewMessage: window.active ? {} : matriqueController.showMessage(roomName, content, icon)
}
@@ -25,7 +26,7 @@ Page {
id: roomListForm
Layout.fillHeight: true
Layout.preferredWidth: setting.miniMode ? 80 : page.width * 0.35
Layout.preferredWidth: MatriqueSettings.miniMode ? 80 : page.width * 0.35
Layout.minimumWidth: 80
Layout.maximumWidth: 360