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

Restyle sidebar tooltips using pointingrectangle

Browse Source 
Restyle toolbutton tooltips to match sidebar tooltips
This commit is contained in:
fieldOfView 2015-12-01 17:20:31 +01:00
parent 2fa29de4b9
commit 9a1a4d264e
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/qml/SidebarTooltip.qml
View File

@ -8,13 +8,15 @@ import QtQuick.Layouts 1.1
import UM 1.0 as UM
Rectangle {
UM.PointingRectangle {
id: base;
width: UM.Theme.sizes.tooltip.width;
height: label.height + UM.Theme.sizes.tooltip_margins.height * 2;
color: UM.Theme.colors.tooltip;
arrowSize: UM.Theme.sizes.default_arrow.width
opacity: 0;
Behavior on opacity { NumberAnimation { duration: 100; } }
@ -26,9 +28,10 @@ Rectangle {
y = parent.height - base.height;
} else {
x = position.x - base.width;
y = position.y;
y = position.y - UM.Theme.sizes.tooltip_arrow_margins.height;
}
base.opacity = 1;
target = Qt.point(40 , position.y)
}
function hide() {
@ -47,6 +50,6 @@ Rectangle {
}
wrapMode: Text.Wrap;
font: UM.Theme.fonts.default;
color: UM.Theme.colors.text;
color: UM.Theme.colors.tooltip_text;
}
}

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

@ -104,7 +104,7 @@ QtObject {
target: Qt.point(parent.x, y + height/2)
arrowSize: UM.Theme.sizes.button_tooltip_arrow.width
color: UM.Theme.colors.button_tooltip_border
color: UM.Theme.colors.tooltip
opacity: control.hovered ? 1.0 : 0.0;
width: control.hovered ? button_tip.width + UM.Theme.sizes.button_tooltip.width : 0
@ -113,14 +113,6 @@ QtObject {
Behavior on width { NumberAnimation { duration: 100; } }
Behavior on opacity { NumberAnimation { duration: 100; } }
UM.PointingRectangle {
color: UM.Theme.colors.button_tooltip;
anchors.fill: parent
anchors.margins: UM.Theme.sizes.default_lining.width
target: Qt.point(-UM.Theme.sizes.default_lining.width, parent.height/2)
arrowSize: parent.arrowSize
}
Label {
id: button_tip
@ -129,7 +121,7 @@ QtObject {
text: control.text;
font: UM.Theme.fonts.button_tooltip;
color: UM.Theme.colors.button_tooltip_text;
color: UM.Theme.colors.tooltip_text;
}
}

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

@ -149,7 +149,8 @@
"checkbox_mark": [24, 41, 77, 255],
"checkbox_text": [24, 41, 77, 255],
"tooltip": [255, 225, 146, 255],
"tooltip": [12, 169, 227, 255],
"tooltip_text": [255, 255, 255, 255],
"message_background": [255, 255, 255, 255],
"message_text": [32, 166, 219, 255],
@ -218,6 +219,7 @@
"tooltip": [20.0, 10.0],
"tooltip_margins": [1.0, 1.0],
"tooltip_arrow_margins": [2.0, 2.0],
"save_button_text_margin": [0.3, 0.6],
"save_button_slicing_bar": [0.0, 2.2],