Commit graph

35 commits

Author SHA1 Message Date
Igor Korsukov
45b9887603 changed code style 2020-05-28 09:50:45 +02:00
Marc Sabatella
a780a36dea fix #301259
Resolves: https://musescore.org/en/node/301259

See also https://github.com/musescore/MuseScore/pull/5728/

The problem occurs in several different overrides to
getPropertyStyle() for various different text classes.
The function is supposed to determine
which Sid to use for Pid::OFFSET, based on placement above/below.
But that calculation should only be relevant
if the element is using the default text style for its type.
Otherwise it should use the offset in the current text style.

This code removes the overrides for getPropertyStyle() in each class,
instead modifying TextBase::getPropertyStyle() to check
if the element is using its default text style or not,
and then only if so does it use the placement to select a Sid.
Otherwise it uses the offset of the current text style.
2020-04-15 18:07:27 -06:00
Igor Korsukov
0aecb0a173 fixed virtual methods 2020-03-27 10:01:06 +02:00
ws
d77183b3bb refactoring of Element::userOff and TextBase::offset 2018-10-18 11:56:23 +02:00
ws
10ebbb9080 update text style implementation 2018-08-01 11:46:35 +02:00
ws
2934f93142 new style value frameType replacing hasFrame, circle, square 2018-07-26 13:14:06 +02:00
ws
6f6e86a03c fix #272366 There are no System Text properties 2018-05-28 14:20:53 +02:00
ws
b1a14fe7e0 small fix for editing linked staff text 2018-04-18 14:31:47 +02:00
ws
49068ccf6f more updates for properties/styles 2018-03-28 10:43:28 +02:00
ws
33d1cd7fb4 rename StyleIdx -> Sid and P_ID -> Pid 2018-03-27 15:36:00 +02:00
ws
6969419cfc update subStyle implementation 2018-03-21 14:05:43 +01:00
Werner Schweer
c68c9455d7 fix #268065: System text crashes the program when opening a file 2018-01-03 16:16:12 +01:00
Werner Schweer
e6175c5dda rearrange class hierarchy 2017-12-27 11:51:09 +01:00
Werner Schweer
0e4211e2d0 update let ring, palm mute 2017-11-27 16:55:52 +01:00
Werner Schweer
9ceac89c03 enhance 2.x compatibility 2017-05-23 16:52:04 +02:00
Werner Schweer
90b1991912 replace Q_OBJECT with Q_GADGET for all Element based classes 2017-02-17 15:48:28 +01:00
Werner Schweer
f8417ca046 add SystemText element 2017-01-20 11:05:52 +01:00
Werner Schweer
1d4c6b2f21 move Element::type() to ScoreElement 2017-01-18 14:16:33 +01:00
Werner Schweer
5433d719d9 replace TextStyle by SubStyle 2017-01-16 20:59:21 +01:00
Werner Schweer
c5f46bb208 rename Xml() -> XmlWriter() 2016-11-19 11:51:21 +01:00
werner
b55e65a591 impl. placement for stafftext 2016-08-25 17:34:25 +02:00
werner
09b03e1751 update mtest 2016-08-25 15:35:37 +02:00
werner
466cfd50c0 autoplace stafftext 2016-08-25 09:49:19 +02:00
shredpub
0c607df17f Replaced swingUnit by unit and swingRatio by ratio, also made _swing private 2014-08-14 16:51:32 +05:30
shredpub
b9379bda35 Implementation of text swing (step1)
added swing tab

swing settings tab in staff text properties

Implemented step 2 of swing implementation using staff texts

Added call for updateSwing in stafftextproperties

Initial page for dialog changed

System flag enabled for swing parameters

saving and loading with text specified swing implemented

removed extra print statement

fixed formatting

Added groupbox to make the default behavior to no change in swing

fixed indentation in stafftextproperties

fixing conflicts in staff.h

Removed writing of setSwing to file

Removed SwingParameter member from staff and fixed layout of swing tab in dialog

fixed the issue with disabled controls

Added tests for staff text implementation of swing playback

cleaned up the code

Swing playback using staff texts implemented, facilitating local control over swing parameters and tests for the same added

Cleaned up code

Cleaned up code further

Swing Playback using staff texts implemented

Cleaned up code further

Cleaning up code further

Using MScore::division in place of 480 as ticks

Modified test files according to new usage of MScore::division

Removed unwanted printf statements

Using strings to write to xml rather than doubles for swingUnit

Replaced 240 and 120 in terms of MScore::division in stafftext:write

Using TDuration to write to xml

Replaced string literals by TDuration for style parameters

Replaced "off" with "" in style.cpp

Set defaults for unit and ratio in constructors

Removed usage of two structs for SwingParameters

Changed order of assignments in setSwingParameters

Swing playback using staff-texts implemented and tests added
2014-08-14 16:51:31 +05:30
Marc Sabatella
4a372fd649 add support for selecting staff text by subtype (text style) 2014-08-05 19:34:37 -06:00
Joachim Schmitz
75623c53dc move ElementType to Element::Type
needed to make it available to the Plugin framework
2014-06-26 11:57:35 +02:00
Joachim Schmitz
931e837c5e convert enum ElementType into enum class 2014-05-23 10:35:27 +02:00
ws
9ebabcc2e5 add namespace Ms 2013-05-13 19:43:59 +02:00
ws
220db94494 reorganize synthesizer; add zita1 reverb 2013-04-03 12:50:21 +02:00
ws
bf1cbe2aa0 use QXmlStreamReader for xml parsing 2013-01-11 18:10:18 +01:00
Werner Schweer
3d91e61ef4 More plugin bindings 2012-07-25 11:49:34 +02:00
Werner Schweer
7de7873d6f - extend qml plugin interface
- add demo plugin "notenames.qml"
2012-05-30 20:54:26 +02:00
Werner Schweer
5182c9e085 derive Element from QObject; add Q_OBJECT into every Element class 2012-05-28 11:29:21 +02:00
Werner Schweer
1f9ccfcdce add libmscore
git-subtree-dir: libmscore
git-subtree-mainline: 412ca45401
git-subtree-split: 6047361bd0
2012-05-26 14:54:47 +02:00