Change some color.

This commit is contained in:
Black Hat 2018-09-03 07:13:39 +08:00
parent 64749ba32f
commit 104e194cfb
4 changed files with 33 additions and 16 deletions

View File

@ -21,7 +21,7 @@ Page {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: MSettings.darkTheme ? "#363636" : "#f3f3f3" color: MSettings.darkTheme ? "#323232" : "#f3f3f3"
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
@ -39,6 +39,12 @@ Page {
listModel: roomListModel listModel: roomListModel
} }
Rectangle {
Layout.preferredWidth: 1
Layout.fillHeight: true
color: MSettings.darkTheme ? "#363636" : "#ececec"
}
RoomForm { RoomForm {
id: roomForm id: roomForm

View File

@ -65,32 +65,24 @@ Page {
checked: MSettings.lazyLoad checked: MSettings.lazyLoad
onCheckedChanged: MSettings.lazyLoad = checked onCheckedChanged: MSettings.lazyLoad = checked
} }
Switch { Switch {
text: "Force loading message delegates asynchronously" text: "Force loading message delegates asynchronously"
checked: MSettings.asyncMessageDelegate checked: MSettings.asyncMessageDelegate
onCheckedChanged: MSettings.asyncMessageDelegate = checked onCheckedChanged: MSettings.asyncMessageDelegate = checked
} }
Switch { Switch {
text: "Use RichText instead of StyledText" text: "Use RichText instead of StyledText"
checked: MSettings.richText checked: MSettings.richText
onCheckedChanged: MSettings.richText = checked onCheckedChanged: MSettings.richText = 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
onCheckedChanged: MSettings.pressAndHold = checked onCheckedChanged: MSettings.pressAndHold = checked
} }
Switch {
text: "Rearrange rooms by activity"
checked: MSettings.rearrangeByActivity
onCheckedChanged: MSettings.rearrangeByActivity = checked
}
Button {
text: "Invoke GC"
highlighted: true
onClicked: gc()
}
} }
} }
@ -109,6 +101,12 @@ Page {
checked: MSettings.miniMode checked: MSettings.miniMode
onCheckedChanged: MSettings.miniMode = checked onCheckedChanged: MSettings.miniMode = checked
} }
Switch {
text: "Rearrange rooms by activity"
checked: MSettings.rearrangeByActivity
onCheckedChanged: MSettings.rearrangeByActivity = checked
}
} }
} }

View File

@ -226,6 +226,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
clip: true
displayMarginBeginning: 40 displayMarginBeginning: 40
displayMarginEnd: 40 displayMarginEnd: 40
verticalLayoutDirection: ListView.BottomToTop verticalLayoutDirection: ListView.BottomToTop
@ -379,7 +380,7 @@ Item {
} }
background: Rectangle { background: Rectangle {
color: MSettings.darkTheme ? "#242424" : "#eaeaea" color: MSettings.darkTheme ? "#282828" : "#eaeaea"
} }
ToolTip.visible: currentRoom && currentRoom.hasUsersTyping ToolTip.visible: currentRoom && currentRoom.hasUsersTyping
@ -462,7 +463,7 @@ Item {
contentItem: MaterialIcon { icon: "\ue24e" } contentItem: MaterialIcon { icon: "\ue24e" }
background: Rectangle { color: MSettings.darkTheme ? "#242424" : "#eaeaea" } background: Rectangle { color: MSettings.darkTheme ? "#282828" : "#eaeaea" }
onClicked: emojiPicker.visible ? emojiPicker.close() : emojiPicker.open() onClicked: emojiPicker.visible ? emojiPicker.close() : emojiPicker.open()

View File

@ -36,7 +36,7 @@ Item {
placeholderText: "Search..." placeholderText: "Search..."
background: Rectangle { background: Rectangle {
color: MSettings.darkTheme ? "#242424" : "#fafafa" color: MSettings.darkTheme ? "#282828" : "#fafafa"
} }
Shortcut { Shortcut {
@ -89,6 +89,11 @@ Item {
currentIndex: -1 currentIndex: -1
highlightFollowsCurrentItem: true
highlightMoveDuration: 200
highlightResizeDuration: 0
boundsBehavior: Flickable.DragOverBounds boundsBehavior: Flickable.DragOverBounds
ScrollBar.vertical: ScrollBar {} ScrollBar.vertical: ScrollBar {}
@ -99,7 +104,7 @@ Item {
width: parent.width width: parent.width
height: 64 height: 64
color: "#fafafa" color: MSettings.darkTheme ? "#282828" : "#fafafa"
AutoMouseArea { AutoMouseArea {
anchors.fill: parent anchors.fill: parent
@ -113,6 +118,13 @@ Item {
ToolTip.text: name ToolTip.text: name
} }
Rectangle {
anchors.fill: parent
visible: highlighted
color: Material.accent
opacity: 0.1
}
Rectangle { Rectangle {
width: 4 width: 4
height: parent.height height: parent.height