Commit 6c7162bd authored by Thomas BOUTROUE's avatar Thomas BOUTROUE

Small fixes

parent 0a26f5b9
Pipeline #997 passed with stage
in 15 seconds
import QtQuick 2.6;
Item {
id: base;
property int index : -1;
property var key : undefined;
property string value : "";
property bool active : false;
// NOTE : automatically set by the Loader, proxying to model/modelData
property var model : undefined;
property var modelData : undefined;
}
...@@ -5,8 +5,8 @@ FocusScope { ...@@ -5,8 +5,8 @@ FocusScope {
id: base; id: base;
width: implicitWidth; width: implicitWidth;
height: implicitHeight; height: implicitHeight;
implicitWidth: (input.contentWidth + padding * 2); implicitWidth: Math.ceil (input.implicitWidth + padding * 2);
implicitHeight: (input.contentHeight + padding * 2); implicitHeight: Math.ceil (Math.max (input.implicitHeight, holder.implicitHeight) + padding * 2);
property int padding : Style.spacingNormal; property int padding : Style.spacingNormal;
property bool allowNewLine : true; property bool allowNewLine : true;
...@@ -66,7 +66,7 @@ FocusScope { ...@@ -66,7 +66,7 @@ FocusScope {
} }
anchors { anchors {
fill: parent; fill: parent;
margins: padding; margins: base.padding;
} }
Keys.onReturnPressed: { Keys.onReturnPressed: {
if (!allowNewLine) { if (!allowNewLine) {
...@@ -93,7 +93,7 @@ FocusScope { ...@@ -93,7 +93,7 @@ FocusScope {
top: parent.top; top: parent.top;
left: parent.left; left: parent.left;
right: parent.right; right: parent.right;
margins: padding; margins: base.padding;
} }
} }
} }
...@@ -3,8 +3,8 @@ import QtQmlTricks 3.0; ...@@ -3,8 +3,8 @@ import QtQmlTricks 3.0;
FocusScope { FocusScope {
id: base; id: base;
implicitWidth: Math.ceil (Math.max (input.contentWidth, holder.contentWidth) + padding * 2); implicitWidth: Math.ceil (input.implicitWidth + padding * 2);
implicitHeight: Math.ceil (input.contentHeight + padding * 2); implicitHeight: Math.ceil (Math.max (input.implicitHeight, holder.implicitHeight) + padding * 2);
property int padding : Style.spacingNormal; property int padding : Style.spacingNormal;
property bool hasClear : false; property bool hasClear : false;
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
<file>imports/QtQmlTricks.3/MultiLineTextBox.qml</file> <file>imports/QtQmlTricks.3/MultiLineTextBox.qml</file>
<file>imports/QtQmlTricks.3/Balloon.qml</file> <file>imports/QtQmlTricks.3/Balloon.qml</file>
<file>imports/QtQmlTricks.3/StatusBar.qml</file> <file>imports/QtQmlTricks.3/StatusBar.qml</file>
<file>imports/QtQmlTricks.3/ComboListDelegate.qml</file>
<file>imports/QtQmlTricks.3/SymbolLoader.qml</file> <file>imports/QtQmlTricks.3/SymbolLoader.qml</file>
<file>imports/QtQmlTricks.3/AbstractSymbol.qml</file> <file>imports/QtQmlTricks.3/AbstractSymbol.qml</file>
<file>imports/QtQmlTricks.3/ModalDialog.qml</file> <file>imports/QtQmlTricks.3/ModalDialog.qml</file>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment