diff --git a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml index ab7029903b..7ad0f5c96c 100644 --- a/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddLocalPrinterScrollView.qml @@ -147,19 +147,19 @@ ScrollView indicator: Rectangle { - implicitWidth: 16 - implicitHeight: 16 + implicitWidth: UM.Theme.getSize("radio_button").width + implicitHeight: UM.Theme.getSize("radio_button").height anchors.verticalCenter: parent.verticalCenter - radius: width / 2 + radius: (width / 2) | 0 border.width: UM.Theme.getSize("default_lining").width border.color: radioButton.hovered ? UM.Theme.getColor("small_button_text") : UM.Theme.getColor("small_button_text_hover") Rectangle { - width: parent.width / 2 + width: (parent.width / 2) | 0 height: width anchors.centerIn: parent - radius: width / 2 + radius: (width / 2) | 0 color: radioButton.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button") visible: radioButton.checked } diff --git a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml index 2275d3646e..b27e4db1fe 100644 --- a/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml +++ b/resources/qml/WelcomePages/AddNetworkPrinterScrollView.qml @@ -118,23 +118,24 @@ Item } } - Cura.RoundedRectangle + Item { id: controlsRectangle anchors.left: parent.left anchors.right: parent.right anchors.top: networkPrinterInfo.bottom - // Make sure that the left, right, and bottom borders do not show up, otherwise you see double - // borders. - anchors.bottomMargin: -border.width - anchors.leftMargin: -border.width - anchors.rightMargin: -border.width + + // Horizontal line separating the buttons (below) and the discovered network printers (above) + Rectangle + { + anchors.left: parent.left + anchors.top: parent.top + anchors.right: parent.right + height: UM.Theme.getSize("default_lining").width + color: UM.Theme.getColor("lining") + } height: UM.Theme.getSize("message_action_button").height + UM.Theme.getSize("default_margin").height - border.width: UM.Theme.getSize("default_lining").width - border.color: UM.Theme.getColor("lining") - color: "white" - cornerSide: Cura.RoundedRectangle.Direction.Down Cura.SecondaryButton { diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index cfdf03bcaf..83edda6486 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -513,6 +513,8 @@ "action_button_icon": [1.0, 1.0], "action_button_radius": [0.15, 0.15], + "radio_button": [1.3, 1.3], + "small_button": [2, 2], "small_button_icon": [1.5, 1.5],