Merge branch 'fix_window_overflow' of https://github.com/fieldOfView/Cura

resources/qml/AboutDialog.qml

@@ -73,22 +73,26 @@ UM.Dialog
         anchors.topMargin: UM.Theme.getSize("default_margin").height
     }
 
+    ScrollView
+    {
+        anchors.top: creditsNotes.bottom
+        anchors.topMargin: UM.Theme.getSize("default_margin").height
+
+        width: parent.width
+        height: base.height - y - (2 * UM.Theme.getSize("default_margin").height + closeButton.height)
+
         ListView
         {
             id: projectsList
 
-        anchors.top: creditsNotes.bottom
-        anchors.topMargin: 10
-
             width: parent.width
-        height: childrenRect.height
 
             delegate: Row
             {
                 Label
                 {
                     text: "<a href='%1' title='%2'>%2</a>".arg(model.url).arg(model.name)
-                width: projectsList.width * 0.25
+                    width: (projectsList.width * 0.25) | 0
                     elide: Text.ElideRight
                     onLinkActivated: Qt.openUrlExternally(link)
                 }
@@ -96,13 +100,13 @@ UM.Dialog
                 {
                     text: model.description
                     elide: Text.ElideRight
-                width: projectsList.width * 0.6
+                    width: (projectsList.width * 0.6) | 0
                 }
                 Label
                 {
                     text: model.license
                     elide: Text.ElideRight
-                width: projectsList.width * 0.15
+                    width: (projectsList.width * 0.15) | 0
                 }
             }
             model: ListModel
@@ -124,17 +128,21 @@ UM.Dialog
                 projectsModel.append({ name:"SciPy", description: catalog.i18nc("@label", "Support library for scientific computing "), license: "BSD-new", url: "https://www.scipy.org/" });
                 projectsModel.append({ name:"NumPy", description: catalog.i18nc("@label", "Support library for faster math"), license: "BSD", url: "http://www.numpy.org/" });
                 projectsModel.append({ name:"NumPy-STL", description: catalog.i18nc("@label", "Support library for handling STL files"), license: "BSD", url: "https://github.com/WoLpH/numpy-stl" });
+                projectsModel.append({ name:"libSavitar", description: catalog.i18nc("@label", "Support library for handling 3MF files"), license: "AGPLv3", url: "https://github.com/ultimaker/libsavitar" });
                 projectsModel.append({ name:"PySerial", description: catalog.i18nc("@label", "Serial communication library"), license: "Python", url: "http://pyserial.sourceforge.net/" });
                 projectsModel.append({ name:"python-zeroconf", description: catalog.i18nc("@label", "ZeroConf discovery library"), license: "LGPL", url: "https://github.com/jstasiak/python-zeroconf" });
                 projectsModel.append({ name:"Clipper", description: catalog.i18nc("@label", "Polygon clipping library"), license: "Boost", url: "http://www.angusj.com/delphi/clipper.php" });
+
                 projectsModel.append({ name:"Open Sans", description: catalog.i18nc("@label", "Font"), license: "Apache 2.0", url: "https://fonts.google.com/specimen/Open+Sans" });
                 projectsModel.append({ name:"Font-Awesome-SVG-PNG", description: catalog.i18nc("@label", "SVG icons"), license: "SIL OFL 1.1", url: "https://github.com/encharm/Font-Awesome-SVG-PNG" });
             }
         }
+    }
 
     rightButtons: Button
     {
         //: Close about dialog button
+        id: closeButton
         text: catalog.i18nc("@action:button","Close");
 
         onClicked: base.visible = false;

resources/qml/Preferences/GeneralPage.qml

@@ -58,6 +58,11 @@ UM.PreferencesPage
         }
     }
 
+    ScrollView
+    {
+        width: parent.width
+        height: parent.height
+
         Column
         {
             //: Model used to check if a plugin exists
@@ -393,3 +398,4 @@ UM.PreferencesPage
             }
         }
     }
+}