mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 06:57:28 -06:00
Replace ScrollView by ListView in settings picking dialogue
The ScrollView is no longer necessary in Controls2. Just have a ListView with customised scrollbar. Contributes to issue CURA-8686.
This commit is contained in:
parent
f630b84788
commit
954a3cb1db
1 changed files with 46 additions and 44 deletions
|
@ -1,7 +1,10 @@
|
||||||
import QtQuick 2.2
|
// Copyright (c) 2022 Ultimaker B.V.
|
||||||
import QtQuick.Controls 1.2
|
// Cura is released under the terms of the LGPLv3 or higher.
|
||||||
|
|
||||||
import UM 1.2 as UM
|
import QtQuick 2.2
|
||||||
|
import QtQuick.Controls 2.2
|
||||||
|
|
||||||
|
import UM 1.5 as UM
|
||||||
import Cura 1.0 as Cura
|
import Cura 1.0 as Cura
|
||||||
import ".."
|
import ".."
|
||||||
|
|
||||||
|
@ -67,10 +70,9 @@ UM.Dialog
|
||||||
text: catalog.i18nc("@label:checkbox", "Show all")
|
text: catalog.i18nc("@label:checkbox", "Show all")
|
||||||
}
|
}
|
||||||
|
|
||||||
ScrollView
|
ListView
|
||||||
{
|
{
|
||||||
id: scrollView
|
id: listview
|
||||||
|
|
||||||
anchors
|
anchors
|
||||||
{
|
{
|
||||||
top: filterInput.bottom
|
top: filterInput.bottom
|
||||||
|
@ -78,9 +80,10 @@ UM.Dialog
|
||||||
right: parent.right
|
right: parent.right
|
||||||
bottom: parent.bottom
|
bottom: parent.bottom
|
||||||
}
|
}
|
||||||
ListView
|
|
||||||
{
|
ScrollBar.vertical: UM.ScrollBar {}
|
||||||
id: listview
|
clip: true
|
||||||
|
|
||||||
model: UM.SettingDefinitionsModel
|
model: UM.SettingDefinitionsModel
|
||||||
{
|
{
|
||||||
id: definitionsModel
|
id: definitionsModel
|
||||||
|
@ -119,7 +122,6 @@ UM.Dialog
|
||||||
}
|
}
|
||||||
Component.onCompleted: settingPickDialog.updateFilter()
|
Component.onCompleted: settingPickDialog.updateFilter()
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
rightButtons: [
|
rightButtons: [
|
||||||
Button
|
Button
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue