From aba2f6bcee33a9f8f0340150b176f4e5d9e29988 Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Wed, 25 Apr 2018 11:08:42 +0200
Subject: [PATCH] Minor, scale tuning, code cleaning
---
changes | 1 +
src/qml/MainWindow.qml | 1 -
src/qml/shared/TpopupDialog.qml | 4 ++--
src/qml/sound/TempoMenu.qml | 4 ++++
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/changes b/changes
index 12dbb33d3..aa5867727 100644
--- a/changes
+++ b/changes
@@ -1,6 +1,7 @@
1.5.2 alpha3
- extended grand staff, beaming notes on every staff separately
- score supports bowing symbols, read them from XML
+ - all playing routines moved to separate thread
- improved level creator
1.5.1 alpha2
diff --git a/src/qml/MainWindow.qml b/src/qml/MainWindow.qml
index c26c13349..01d058dfc 100644
--- a/src/qml/MainWindow.qml
+++ b/src/qml/MainWindow.qml
@@ -4,7 +4,6 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
-import QtQuick.Window 2.2
import Nootka 1.0
diff --git a/src/qml/shared/TpopupDialog.qml b/src/qml/shared/TpopupDialog.qml
index 2e6e2b038..33ffe405b 100644
--- a/src/qml/shared/TpopupDialog.qml
+++ b/src/qml/shared/TpopupDialog.qml
@@ -16,9 +16,9 @@ Dialog {
width: parent.width * 0.8; height: parent.height * 0.8
x: (parent.width - width) / 2; y: (parent.height - height) / 2
background: TipRect { id: rect; color: activPal.window; shadowRadius: Noo.fontSize(); shadowColor: activPal.shadow }
- scale: GLOB.useAnimations ? 0.1 : 1.0
+ scale: GLOB.useAnimations ? 0 : 1.0
enter: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 1.0 }}
- exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0.1 }}
+ exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0 }}
// TdialogObject { id: dialogObj }
diff --git a/src/qml/sound/TempoMenu.qml b/src/qml/sound/TempoMenu.qml
index 716d1b2ff..bdf2b0a27 100644
--- a/src/qml/sound/TempoMenu.qml
+++ b/src/qml/sound/TempoMenu.qml
@@ -16,6 +16,10 @@ Popup {
background: TipRect { color: activPal.window; shadowRadius: Noo.fontSize() }
+ scale: GLOB.useAnimations ? 0 : 1.0
+ enter: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 1.0 }}
+ exit: Transition { enabled: GLOB.useAnimations; NumberAnimation { property: "scale"; to: 0.0 }}
+
signal accepted()
Column {
--
GitLab