Merge PR #409: Make Pane corners slightly rounded in energize style
This commit is contained in:
commit
98f0f5e9b1
@ -20,5 +20,6 @@
|
||||
<file>styles/energize/Button.qml</file>
|
||||
<file>styles/energize/logo.svg</file>
|
||||
<file>styles/energize/Page.qml</file>
|
||||
<file>styles/energize/Pane.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -37,7 +37,7 @@ ApplicationWindow {
|
||||
Material.theme: Material.Light
|
||||
|
||||
// Main background color
|
||||
Material.background: "676767"
|
||||
Material.background: "#FFFFFF"
|
||||
|
||||
font.pixelSize: 14
|
||||
font.weight: Font.Normal
|
||||
|
||||
76
nymea-app/styles/energize/Pane.qml
Normal file
76
nymea-app/styles/energize/Pane.qml
Normal file
@ -0,0 +1,76 @@
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Copyright 2013 - 2020, nymea GmbH
|
||||
* Contact: contact@nymea.io
|
||||
*
|
||||
* This file is part of nymea.
|
||||
* This project including source code and documentation is protected by
|
||||
* copyright law, and remains the property of nymea GmbH. All rights, including
|
||||
* reproduction, publication, editing and translation, are reserved. The use of
|
||||
* this project is subject to the terms of a license agreement to be concluded
|
||||
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
|
||||
* under https://nymea.io/license
|
||||
*
|
||||
* GNU General Public License Usage
|
||||
* Alternatively, this project may be redistributed and/or modified under the
|
||||
* terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, GNU version 3. This project is distributed in the hope that it
|
||||
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this project. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* For any further details and any questions please contact us under
|
||||
* contact@nymea.io or see our FAQ/Licensing Information on
|
||||
* https://nymea.io/license/faq
|
||||
*
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||
|
||||
import QtQuick 2.9
|
||||
import QtQuick.Templates 2.2 as T
|
||||
import QtQuick.Controls.Material 2.2
|
||||
import QtQuick.Controls.Material.impl 2.2
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
T.Pane {
|
||||
id: control
|
||||
|
||||
implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
|
||||
implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
|
||||
|
||||
contentWidth: contentItem.implicitWidth || (contentChildren.length === 1 ? contentChildren[0].implicitWidth : 0)
|
||||
contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0)
|
||||
|
||||
padding: 12
|
||||
|
||||
background: Rectangle {
|
||||
color: control.Material.backgroundColor
|
||||
radius: 5
|
||||
|
||||
layer.enabled: control.enabled && control.Material.elevation > 0
|
||||
layer.effect: ElevationEffect {
|
||||
elevation: control.Material.elevation
|
||||
}
|
||||
}
|
||||
|
||||
layer.effect: Item {
|
||||
width: control.width
|
||||
height: control.height
|
||||
Rectangle {
|
||||
id: mask
|
||||
anchors.fill: parent
|
||||
color: "#FFFFFFFF"
|
||||
radius: 5
|
||||
}
|
||||
OpacityMask {
|
||||
width: control.width
|
||||
height: control.height
|
||||
source: control
|
||||
maskSource: mask
|
||||
}
|
||||
}
|
||||
layer.enabled: true
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user