fix #139486: grace notes and noteheads brackets are badly drawn in pa…

…lettes
musescore · Nov 2, 2016 · 87837d9 · 87837d9
1 parent 42b14fa
commit 87837d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/libmscore/icon.h b/libmscore/icon.h
@@ -42,6 +42,7 @@ class Icon : public Element {
       const QByteArray& action() const                    { return _action; }
       QIcon icon() const                                  { return _icon;   }
       void setExtent(int v)                               { _extent = v; }
+      int extent() const                                  { return _extent; }
       virtual void write(Xml&) const override;
       virtual void read(XmlReader&) override;
       virtual void draw(QPainter*) const override;

diff --git a/libmscore/joinMeasure.cpp b/libmscore/joinMeasure.cpp
@@ -25,7 +25,6 @@ namespace Ms {
 void Score::cmdJoinMeasure(Measure* m1, Measure* m2)
       {
       startCmd();
-      printf("==== cmdJoinMeasure\n");
 
       deselectAll();
 

diff --git a/libmscore/splitMeasure.cpp b/libmscore/splitMeasure.cpp
@@ -24,7 +24,6 @@ namespace Ms {
 
 void Score::cmdSplitMeasure(ChordRest* cr)
       {
-      printf("splitMeasure\n");
       startCmd();
       splitMeasure(cr->segment());
       endCmd();

diff --git a/mscore/palette.cpp b/mscore/palette.cpp
@@ -911,8 +911,10 @@ void Palette::paintEvent(QPaintEvent* /*event*/)
             int column = idx % columns();
 
             qreal cellMag = cc->mag * mag;
-            if (el->isIcon())
-                  toIcon(el)->setExtent(((hhgrid < vgrid ? hhgrid : vgrid) - 4) / cellMag);
+            if (el->isIcon()) {
+                  toIcon(el)->setExtent((hhgrid < vgrid ? hhgrid : vgrid) - 4);
+                  cellMag = 1.0;
+                  }
             el->layout();
 
             if (drawStaff) {