mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-22 06:03:57 -06:00
Add scroll bar to print monitor if content is overflowing
Fixes https://github.com/Ultimaker/Cura/issues/11629 CURA-8980
This commit is contained in:
parent
a4f1907b12
commit
9b19eaf84f
2 changed files with 27 additions and 6 deletions
|
@ -21,7 +21,10 @@ Component
|
||||||
|
|
||||||
Cura.PrintMonitor
|
Cura.PrintMonitor
|
||||||
{
|
{
|
||||||
anchors.fill: parent
|
anchors.top: parent.top
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.bottom: footerSeparator.top
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle
|
Rectangle
|
||||||
|
|
|
@ -3,17 +3,33 @@
|
||||||
|
|
||||||
import QtQuick 2.7
|
import QtQuick 2.7
|
||||||
import QtQuick.Layouts 1.1
|
import QtQuick.Layouts 1.1
|
||||||
|
import QtQuick.Controls 2.15
|
||||||
|
|
||||||
import UM 1.2 as UM
|
import UM 1.5 as UM
|
||||||
import Cura 1.0 as Cura
|
import Cura 1.0 as Cura
|
||||||
|
|
||||||
import "PrinterOutput"
|
import "PrinterOutput"
|
||||||
|
|
||||||
|
ScrollView
|
||||||
Item
|
|
||||||
{
|
{
|
||||||
id: base
|
id: base
|
||||||
UM.I18nCatalog { id: catalog; name: "cura"}
|
width: parent.width
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
contentHeight: printMonitor.height
|
||||||
|
|
||||||
|
ScrollBar.vertical: UM.ScrollBar
|
||||||
|
{
|
||||||
|
id: scrollbar
|
||||||
|
parent: base
|
||||||
|
anchors
|
||||||
|
{
|
||||||
|
right: parent.right
|
||||||
|
top: parent.top
|
||||||
|
bottom: parent.bottom
|
||||||
|
}
|
||||||
|
}
|
||||||
|
clip: true
|
||||||
|
|
||||||
function showTooltip(item, position, text)
|
function showTooltip(item, position, text)
|
||||||
{
|
{
|
||||||
|
@ -51,7 +67,9 @@ Item
|
||||||
{
|
{
|
||||||
id: printMonitor
|
id: printMonitor
|
||||||
|
|
||||||
anchors.fill: parent
|
UM.I18nCatalog { id: catalog; name: "cura" }
|
||||||
|
|
||||||
|
width: parent.width - scrollbar.width
|
||||||
|
|
||||||
property var extrudersModel: CuraApplication.getExtrudersModel()
|
property var extrudersModel: CuraApplication.getExtrudersModel()
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue