3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into marketplace_redesign

Browse source 
Conflicts:
	plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml -> Some things were probably accidentally committed here and then later also changed in master.
This commit is contained in:
Ghostkeeper 2022-01-20 15:57:28 +01:00
commit efcd00e2f3
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
68 changed files with 1974 additions and 3039 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/DigitalLibrary/resources/qml/SelectProjectPage.qml
View file

@ -1,4 +1,4 @@
// Copyright (C) 2021 Ultimaker B.V.
// Copyright (C) 2022 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
@ -49,6 +49,8 @@ Item
id: searchBar
Layout.fillWidth: true
implicitHeight: createNewProjectButton.height
leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
focus: true
onTextEdited: manager.projectFilter = text //Update the search filter when editing this text field.
}