GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 02:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Give icons in the top bar a different size

Browse Source 
Because one of the icons now needs to be rectangular. All icons in there have the same style so they all have to be resized.

Contributes to issue CURA-4148.
This commit is contained in:
Ghostkeeper 2017-08-25 13:56:36 +02:00
parent 5be0d664f4
commit 0c7fd82e22
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/themes/cura/icons/tab_settings.svg
View File

@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 37.5 30">
<path d="M15.658 26.184h10.526V27.5H15.658v-1.316zm0-2.631h9.21v1.315h-9.21v-1.315zm0-2.632h7.895v1.316h-7.895V20.92zm0-2.632h6.58v1.316h-6.58V18.29zm0-2.631h5.263v1.316h-5.263v-1.316zm0-2.632h3.947v1.316h-3.947v-1.316zm0-2.631h2.632v1.316h-2.632v-1.316zm0-2.632h5.263V9.08h-5.263V7.763zm0-2.631h7.895v1.315h-7.895V5.132zm0-2.632h10.526v1.316H15.658V2.5zm-11.842 0l7.895 8.553L3.816 27.5h10.526v-25H3.816z" /> <path d="M15.658 26.184h10.526V27.5H15.658v-1.316zm0-2.631h9.21v1.315h-9.21v-1.315zm0-2.632h7.895v1.316h-7.895V20.92zm0-2.632h6.58v1.316h-6.58V18.29zm0-2.631h5.263v1.316h-5.263v-1.316zm0-2.632h3.947v1.316h-3.947v-1.316zm0-2.631h2.632v1.316h-2.632v-1.316zm0-2.632h5.263V9.08h-5.263V7.763zm0-2.631h7.895v1.315h-7.895V5.132zm0-2.632h10.526v1.316H15.658V2.5zm-11.842 0l7.895 8.553L3.816 27.5h10.526v-25H3.816z" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 484 B

19
resources/themes/cura/styles.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015 Ultimaker B.V. // Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher. // Cura is released under the terms of the AGPLv3 or higher.
import QtQuick 2.1 import QtQuick 2.1
@ -128,35 +128,34 @@ QtObject {
label: Item label: Item
{ {
implicitHeight: Theme.getSize("topbar_button_icon").height
implicitHeight: Theme.getSize("button_icon").height
implicitWidth: Theme.getSize("topbar_button").width; implicitWidth: Theme.getSize("topbar_button").width;
Item Item
{ {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
width: childrenRect.width width: childrenRect.width
height: Theme.getSize("button_icon").height height: Theme.getSize("topbar_button_icon").height
UM.RecolorImage UM.RecolorImage
{ {
id: icon id: icon
color: UM.Theme.getColor("text_emphasis") color: UM.Theme.getColor("text_emphasis")
opacity: !control.enabled ? 0.2 : 1.0 opacity: !control.enabled ? 0.2 : 1.0
source: control.iconSource source: control.iconSource
width: Theme.getSize("button_icon").width width: Theme.getSize("topbar_button_icon").width
height: Theme.getSize("button_icon").height height: Theme.getSize("topbar_button_icon").height
sourceSize: Theme.getSize("button_icon") sourceSize: Theme.getSize("topbar_button_icon")
} }
Image Image
{ {
visible: control.overlayIconSource != "" visible: control.overlayIconSource != ""
opacity: !control.enabled ? 0.2 : 1.0 opacity: !control.enabled ? 0.2 : 1.0
source: control.overlayIconSource source: control.overlayIconSource
width: Theme.getSize("button_icon").width width: Theme.getSize("topbar_button_icon").width
height: Theme.getSize("button_icon").height height: Theme.getSize("topbar_button_icon").height
sourceSize: Theme.getSize("button_icon") sourceSize: Theme.getSize("topbar_button_icon")
} }
Label Label
{ {

1
resources/themes/cura/theme.json
View File

@ -287,6 +287,7 @@
"button_lining": [0, 0], "button_lining": [0, 0],
"topbar_button": [17, 4], "topbar_button": [17, 4],
"topbar_button_icon": [3.125, 2.5],
"button_tooltip": [1.0, 1.3], "button_tooltip": [1.0, 1.3],
"button_tooltip_arrow": [0.25, 0.25], "button_tooltip_arrow": [0.25, 0.25],