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

Merge branch '4.1' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-04-29 10:51:25 +02:00
commit 9e0d047815
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/qml/Cura.qml
View File

@ -391,6 +391,7 @@ UM.MainWindow
PrintSetupTooltip
{
id: tooltip
sourceWidth: UM.Theme.getSize("print_setup_widget").width
}
}

15
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View File

@ -25,6 +25,13 @@ Item
Custom = 1
}
// Catch all mouse events
MouseArea
{
anchors.fill: parent
hoverEnabled: true
}
// Set the current mode index to the value that is stored in the preferences or Recommended mode otherwise.
property int currentModeIndex:
{
@ -194,7 +201,13 @@ Item
{
h -= mouse_absolute_y - base.height;
}
// Enforce a minimum size (again).
// This is a bit of a hackish way to do it, but we've seen some ocasional reports that the size
// could get below the the minimum height.
if(h < absoluteMinimumHeight)
{
h = absoluteMinimumHeight;
}
UM.Preferences.setValue("view/settings_list_height", h);
}
}

51
resources/qml/PrintSetupTooltip.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2015 Ultimaker B.V.
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
@ -6,26 +6,43 @@ import QtQuick.Controls 2.3
import UM 1.0 as UM
UM.PointingRectangle {
id: base;
width: UM.Theme.getSize("tooltip").width;
height: label.height + UM.Theme.getSize("tooltip_margins").height * 2;
color: UM.Theme.getColor("tooltip");
UM.PointingRectangle
{
id: base
property real sourceWidth: 0
width: UM.Theme.getSize("tooltip").width
height: label.height + UM.Theme.getSize("tooltip_margins").height * 2
color: UM.Theme.getColor("tooltip")
arrowSize: UM.Theme.getSize("default_arrow").width
opacity: 0;
Behavior on opacity { NumberAnimation { duration: 100; } }
opacity: 0
property alias text: label.text;
Behavior on opacity
{
NumberAnimation { duration: 100; }
}
function show(position) {
if(position.y + base.height > parent.height) {
property alias text: label.text
function show(position)
{
if(position.y + base.height > parent.height)
{
x = position.x - base.width;
y = parent.height - base.height;
} else {
x = position.x - base.width;
} else
{
var new_x = x = position.x - base.width
// If the tooltip would fall out of the screen, display it on the other side.
if(new_x < 0)
{
new_x = x + sourceWidth + base.width
}
x = new_x
y = position.y - UM.Theme.getSize("tooltip_arrow_margins").height;
if(y < 0)
{
@ -37,14 +54,16 @@ UM.PointingRectangle {
target = Qt.point(position.x + 1, position.y + Math.round(UM.Theme.getSize("tooltip_arrow_margins").height / 2))
}
function hide() {
function hide()
{
base.opacity = 0;
}
Label
{
id: label;
anchors {
anchors
{
top: parent.top;
topMargin: UM.Theme.getSize("tooltip_margins").height;
left: parent.left;