Actualized style defaults

musescore · Jan 22, 2021 · 0f859e9 · 0f859e9
1 parent 9a10b06
commit 0f859e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -1033,7 +1033,7 @@ Score::FileError MasterScore::read1(XmlReader& e, bool ignoreVersionError)
                               return FileError::FILE_OLD_300_FORMAT;
                         }
 
-                  if (created() && preferences.getString(PREF_SCORE_STYLE_DEFAULTSTYLEFILE).isEmpty()) {
+                  if (created() && !preferences.getString(PREF_SCORE_STYLE_DEFAULTSTYLEFILE).isEmpty()) {
                         setStyle(MScore::defaultStyle());
                         }
                   else {

diff --git a/libmscore/style.cpp b/libmscore/style.cpp
@@ -988,8 +988,8 @@ static const StyleType styleTypes[] {
       { Sid::rehearsalMarkAlign,            "rehearsalMarkAlign",           QVariant::fromValue(Align::HCENTER | Align::BASELINE) },
       { Sid::rehearsalMarkFrameType,        "rehearsalMarkFrameType",       int(FrameType::SQUARE)  },
       { Sid::rehearsalMarkFramePadding,     "rehearsalMarkFramePadding",    0.5 },
-      { Sid::rehearsalMarkFrameWidth,       "rehearsalMarkFrameWidth",      0.2 },
-      { Sid::rehearsalMarkFrameRound,       "rehearsalMarkFrameRound",      20 },
+      { Sid::rehearsalMarkFrameWidth,       "rehearsalMarkFrameWidth",      0.16 },
+      { Sid::rehearsalMarkFrameRound,       "rehearsalMarkFrameRound",      0 },
       { Sid::rehearsalMarkFrameFgColor,     "rehearsalMarkFrameFgColor",    QColor(0, 0, 0, 255) },
       { Sid::rehearsalMarkFrameBgColor,     "rehearsalMarkFrameBgColor",    QColor(255, 255, 255, 0) },
       { Sid::rehearsalMarkPlacement,        "rehearsalMarkPlacement",       int(Placement::ABOVE) },

diff --git a/share/styles/Edwin.mss b/share/styles/Edwin.mss
@@ -62,6 +62,8 @@
     <staffFontFace>Edwin</staffFontFace>
     <rehearsalMarkFontFace>Edwin</rehearsalMarkFontFace>
     <rehearsalMarkFontSize>14</rehearsalMarkFontSize>
+    <rehearsalMarkFrameWidth>0.16</rehearsalMarkFrameWidth>
+    <rehearsalMarkFrameRound>0</rehearsalMarkFrameRound>
     <repeatLeftFontFace>Edwin</repeatLeftFontFace>
     <repeatLeftFontSize>18</repeatLeftFontSize>
     <repeatRightFontFace>Edwin</repeatRightFontFace>