Compare commits
No commits in common. "2ead64e9b5ce1f82b6cf7b09636604da692fb82a" and "1e9bd0fd05c9916ff39cff41c542a58bac5841d2" have entirely different histories.
2ead64e9b5
...
1e9bd0fd05
|
@ -167,26 +167,16 @@ FluScrollablePage{
|
||||||
height: 68
|
height: 68
|
||||||
paddings: 10
|
paddings: 10
|
||||||
Layout.topMargin: 20
|
Layout.topMargin: 20
|
||||||
Row{
|
FluIconButton{
|
||||||
spacing: 20
|
iconSource:FluentIcons.ChromeCloseContrast
|
||||||
|
disabled:icon_button_switch.checked
|
||||||
|
iconSize: 15
|
||||||
anchors{
|
anchors{
|
||||||
verticalCenter: parent.verticalCenter
|
verticalCenter: parent.verticalCenter
|
||||||
left: parent.left
|
left: parent.left
|
||||||
}
|
}
|
||||||
FluIconButton{
|
onClicked:{
|
||||||
iconSource:FluentIcons.ChromeCloseContrast
|
showSuccess("点击IconButton")
|
||||||
disabled:icon_button_switch.checked
|
|
||||||
iconSize: 15
|
|
||||||
onClicked:{
|
|
||||||
showSuccess("点击IconButton")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FluIconButton{
|
|
||||||
disabled:icon_button_switch.checked
|
|
||||||
iconDelegate: Image{ width: 20; height: 20; source: "qrc:/example/res/image/ic_home_github.png" }
|
|
||||||
onClicked:{
|
|
||||||
showSuccess("点击IconButton")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FluToggleSwitch{
|
FluToggleSwitch{
|
||||||
|
|
|
@ -44,10 +44,10 @@ ScreenshotBackground::ScreenshotBackground(QQuickItem* parent) : QQuickPaintedIt
|
||||||
void ScreenshotBackground::paint(QPainter* painter)
|
void ScreenshotBackground::paint(QPainter* painter)
|
||||||
{
|
{
|
||||||
painter->save();
|
painter->save();
|
||||||
_sourcePixmap = QPixmap(QSize(_desktopPixmap.width(),_desktopPixmap.height()));
|
_sourcePixmap = QPixmap(QSize(_desktopGeometry.width(),_desktopGeometry.height()));
|
||||||
QPainter p(&_sourcePixmap);
|
QPainter p(&_sourcePixmap);
|
||||||
p.drawPixmap(_desktopGeometry,_desktopPixmap);
|
p.drawPixmap(_desktopGeometry,_desktopPixmap);
|
||||||
painter->drawPixmap(_desktopGeometry,_desktopPixmap);
|
painter->drawPixmap(_desktopGeometry,_sourcePixmap);
|
||||||
painter->restore();
|
painter->restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@ Button {
|
||||||
property color pressedColor: FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
|
property color pressedColor: FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
|
||||||
property color normalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
|
property color normalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
|
||||||
property color disableColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
|
property color disableColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
|
||||||
property Component iconDelegate: com_icon
|
|
||||||
property color color: {
|
property color color: {
|
||||||
if(!enabled){
|
if(!enabled){
|
||||||
return disableColor
|
return disableColor
|
||||||
|
@ -55,22 +54,16 @@ Button {
|
||||||
visible: control.activeFocus
|
visible: control.activeFocus
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Component{
|
contentItem: Item{
|
||||||
id:com_icon
|
|
||||||
FluIcon {
|
FluIcon {
|
||||||
id:text_icon
|
id:text_icon
|
||||||
font.pixelSize: iconSize
|
font.pixelSize: iconSize
|
||||||
iconSize: control.iconSize
|
iconSize: control.iconSize
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
iconColor: control.iconColor
|
|
||||||
iconSource: control.iconSource
|
|
||||||
}
|
|
||||||
}
|
|
||||||
contentItem: Item{
|
|
||||||
Loader{
|
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
sourceComponent: iconDelegate
|
iconColor: control.iconColor
|
||||||
|
iconSource: control.iconSource;
|
||||||
}
|
}
|
||||||
FluTooltip{
|
FluTooltip{
|
||||||
id:tool_tip
|
id:tool_tip
|
||||||
|
|
Loading…
Reference in New Issue