mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-06-26 01:15:28 -06:00
Merge branch 'fix_scrollview_scrollbars' of https://github.com/fieldOfView/Cura
This commit is contained in:
commit
43da68c898
6 changed files with 7 additions and 7 deletions
|
@ -67,7 +67,7 @@ UM.Dialog
|
|||
|
||||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
parent: scroll
|
||||
parent: scroll.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
|
|
@ -68,7 +68,7 @@ Item
|
|||
clip: true
|
||||
|
||||
ScrollBar.vertical: UM.ScrollBar {
|
||||
parent: container
|
||||
parent: container.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
|
|
@ -141,7 +141,7 @@ UM.PreferencesPage
|
|||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
id: preferencesScrollBar
|
||||
parent: preferencesScrollView
|
||||
parent: preferencesScrollView.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
|
|
@ -126,7 +126,7 @@ UM.ManagementPage
|
|||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
id: materialScrollBar
|
||||
parent: materialScrollView
|
||||
parent: materialScrollView.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
|
|
@ -94,7 +94,7 @@ Item
|
|||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
id: scrollBar
|
||||
parent: informationPage
|
||||
parent: informationPage.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
@ -536,7 +536,7 @@ Item
|
|||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
id: settingScrollBar
|
||||
parent: settingsPage
|
||||
parent: settingsPage.parent
|
||||
anchors
|
||||
{
|
||||
top: parent.top
|
||||
|
|
|
@ -21,7 +21,7 @@ ScrollView
|
|||
ScrollBar.vertical: UM.ScrollBar
|
||||
{
|
||||
id: scrollbar
|
||||
parent: base
|
||||
parent: base.parent
|
||||
anchors
|
||||
{
|
||||
right: parent.right
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue