diff --git a/src/controls/FluAppBar.qml b/src/controls/FluAppBar.qml index 2dfb103e..c8a0bda5 100644 --- a/src/controls/FluAppBar.qml +++ b/src/controls/FluAppBar.qml @@ -93,7 +93,7 @@ Rectangle{ iconSize: 11 text:minimizeText radius: 0 - textColor: root.textColor + iconColor: root.textColor color: hovered ? minimizeHoverColor : minimizeNormalColor onClicked: { d.win.showMinimized() @@ -107,7 +107,7 @@ Rectangle{ Layout.alignment: Qt.AlignVCenter visible: d.resizable radius: 0 - textColor: root.textColor + iconColor: root.textColor text:d.isRestore?restoreText:maximizeText iconSize: 11 onClicked: { @@ -122,7 +122,7 @@ Rectangle{ height: 30 radius: 0 iconSize: 10 - textColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor + iconColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor color:hovered ? closeHoverColor : closeNormalColor onClicked: { d.win.close() diff --git a/src/controls/FluIconButton.qml b/src/controls/FluIconButton.qml index aa024057..ecd0b9be 100644 --- a/src/controls/FluIconButton.qml +++ b/src/controls/FluIconButton.qml @@ -17,7 +17,7 @@ Button { } return hovered ? hoverColor : normalColor } - property color textColor: { + property color iconColor: { if(FluTheme.dark){ if(disabled){ return Qt.rgba(130/255,130/255,130/255,1) @@ -57,7 +57,7 @@ Button { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter anchors.centerIn: parent - color:control.textColor + color:control.iconColor text: (String.fromCharCode(iconSource).toString(16)); } FluTooltip{ diff --git a/src/controls/FluPivot.qml b/src/controls/FluPivot.qml index 70915568..baf0a2b3 100644 --- a/src/controls/FluPivot.qml +++ b/src/controls/FluPivot.qml @@ -10,20 +10,20 @@ Item { property color normalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120 property color hoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black - width: 400 height: 300 + implicitHeight: height + implicitWidth: width + + MouseArea{ + anchors.fill: parent + preventStealing: true + } FluObject{ id:d } - Component.onCompleted: { - for(var i =0 ;i