From 2e48a997eb45b51f59ae5ec8a506492dedddc0f4 Mon Sep 17 00:00:00 2001 From: SeeLook <945374+SeeLook@users.noreply.github.com> Date: Sun, 6 Oct 2019 21:46:16 +0200 Subject: [PATCH] Change hover behavior of score control buttons similar to tool buttons and pane buttons (scale instead outline). Fix link to levels, updated changes. --- changes | 4 ++++ src/qml/level/LevelsPage.qml | 2 +- src/qml/score/ControlButton.qml | 11 ++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/changes b/changes index a33edc88a..3529d7259 100644 --- a/changes +++ b/changes @@ -1,3 +1,7 @@ +1.7.1 beta2 + - disabling level creator pages which are currently unused + - added help topic selector on 'help page' with all the context + 1.7.0 beta1 Nootka says: I speak Italian - added Italian translation diff --git a/src/qml/level/LevelsPage.qml b/src/qml/level/LevelsPage.qml index 6baa55eab..1a4de0a12 100644 --- a/src/qml/level/LevelsPage.qml +++ b/src/qml/level/LevelsPage.qml @@ -45,7 +45,7 @@ Column { } } LinkText { - text: qsTr("Get more levels <a href=\"%1\">from Nootka home page</a>").arg("https://nootka.sourceforge.io/index.php?C=down#levels") + text: qsTr("Get more levels <a href=\"%1\">from Nootka home page</a>").arg("https://nootka.sourceforge.io/index.php/download/#levels") anchors.horizontalCenter: parent.horizontalCenter } diff --git a/src/qml/score/ControlButton.qml b/src/qml/score/ControlButton.qml index 0acf28bfe..59f06a4a4 100644 --- a/src/qml/score/ControlButton.qml +++ b/src/qml/score/ControlButton.qml @@ -24,19 +24,24 @@ Rectangle { height: factor * 3 radius: factor / 5 + scale: ma.containsMouse ? (ma.pressed ? 0.8 : 1.5) : 1 + Behavior on scale { enabled: GLOB.useAnimations; NumberAnimation { duration: 150 }} + Behavior on color { enabled: GLOB.useAnimations; ColorAnimation { duration: 150 }} + Text { id: txt x: (factor * 2 - width) / 2 height: factor * 3 style: Text.Normal - styleColor: selected ? activPal.highlightedText : activPal.shadow color: cb.enabled ? activPal.text : disdPal.text } + MouseArea { + id: ma anchors.fill: parent hoverEnabled: true onClicked: cb.clicked() - onEntered: { txt.style = Text.Outline; cb.entered() } - onExited: { txt.style = Text.Normal; cb.exited() } + onEntered: cb.entered() + onExited: cb.exited() } } -- GitLab