diff --git a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml --- a/src/declarativeimports/plasmacomponents3/CheckIndicator.qml +++ b/src/declarativeimports/plasmacomponents3/CheckIndicator.qml @@ -26,8 +26,8 @@ property Item control imagePath: "widgets/button" prefix: "normal" - implicitWidth: units.gridUnit - implicitHeight: units.gridUnit + implicitWidth: units.iconSizes.small + implicitHeight: implicitWidth opacity: control.enabled ? 1 : 0.6 PlasmaCore.SvgItem { diff --git a/src/declarativeimports/plasmacomponents3/RadioButton.qml b/src/declarativeimports/plasmacomponents3/RadioButton.qml --- a/src/declarativeimports/plasmacomponents3/RadioButton.qml +++ b/src/declarativeimports/plasmacomponents3/RadioButton.qml @@ -27,7 +27,9 @@ implicitWidth: Math.max(background ? background.implicitWidth : 0, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: units.gridUnit * 1.6 + implicitHeight: Math.max(background ? background.implicitHeight : 0, + Math.max(contentItem.implicitHeight, + indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 1 diff --git a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml --- a/src/declarativeimports/plasmacomponents3/RadioIndicator.qml +++ b/src/declarativeimports/plasmacomponents3/RadioIndicator.qml @@ -31,7 +31,7 @@ opacity: control.enabled ? 1 : 0.6 implicitWidth: implicitHeight - implicitHeight: units.gridUnit + implicitHeight: units.iconSizes.small PlasmaCore.SvgItem { id: checkmark diff --git a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml --- a/src/declarativeimports/plasmastyle/CheckBoxStyle.qml +++ b/src/declarativeimports/plasmastyle/CheckBoxStyle.qml @@ -45,8 +45,8 @@ indicator: PlasmaCore.FrameSvgItem { imagePath: "widgets/button" prefix: "normal" - width: theme.mSize(theme.defaultFont).height + margins.left - height: theme.mSize(theme.defaultFont).height + margins.top + width: units.iconSizes.small + height: width opacity: control.enabled ? 1 : 0.6 PlasmaCore.SvgItem { diff --git a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml --- a/src/declarativeimports/plasmastyle/RadioButtonStyle.qml +++ b/src/declarativeimports/plasmastyle/RadioButtonStyle.qml @@ -51,8 +51,8 @@ elementId: "normal" opacity: control.enabled ? 1 : 0.6 - width: height - height: theme.mSize(theme.defaultFont).height * 1.6 + width: units.iconSizes.small + height: width PlasmaCore.SvgItem { id: checkmark diff --git a/src/desktoptheme/breeze/widgets/actionbutton.svg b/src/desktoptheme/breeze/widgets/actionbutton.svg --- a/src/desktoptheme/breeze/widgets/actionbutton.svg +++ b/src/desktoptheme/breeze/widgets/actionbutton.svg @@ -1,556 +1,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - + + + + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/desktoptheme/breeze/widgets/checkmarks.svg b/src/desktoptheme/breeze/widgets/checkmarks.svg --- a/src/desktoptheme/breeze/widgets/checkmarks.svg +++ b/src/desktoptheme/breeze/widgets/checkmarks.svg @@ -1,207 +1,51 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - + + + + + + - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +