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

fix #277767: Colors of feedback buttons are not inverted in dark theme

Browse source 
the timewise icon also didn't get inverted in the dark theme, so fix
that in the due course
This commit is contained in:
Joachim Schmitz 2018-11-03 13:01:44 +01:00
parent 4a97692174
commit 2029ae55a0
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mscore/data/icons/note_timewise.svg
View file

@ -1 +1 @@
<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 94 94" width="94" height="94"><defs><clipPath id="_clipPath_9JbtuVy4F6hNHJ0cXypNjAsezHGDpwlU"><rect width="94" height="94"/></clipPath></defs><g clip-path="url(#_clipPath_9JbtuVy4F6hNHJ0cXypNjAsezHGDpwlU)"><g><path d=" M 61.992 0 L 53.971 0 L 53.971 65.358 C 49.536 63.652 43.797 63.628 38.136 65.686 C 27.994 69.377 21.951 78.355 24.638 85.736 C 27.326 93.119 37.726 96.11 47.867 92.419 C 56.481 89.285 62.116 82.337 61.978 75.793 L 61.992 22.342 C 75.978 24.546 76.935 42.226 75.26 47.184 C 74.624 49.063 75.744 50.47 77.858 47.184 C 92.938 23.726 61.992 13.376 61.992 0 Z " fill="rgb(0,0,0)"/></g><g><rect x="24" y="21.011" width="21" height="5" transform="matrix(-0.004,-1,1,-0.004,11.137,58.11)" fill="rgb(0,0,0)"/><rect x="24" y="21.011" width="21" height="5" transform="matrix(1,0,0,1,0,0)" fill="rgb(0,0,0)"/><rect x="24" y="38" width="21" height="5" transform="matrix(1,0,0,1,0,0)" fill="rgb(0,0,0)"/></g></g></svg>
<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 94 94" width="94" height="94"><defs><clipPath id="_clipPath_9JbtuVy4F6hNHJ0cXypNjAsezHGDpwlU"><rect width="94" height="94"/></clipPath></defs><g clip-path="url(#_clipPath_9JbtuVy4F6hNHJ0cXypNjAsezHGDpwlU)"><g><path d=" M 61.992 0 L 53.971 0 L 53.971 65.358 C 49.536 63.652 43.797 63.628 38.136 65.686 C 27.994 69.377 21.951 78.355 24.638 85.736 C 27.326 93.119 37.726 96.11 47.867 92.419 C 56.481 89.285 62.116 82.337 61.978 75.793 L 61.992 22.342 C 75.978 24.546 76.935 42.226 75.26 47.184 C 74.624 49.063 75.744 50.47 77.858 47.184 C 92.938 23.726 61.992 13.376 61.992 0 Z " fill="rgb(59,63,69)"/></g><g><rect x="24" y="21.011" width="21" height="5" transform="matrix(-0.004,-1,1,-0.004,11.137,58.11)" fill="rgb(59,63,69)"/><rect x="24" y="21.011" width="21" height="5" transform="matrix(1,0,0,1,0,0)" fill="rgb(59,63,69)"/><rect x="24" y="38" width="21" height="5" transform="matrix(1,0,0,1,0,0)" fill="rgb(59,63,69)"/></g></g></svg>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

14
mscore/miconengine.cpp
View file

@ -123,27 +123,27 @@ void MIconEnginePrivate::loadDataForModeAndState(QSvgRenderer* renderer, QIcon::
if (mode == QIcon::Disabled) {
if (Ms::preferences.isThemeDark()) {
if (state == QIcon::On)
ba.replace("#3b3f45", "#4171a2").replace("#3B3F45", "#4171a2");
ba.replace("#3b3f45", "#4171a2").replace("#3B3F45", "#4171a2").replace("rgb(59,63,69)", "#4171a2");
else
ba.replace("#3b3f45", "#a0a0a0").replace("#3B3F45", "#a0a0a0");
ba.replace("#3b3f45", "#a0a0a0").replace("#3B3F45", "#a0a0a0").replace("rgb(59,63,69)", "#a0a0a0");
}
else {
if (state == QIcon::On)
ba.replace("#3b3f45", "#8daac7").replace("#3B3F45", "#8daac7");
ba.replace("#3b3f45", "#8daac7").replace("#3B3F45", "#8daac7").replace("rgb(59,63,69)", "#8daac7");
else
ba.replace("#3b3f45", "#a0a0a0").replace("#3B3F45", "#a0a0a0");
ba.replace("#3b3f45", "#a0a0a0").replace("#3B3F45", "#a0a0a0").replace("rgb(59,63,69)", "#a0a0a0");
}
}
else {
if (Ms::preferences.isThemeDark()) {
if (state == QIcon::On)
ba.replace("#3b3f45", "#78afe6").replace("#3B3F45", "#78afe6");
ba.replace("#3b3f45", "#78afe6").replace("#3B3F45", "#78afe6").replace("rgb(59,63,69)", "#78afe6");
else
ba.replace("#3b3f45", "#eff0f1").replace("#3B3F45", "#eff0f1");
ba.replace("#3b3f45", "#eff0f1").replace("#3B3F45", "#eff0f1").replace("rgb(59,63,69)", "#eff0f1");
}
else {
if (state == QIcon::On)
ba.replace("#3b3f45", "#4171a2").replace("#3B3F45", "#4171a2");
ba.replace("#3b3f45", "#4171a2").replace("#3B3F45", "#4171a2").replace("rgb(59,63,69)", "#4171a2");
}
}
renderer->load(ba);