Remove blur effect, causes too much trouble
This commit is contained in:
parent
d82cb50e30
commit
8f965a3e72
1
TODO.md
1
TODO.md
|
@ -22,7 +22,6 @@
|
||||||
- Register/Forgot? for SignIn dialog
|
- Register/Forgot? for SignIn dialog
|
||||||
- Scaling
|
- Scaling
|
||||||
- See [Text.fontSizeMode](https://doc.qt.io/qt-5/qml-qtquick-text.html#fontSizeMode-prop)
|
- See [Text.fontSizeMode](https://doc.qt.io/qt-5/qml-qtquick-text.html#fontSizeMode-prop)
|
||||||
- Test HGlassRectangle elements when no effects are available
|
|
||||||
- Add room
|
- Add room
|
||||||
- Leave room
|
- Leave room
|
||||||
- Forget room warning popup
|
- Forget room warning popup
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
import QtQuick 2.7
|
|
||||||
import QtGraphicalEffects 1.0
|
|
||||||
|
|
||||||
Item {
|
|
||||||
property bool isPageStackDescendant: true
|
|
||||||
|
|
||||||
default property alias children: rectangle.children
|
|
||||||
property alias color: rectangle.color
|
|
||||||
property alias gradient: rectangle.gradient
|
|
||||||
property alias blurRadius: fastBlur.radius
|
|
||||||
property alias border: rectangle.border
|
|
||||||
property alias radius: rectangle.radius
|
|
||||||
|
|
||||||
ShaderEffectSource {
|
|
||||||
id: effectSource
|
|
||||||
sourceItem: mainUIBackground
|
|
||||||
anchors.fill: parent
|
|
||||||
sourceRect: Qt.rect(
|
|
||||||
(isPageStackDescendant ? pageStack.x : 0) + parent.x,
|
|
||||||
(isPageStackDescendant ? pageStack.y : 0) + parent.y,
|
|
||||||
width,
|
|
||||||
height
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
FastBlur {
|
|
||||||
id: fastBlur
|
|
||||||
anchors.fill: effectSource
|
|
||||||
source: effectSource
|
|
||||||
radius: rectangle.color == "#00000000" ? 0 : 8
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
id: rectangle
|
|
||||||
anchors.fill: parent
|
|
||||||
color: HStyle.sidePane.background
|
|
||||||
}
|
|
||||||
}
|
|
6
harmonyqml/components/Base/HRectangle.qml
Normal file
6
harmonyqml/components/Base/HRectangle.qml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
import QtQuick 2.7
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: rectangle
|
||||||
|
color: HStyle.sidePane.background
|
||||||
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
import QtQuick 2.7
|
import QtQuick 2.7
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
property real widthForHeight: 0.75
|
property real widthForHeight: 0.75
|
||||||
property int baseHeight: 300
|
property int baseHeight: 300
|
||||||
property int startScalingUpAboveHeight: 1080
|
property int startScalingUpAboveHeight: 1080
|
||||||
|
|
|
@ -57,6 +57,10 @@ QtObject {
|
||||||
}
|
}
|
||||||
|
|
||||||
readonly property QtObject chat: QtObject {
|
readonly property QtObject chat: QtObject {
|
||||||
|
readonly property QtObject selectViewBar: QtObject {
|
||||||
|
property color background: colors.background1
|
||||||
|
}
|
||||||
|
|
||||||
readonly property QtObject roomHeader: QtObject {
|
readonly property QtObject roomHeader: QtObject {
|
||||||
property color background: colors.background1
|
property color background: colors.background1
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.7
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "../../Base"
|
import "../../Base"
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
id: banner
|
id: banner
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.preferredHeight: 32
|
Layout.preferredHeight: 32
|
||||||
|
|
|
@ -3,8 +3,9 @@ import QtQuick.Layouts 1.3
|
||||||
import "../Base"
|
import "../Base"
|
||||||
import "Banners"
|
import "Banners"
|
||||||
import "RoomEventList"
|
import "RoomEventList"
|
||||||
|
import "DetailsPane"
|
||||||
|
|
||||||
HColumnLayout {
|
HSplitView {
|
||||||
property string userId: ""
|
property string userId: ""
|
||||||
property string category: ""
|
property string category: ""
|
||||||
property string roomId: ""
|
property string roomId: ""
|
||||||
|
@ -31,34 +32,46 @@ HColumnLayout {
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
RoomHeader {
|
HColumnLayout {
|
||||||
displayName: roomInfo.displayName
|
|
||||||
topic: roomInfo.topic || ""
|
|
||||||
}
|
|
||||||
|
|
||||||
RoomEventList {
|
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.fillHeight: true
|
|
||||||
|
RoomHeader {
|
||||||
|
displayName: roomInfo.displayName
|
||||||
|
topic: roomInfo.topic || ""
|
||||||
|
}
|
||||||
|
|
||||||
|
RoomEventList {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
Layout.fillHeight: true
|
||||||
|
}
|
||||||
|
|
||||||
|
TypingMembersBar {}
|
||||||
|
|
||||||
|
InviteBanner {
|
||||||
|
visible: category === "Invites"
|
||||||
|
inviter: roomInfo.inviter
|
||||||
|
}
|
||||||
|
|
||||||
|
UnknownDevicesBanner {
|
||||||
|
visible: category == "Rooms" && hasUnknownDevices
|
||||||
|
}
|
||||||
|
|
||||||
|
SendBox {
|
||||||
|
id: sendBox
|
||||||
|
visible: category == "Rooms" && ! hasUnknownDevices
|
||||||
|
}
|
||||||
|
|
||||||
|
LeftBanner {
|
||||||
|
visible: category === "Left"
|
||||||
|
leftEvent: roomInfo.leftEvent
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TypingMembersBar {}
|
DetailsPane {
|
||||||
|
property int parentWidth: parent.width
|
||||||
|
onParentWidthChanged: width = Math.min(parent.width * 0.3, 300)
|
||||||
|
|
||||||
InviteBanner {
|
Layout.minimumWidth: 36
|
||||||
visible: category === "Invites"
|
Layout.maximumWidth: parent.width
|
||||||
inviter: roomInfo.inviter
|
|
||||||
}
|
|
||||||
|
|
||||||
UnknownDevicesBanner {
|
|
||||||
visible: category == "Rooms" && hasUnknownDevices
|
|
||||||
}
|
|
||||||
|
|
||||||
SendBox {
|
|
||||||
id: sendBox
|
|
||||||
visible: category == "Rooms" && ! hasUnknownDevices
|
|
||||||
}
|
|
||||||
|
|
||||||
LeftBanner {
|
|
||||||
visible: category === "Left"
|
|
||||||
leftEvent: roomInfo.leftEvent
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import QtQuick 2.7
|
import QtQuick 2.7
|
||||||
import "../../Base"
|
import "../../Base"
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
property int space: 8
|
property int space: 8
|
||||||
|
|
||||||
color: HStyle.chat.roomEventList.background
|
color: HStyle.chat.roomEventList.background
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.7
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "../Base"
|
import "../Base"
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
property string displayName: ""
|
property string displayName: ""
|
||||||
property string topic: ""
|
property string topic: ""
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ import QtQuick 2.7
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import "../Base"
|
import "../Base"
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
function setFocus() { textArea.forceActiveFocus() }
|
function setFocus() { textArea.forceActiveFocus() }
|
||||||
|
|
||||||
id: root
|
id: root
|
||||||
|
|
|
@ -3,7 +3,7 @@ import QtQuick.Layouts 1.3
|
||||||
import "../Base"
|
import "../Base"
|
||||||
import "utils.js" as ChatJS
|
import "utils.js" as ChatJS
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
property var typingMembers: chatPage.roomInfo.typingMembers
|
property var typingMembers: chatPage.roomInfo.typingMembers
|
||||||
|
|
||||||
color: HStyle.chat.typingMembers.background
|
color: HStyle.chat.typingMembers.background
|
||||||
|
|
|
@ -1,10 +1,8 @@
|
||||||
import QtQuick.Layouts 1.3
|
import QtQuick.Layouts 1.3
|
||||||
import QtGraphicalEffects 1.0
|
|
||||||
import "../Base"
|
import "../Base"
|
||||||
|
|
||||||
HGlassRectangle {
|
HRectangle {
|
||||||
id: sidePane
|
id: sidePane
|
||||||
isPageStackDescendant: false
|
|
||||||
|
|
||||||
HColumnLayout {
|
HColumnLayout {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
|
@ -50,7 +50,8 @@ Item {
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
if (pageStack.initialPageSet) { return }
|
if (pageStack.initialPageSet) { return }
|
||||||
pageStack.initialPageSet = true
|
pageStack.initialPageSet = true
|
||||||
showPage(accountsLoggedIn ? "Default" : "SignIn")
|
showRoom("@test_mary:matrix.org", "Rooms", "!TSXGsbBbdwsdylIOJZ:matrix.org")
|
||||||
|
//showPage(accountsLoggedIn ? "Default" : "SignIn")
|
||||||
}
|
}
|
||||||
|
|
||||||
onCurrentItemChanged: if (currentItem) {
|
onCurrentItemChanged: if (currentItem) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user