Window: Adaptation has no compositing effect

pull/19/head 0.4
reionwong 4 years ago
parent 13ff0871de
commit 259818a3d1

@ -201,16 +201,6 @@ Window {
color: FishUI.Theme.backgroundColor
antialiasing: true
Rectangle {
anchors.fill: parent
color: "transparent"
radius: parent.radius
border.color: FishUI.Theme.darkMode ? Qt.rgba(255, 255, 255, 0.05) : Qt.rgba(0, 0, 0, 0.05)
antialiasing: true
visible: !isMaximized && !isFullScreen
z: 999
}
Behavior on color {
ColorAnimation {
duration: 200
@ -219,6 +209,19 @@ Window {
}
}
// Border line
Rectangle {
property var borderColor: compositing ? FishUI.Theme.darkMode ? Qt.rgba(255, 255, 255, 0.05) : Qt.rgba(0, 0, 0, 0.05) : FishUI.Theme.darkMode ? Qt.rgba(255, 255, 255, 0.15) : Qt.rgba(0, 0, 0, 0.15)
anchors.fill: parent
color: "transparent"
radius: parent.radius
border.color: borderColor
antialiasing: true
visible: !isMaximized && !isFullScreen
z: 999
}
// Content
Item {
id: _contentItem
@ -266,6 +269,7 @@ Window {
Layout.alignment: Qt.AlignTop
Layout.topMargin: _header.spacing
image.smooth: false
image.antialiasing: true
}
Item {
@ -278,10 +282,11 @@ Window {
(FishUI.Theme.darkMode ? "dark/" : "light/") +
(control.visibility === Window.Maximized ? "restore.svg" : "maximize.svg")
onClicked: control.toggleMaximized()
visible: control.visibility !== Window.FullScreen
visible: control.visibility !== Window.FullScreen && control.minimumWidth !== control.maximumWidth && control.maximumHeight !== control.minimumHeight
Layout.alignment: Qt.AlignTop
Layout.topMargin: _header.spacing
image.smooth: false
image.antialiasing: true
}
Item {
@ -296,6 +301,7 @@ Window {
Layout.alignment: Qt.AlignTop
Layout.topMargin: _header.spacing
image.smooth: false
image.antialiasing: true
}
Item {

@ -77,11 +77,11 @@ private:
int m_accentColorIndex;
QColor m_blueColor = QColor(51, 133, 255); // #3385FF
QColor m_redColor = QColor(232, 46, 62); // #E82E3E
QColor m_redColor = QColor(255, 92, 109); // #FF5C6D
QColor m_greenColor = QColor(53, 191, 86); // #35BF56
QColor m_purpleColor = QColor(130, 102, 255); // #8266FF
QColor m_pinkColor = QColor(202, 100, 172); // #CA64AC
QColor m_orangeColor = QColor(218, 124, 67 ); // #DA7C43
QColor m_orangeColor = QColor(254, 160, 66 ); // #FEA042
QColor m_accentColor;
};

Loading…
Cancel
Save