diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-21 01:29:34 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-09-21 01:29:34 +0000 |
| commit | 279cf178836509085b8cfb1f576f350e9fd28dca (patch) | |
| tree | efd9f4890b70268245f310dee42753f7b8c3d95e /muse2/muse | |
| parent | ca0f44f30727fc0e335579835868bfd5f86bb306 (diff) | |
Made the default config file consistent with gconfig.cpp. Reverted the selected track coloring.
Diffstat (limited to 'muse2/muse')
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 11 | ||||
| -rw-r--r-- | muse2/muse/gconfig.cpp | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 3b219f71..c28a40b2 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -193,8 +193,10 @@ void TList::paint(const QRect& r) mask.setColorAt(0, mask_edge); mask.setColorAt(0.15, mask_center); mask.setColorAt(0.3, mask_center); + mask.setColorAt(0.85, mask_edge); mask.setColorAt(1, mask_edge); + TrackList* l = song->tracks(); int idx = 0; int yy = -ypos; @@ -212,7 +214,11 @@ void TList::paint(const QRect& r) // clear one row // QColor bg; - + if (track->selected()) { + bg = MusEConfig::config.selectTrackBg; + p.setPen(MusEConfig::config.selectTrackFg); + } + else { switch(type) { case Track::MIDI: bg = MusEConfig::config.midiTrackBg; @@ -240,7 +246,8 @@ void TList::paint(const QRect& r) break; } - p.setPen(palette().color(QPalette::Active, QPalette::Text)); + p.setPen(palette().color(QPalette::Active, QPalette::Text)); + } p.fillRect(x1, yy, w, trackHeight, bg); if (track->selected()) { diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp index 9492650b..0a521c3a 100644 --- a/muse2/muse/gconfig.cpp +++ b/muse2/muse/gconfig.cpp @@ -98,7 +98,7 @@ GlobalConfigValues config = { // at the price of only few more pixels than Normal mode. }, QColor(84, 97, 114), // trackBg; - QColor(120, 229, 166), // selected track Bg; + QColor(109, 174, 178), // selected track Bg; QColor(0x00, 0x00, 0x00), // selected track Fg; QColor(74, 150, 194), // midiTrackLabelBg; // Med blue |