Title: [110836] trunk/Tools
- Revision
- 110836
- Author
- a...@0x90.dk
- Date
- 2012-03-15 05:06:47 -0700 (Thu, 15 Mar 2012)
Log Message
[Qt] MiniBrowser scroll indicators should not scroll out of view https://bugs.webkit.org/show_bug.cgi?id=81131
Reviewed by Kenneth Rohde Christiansen.
* MiniBrowser/qt/qml/ScrollIndicator.qml:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110835 => 110836)
--- trunk/Tools/ChangeLog 2012-03-15 10:00:04 UTC (rev 110835)
+++ trunk/Tools/ChangeLog 2012-03-15 12:06:47 UTC (rev 110836)
@@ -1,3 +1,12 @@
+2012-03-15 Alexander Færøy <alexander.fae...@nokia.com>
+
+ [Qt] MiniBrowser scroll indicators should not scroll out of view
+ https://bugs.webkit.org/show_bug.cgi?id=81131
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * MiniBrowser/qt/qml/ScrollIndicator.qml:
+
2012-03-14 Chris Fleizach <cfleiz...@apple.com>
AX: ARIA tables need to support selected rows attribute/select rows changed notification
Modified: trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml (110835 => 110836)
--- trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml 2012-03-15 10:00:04 UTC (rev 110835)
+++ trunk/Tools/MiniBrowser/qt/qml/ScrollIndicator.qml 2012-03-15 12:06:47 UTC (rev 110836)
@@ -65,11 +65,11 @@
opacity: 0.5
smooth: true
- x: flickableItem ? flickableItem.visibleArea.xPosition * horizontalIndicator.width : 0;
- y: 0
-
width: flickableItem ? flickableItem.visibleArea.widthRatio * horizontalIndicator.width: 0;
height: __indicatorSize
+
+ x: flickableItem ? Math.min(parent.width - width, Math.max(0, flickableItem.visibleArea.xPosition * horizontalIndicator.width)) : 0;
+ y: 0
}
states: [
@@ -111,11 +111,11 @@
opacity: 0.5
smooth: true;
- x: 0
- y: flickableItem ? flickableItem.visibleArea.yPosition * verticalIndicator.height : 0;
-
width: __indicatorSize
height: flickableItem ? flickableItem.visibleArea.heightRatio * verticalIndicator.height : 0;
+
+ x: 0
+ y: flickableItem ? Math.min(parent.height - height, Math.max(0, flickableItem.visibleArea.yPosition * verticalIndicator.height)) : 0
}
states: [
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
