Fix DrawStaffLines() for neume lines

DDMAL · Apr 23, 2024 · 65b4ccb · 65b4ccb
1 parent 602c648
commit 65b4ccb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/src/staff.cpp b/src/staff.cpp
@@ -173,7 +173,7 @@ void Staff::AdjustDrawingStaffSize()
     if (this->HasFacs()) {
         Doc *doc = vrv_cast<Doc *>(this->GetFirstAncestor(DOC));
         assert(doc);
-        if (doc->IsFacs()) {
+        if (doc->IsFacs() || doc->IsNeumeLines()) {
             double rotate = this->GetDrawingRotate();
             Zone *zone = this->GetZone();
             assert(zone);

diff --git a/src/view_page.cpp b/src/view_page.cpp
@@ -1283,24 +1283,14 @@ void View::DrawStaffLines(DeviceContext *dc, Staff *staff, Measure *measure, Sys
 
     int j, x1, x2, y1, y2;
 
-    if (staff->HasFacs() && m_doc->IsFacs()) {
-        double d = staff->GetDrawingRotate();
-        x1 = staff->GetDrawingX();
-        x2 = x1 + staff->GetWidth();
-        y1 = ToLogicalY(staff->GetDrawingY());
-        staff->AdjustDrawingStaffSize();
-        y2 = y1 - staff->GetWidth() * tan(d * M_PI / 180.0);
+    x1 = measure->GetDrawingX();
+    x2 = x1 + measure->GetWidth();
+    y1 = staff->GetDrawingY();
+    if (!staff->HasDrawingRotation()) {
+        y2 = y1;
     }
     else {
-        x1 = measure->GetDrawingX();
-        x2 = x1 + measure->GetWidth();
-        y1 = staff->GetDrawingY();
-        if (!staff->HasDrawingRotation()) {
-            y2 = y1;
-        }
-        else {
-            y2 = y1 - measure->GetWidth() * tan(staff->GetDrawingRotation() * M_PI / 180.0);
-        }
+        y2 = y1 - measure->GetWidth() * tan(staff->GetDrawingRotation() * M_PI / 180.0);
     }
 
     const int lineWidth = m_doc->GetDrawingStaffLineWidth(staff->m_drawingStaffSize);