From 0000e557a7a9283c4f2d4bd2b683eb38749f1834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sat, 8 Apr 2023 20:44:27 +0800 Subject: [PATCH] update --- example/T_InfoBar.qml | 8 ++++---- example/component/CodeExpander.qml | 4 +++- src/controls/FluRectangle.qml | 16 ++++++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/example/T_InfoBar.qml b/example/T_InfoBar.qml index 11f2f914..e07b8d4f 100644 --- a/example/T_InfoBar.qml +++ b/example/T_InfoBar.qml @@ -52,12 +52,12 @@ FluScrollablePage{ } CodeExpander{ Layout.fillWidth: true - code:' showInfo("这是一个Info样式的InfoBar") + code:'showInfo("这是一个Info样式的InfoBar") - showWarning("这是一个Warning样式的InfoBar") +showWarning("这是一个Warning样式的InfoBar") - showError("这是一个Error样式的InfoBar") +showError("这是一个Error样式的InfoBar") - showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")' +showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")' } } diff --git a/example/component/CodeExpander.qml b/example/component/CodeExpander.qml index 1650e991..6d3e9182 100644 --- a/example/component/CodeExpander.qml +++ b/example/component/CodeExpander.qml @@ -115,7 +115,9 @@ FluExpander{ "FluWindow", "FluWindowResize", "FluToggleButton", - "FluTableView" + "FluTableView", + "FluColors", + "FluTheme", ]; code = code.replace(/\n/g, "
"); code = code.replace(/ /g, " "); diff --git a/src/controls/FluRectangle.qml b/src/controls/FluRectangle.qml index 2293b33a..90728ab6 100644 --- a/src/controls/FluRectangle.qml +++ b/src/controls/FluRectangle.qml @@ -9,14 +9,6 @@ Item{ property bool shadow: true default property alias contentItem: container.data - Rectangle{ - id:container - width: control.width - height: control.height - opacity: 0 - color:control.color - } - FluShadow{ anchors.fill: container radius: control.radius[0] @@ -28,6 +20,14 @@ Item{ } } + Rectangle{ + id:container + width: control.width + height: control.height + opacity: 0 + color:control.color + } + Canvas { id: canvas anchors.fill: parent