LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #25650

Browse source
This commit is contained in:
ws 2014-05-06 18:56:27 +02:00
parent 7bc254f86e
commit c20b96e370
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libmscore/line.h
View file

@ -111,7 +111,7 @@ class SLine : public Spanner {
void setDiagonal(bool v) { _diagonal = v; } void setDiagonal(bool v) { _diagonal = v; }
Spatium lineWidth() const { return _lineWidth; } Spatium lineWidth() const { return _lineWidth; }
QColor lineColor() const { return (_lineColor == Qt::black)? curColor() : _lineColor; } QColor lineColor() const { return _lineColor; }
Qt::PenStyle lineStyle() const { return _lineStyle; } Qt::PenStyle lineStyle() const { return _lineStyle; }
void setLineWidth(const Spatium& v) { _lineWidth = v; } void setLineWidth(const Spatium& v) { _lineWidth = v; }
void setLineColor(const QColor& v) { _lineColor = v; } void setLineColor(const QColor& v) { _lineColor = v; }

10
libmscore/text.cpp
View file

@ -852,11 +852,13 @@ void Text::draw(QPainter* p) const
} }
} }
p->setBrush(Qt::NoBrush); p->setBrush(Qt::NoBrush);
QColor color(textStyle().foregroundColor()); QColor color;
if (!visible()) if (selected())
color = Qt::gray;
else if (selected())
color = MScore::selectColor[0]; color = MScore::selectColor[0];
else if (!visible())
color = Qt::gray;
else
color = textStyle().foregroundColor();
p->setPen(color); p->setPen(color);
if (_editMode && _cursor.hasSelection()) { if (_editMode && _cursor.hasSelection()) {
int r1 = _cursor.selectLine(); int r1 = _cursor.selectLine();

7
libmscore/textline.cpp
View file

@ -80,10 +80,10 @@ void TextLineSegment::draw(QPainter* painter) const
bool normalColor = false; bool normalColor = false;
if (selected() && !(score() && score()->printing())) if (selected() && !(score() && score()->printing()))
color = MScore::selectColor[0]; color = MScore::selectColor[0];
else if (!visible()) else if (!tl->visible())
color = Qt::gray; color = Qt::gray;
else { else {
color = textLine()->curColor(); color = tl->curColor();
normalColor = true; normalColor = true;
} }
qreal l = 0.0; qreal l = 0.0;
@ -97,7 +97,7 @@ void TextLineSegment::draw(QPainter* painter) const
l = _text->pos().x() + bb.width() + textlineTextDistance; l = _text->pos().x() + bb.width() + textlineTextDistance;
} }
painter->translate(_text->pos()); painter->translate(_text->pos());
painter->setPen(normalColor ? _text->curColor() : color); _text->setVisible(tl->visible());
_text->draw(painter); _text->draw(painter);
painter->translate(-_text->pos()); painter->translate(-_text->pos());
} }
@ -625,6 +625,7 @@ void TextLine::writeProperties(Xml& xml) const
//--------------------------------------------------------- //---------------------------------------------------------
// resolveSymCompatibility // resolveSymCompatibility
//--------------------------------------------------------- //---------------------------------------------------------
static QString resolveSymCompatibility(SymId i, QString programVersion) static QString resolveSymCompatibility(SymId i, QString programVersion)
{ {
if (!programVersion.isEmpty() && programVersion < "1.1") if (!programVersion.isEmpty() && programVersion < "1.1")