mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-13 10:39:00 +08:00
Remove style from settingview
This commit is contained in:
parent
2aa931cbca
commit
722f928d12
@ -2,9 +2,7 @@
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.1
|
||||
import QtQuick.Controls.Styles 1.1
|
||||
import QtQuick.Layouts 1.2
|
||||
import QtQuick.Controls 2.1
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
@ -16,7 +14,7 @@ Item
|
||||
id: settingsView
|
||||
|
||||
property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
|
||||
property Action configureSettings
|
||||
//property Action configureSettings
|
||||
property bool findingSettings
|
||||
|
||||
Item
|
||||
@ -181,14 +179,15 @@ Item
|
||||
// Mouse area that gathers the scroll events to not propagate it to the main view.
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: scrollView
|
||||
anchors.fill: contents
|
||||
acceptedButtons: Qt.AllButtons
|
||||
onWheel: wheel.accepted = true
|
||||
}
|
||||
|
||||
ScrollView
|
||||
ListView
|
||||
{
|
||||
id: scrollView
|
||||
id: contents
|
||||
|
||||
anchors
|
||||
{
|
||||
top: filterContainer.bottom
|
||||
@ -197,14 +196,7 @@ Item
|
||||
right: parent.right
|
||||
left: parent.left
|
||||
}
|
||||
|
||||
style: UM.Theme.styles.scrollview
|
||||
flickableItem.flickableDirection: Flickable.VerticalFlick
|
||||
__wheelAreaScrollSpeed: 75 // Scroll three lines in one scroll event
|
||||
|
||||
ListView
|
||||
{
|
||||
id: contents
|
||||
clip: true
|
||||
cacheBuffer: 1000000 // Set a large cache to effectively just cache every list item.
|
||||
|
||||
model: UM.SettingDefinitionsModel
|
||||
@ -233,7 +225,7 @@ Item
|
||||
{
|
||||
id: delegate
|
||||
|
||||
width: scrollView.width
|
||||
width: contents.width
|
||||
height: enabled ? contents.delegateHeight: 0
|
||||
Behavior on height { NumberAnimation { duration: 100 } }
|
||||
opacity: enabled ? 1 : 0
|
||||
@ -461,7 +453,7 @@ Item
|
||||
MenuItem
|
||||
{
|
||||
text: model.name
|
||||
iconName: model.icon_name
|
||||
//iconName: model.icon_name
|
||||
onTriggered:
|
||||
{
|
||||
customMenuItems.model.callMenuItemMethod(name, model.actions, {"key": contextMenu.key})
|
||||
@ -533,4 +525,3 @@ Item
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user