hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Make scrollbars consistent over the software; Add padding to the scrollbars; Make the PianoView background themeable (#2807)

Browse Source 
* Make scrollbars consistent over the software; Add padding to the scrollbars; Make the PianoView background themeable

* Make the scrollbar hover color brighter
This commit is contained in:
Umcaruje
2016-06-03 12:21:27 +02:00
parent a738069ff5
commit 27eaa4d512
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/PianoView.cpp
View File

@@ -779,15 +779,11 @@ void PianoView::paintEvent( QPaintEvent * )
p.setFont( pointSize<LABEL_TEXT_SIZE>( p.font() ) );
// draw blue bar above the actual keyboard (there will be the labels
// draw bar above the keyboard (there will be the labels
// for all C's)
QLinearGradient g( 0, 0, 0, PIANO_BASE-3 );
g.setColorAt( 0, Qt::black );
g.setColorAt( 0.1, QColor( 96, 96, 96 ) );
g.setColorAt( 1, Qt::black );
p.fillRect( QRect( 0, 1, width(), PIANO_BASE-2 ), g );
p.fillRect( QRect( 0, 1, width(), PIANO_BASE-2 ), p.background() );
// draw stuff above the actual keyboard
// draw the line above the keyboard
p.setPen( Qt::black );
p.drawLine( 0, 0, width(), 0 );
p.drawLine( 0, PIANO_BASE-1, width(), PIANO_BASE-1 );
@@ -796,21 +792,18 @@ void PianoView::paintEvent( QPaintEvent * )
const int base_key = ( m_piano != NULL ) ?
m_piano->instrumentTrack()->baseNoteModel()->value() : 0;
g.setColorAt( 0, QApplication::palette().color( QPalette::Active,
QPalette::BrightText ).darker(220) );
g.setColorAt( 0.1, QApplication::palette().color( QPalette::Active,
QPalette::BrightText ) );
g.setColorAt( 1, QApplication::palette().color( QPalette::Active,
QPalette::BrightText ) );
QColor baseKeyColor = QApplication::palette().color( QPalette::Active,
QPalette::BrightText );
if( Piano::isWhiteKey( base_key ) )
{
p.fillRect( QRect( getKeyX( base_key ), 1, PW_WHITE_KEY_WIDTH-1,
PIANO_BASE-2 ), g );
PIANO_BASE-2 ), baseKeyColor );
}
else
{
p.fillRect( QRect( getKeyX( base_key ) + 1, 1,
PW_BLACK_KEY_WIDTH - 1, PIANO_BASE - 2 ), g );
PW_BLACK_KEY_WIDTH - 1, PIANO_BASE - 2 ), baseKeyColor);
}

2
src/gui/editors/PianoRoll.cpp
View File

@@ -83,7 +83,7 @@ typedef AutomationPattern::timeMap timeMap;
// some constants...
const int INITIAL_PIANOROLL_HEIGHT = 480;
const int SCROLLBAR_SIZE = 14;
const int SCROLLBAR_SIZE = 12;
const int PIANO_X = 0;
const int WHITE_KEY_WIDTH = 64;

2
src/tracks/InstrumentTrack.cpp
View File

@@ -93,7 +93,7 @@ const char * volume_help = QT_TRANSLATE_NOOP( "InstrumentTrack",
const int INSTRUMENT_WIDTH = 254;
const int INSTRUMENT_HEIGHT = INSTRUMENT_WIDTH;
const int PIANO_HEIGHT = 82;
const int PIANO_HEIGHT = 80;
const int INSTRUMENT_WINDOW_CACHE_SIZE = 8;