diff --git a/Examples/src/VPGradientPage.qml b/Examples/src/VPGradientPage.qml index 129e341..7bbae88 100644 --- a/Examples/src/VPGradientPage.qml +++ b/Examples/src/VPGradientPage.qml @@ -15,7 +15,7 @@ Page { id: viewgroundItem anchors.right: parent.right -// anchors.top: parent.top + anchors.top: parent.top anchors.bottom: parent.bottom width: parent.width / 2 height: parent.height / 2 @@ -26,7 +26,6 @@ Page { source: modelData viewground: viewgroundItem -// height: root.height / 3 title: "Test ViewPortPage" text: "Test ViewPortPage. General text and html code" width: viewPort.width diff --git a/Examples/src/ViewPortContainerPage.qml b/Examples/src/ViewPortContainerPage.qml index 0313097..d0c0fdd 100644 --- a/Examples/src/ViewPortContainerPage.qml +++ b/Examples/src/ViewPortContainerPage.qml @@ -14,10 +14,11 @@ Page { delegate: Component { ViewPortPage { source: modelData - viewground: root + viewground: viewPort + listView: viewPort + width: viewPort.width + height: root.height / 3 - contentX: viewPort.contentX - contentY: viewPort.contentY title: "Test ViewPortPage" text: "Test ViewPortPage. General text and html code" } diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortDelegatBase.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortDelegatBase.qml index 978afd1..d0b87ac 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortDelegatBase.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortDelegatBase.qml @@ -34,34 +34,20 @@ ViewSolutionsControl { width: (viewPortDelegatW)? viewPortDelegatW: 0 height: (viewPortDelegatH)? viewPortDelegatH: 0 - - Flickable { - id: flickable - contentY: -(listView.contentY - delegateItem.y + viewground.y) - contentX: -(listView.contentX - delegateItem.x + viewground.x) - - onContentXChanged: { - console.log(contentX) - } - contentWidth: 2000//image.width - contentHeight: image.height + Item { clip: true - interactive: false Image { id: image; source: delegateItem.source fillMode: Image.PreserveAspectFit - x:0 - y:0 + x:(listView.contentX - delegateItem.x + viewground.x) + y:(listView.contentY - delegateItem.y + viewground.y) width: viewground.width; height: viewground.height; } - anchors.fill: parent anchors.margins: imageMrgin } - - } diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml index c7d722f..bb7b8ec 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml @@ -48,7 +48,7 @@ ViewPortPage { gradient: Gradient { GradientStop { position: 0.50; - color: "#0f"+ baseColor; + color: "#ff"+ baseColor; } GradientStop { diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml index 3e4ca6d..bd43b3a 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml @@ -35,6 +35,7 @@ ViewPortDelegatBase { border.color: "#" + baseColor border.width: 0 radius: height * 0.05 + } content: Item {