Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:47:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #11206 from vladest/goto_remove_snap

Browse source 
Switch off snap behavior
This commit is contained in:
druiz17 2017-08-18 16:14:59 -07:00 committed by GitHub
commit 42f6333948
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/hifi/Card.qml
View file

@ -46,6 +46,8 @@ Item {
property int stackShadowNarrowing: 5; property int stackShadowNarrowing: 5;
property string defaultThumbnail: Qt.resolvedUrl("../../images/default-domain.gif"); property string defaultThumbnail: Qt.resolvedUrl("../../images/default-domain.gif");
property int shadowHeight: 10; property int shadowHeight: 10;
property bool hovered: false
HifiConstants { id: hifi } HifiConstants { id: hifi }
function pastTime(timestamp) { // Answer a descriptive string function pastTime(timestamp) { // Answer a descriptive string
@ -231,6 +233,13 @@ Item {
// to that which is being hovered over. // to that which is being hovered over.
property var hoverThunk: function () { }; property var hoverThunk: function () { };
property var unhoverThunk: function () { }; property var unhoverThunk: function () { };
Rectangle {
anchors.fill: parent;
visible: root.hovered
color: "transparent";
border.width: 4; border.color: hifiStyleConstants.colors.primaryHighlight;
z: 1;
}
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
acceptedButtons: Qt.LeftButton; acceptedButtons: Qt.LeftButton;

7
interface/resources/qml/hifi/Feed.qml
View file

@ -206,9 +206,9 @@ Column {
id: scroll; id: scroll;
model: suggestions; model: suggestions;
orientation: ListView.Horizontal; orientation: ListView.Horizontal;
highlightFollowsCurrentItem: false
highlightMoveDuration: -1; highlightMoveDuration: -1;
highlightMoveVelocity: -1; highlightMoveVelocity: -1;
highlight: Rectangle { color: "transparent"; border.width: 4; border.color: hifiStyleConstants.colors.primaryHighlight; z: 1; }
currentIndex: -1; currentIndex: -1;
spacing: 12; spacing: 12;
@ -237,9 +237,8 @@ Column {
textSizeSmall: root.textSizeSmall; textSizeSmall: root.textSizeSmall;
stackShadowNarrowing: root.stackShadowNarrowing; stackShadowNarrowing: root.stackShadowNarrowing;
shadowHeight: root.stackedCardShadowHeight; shadowHeight: root.stackedCardShadowHeight;
hoverThunk: function () { hovered = true }
hoverThunk: function () { scrollToIndex(index); } unhoverThunk: function () { hovered = false }
unhoverThunk: function () { scrollToIndex(-1); }
} }
} }
NumberAnimation { NumberAnimation {