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

draw text at correct position in win32-version

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1286 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-07-06 20:38:48 +00:00
parent 6839181d53
commit 3a9b02fbe4
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2008-07-06 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* src/gui/widgets/combobox.cpp:
draw text at correct position in win32-version
* src/core/drumsynth.cpp:
when building for win32 define powf() as pow() due to symbol-conflicts
in win32-libm
* data/themes/default/style.css:
fixed font-color for what's-this-popups so that they're readable
2008-07-05 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* plugins/stk/mallets/mallets.cpp:

9
src/gui/widgets/combobox.cpp
View File

@@ -201,7 +201,7 @@ void comboBox::paintEvent( QPaintEvent * _pe )
if( model()->size() > 0 )
{
p.setFont( font() );
p.setClipRect( QRect( 5, 2, width() - CB_ARROW_BTN_WIDTH - 8,
p.setClipRect( QRect( 4, 2, width() - CB_ARROW_BTN_WIDTH - 8,
height() - 2 ) );
QPixmap pm = model()->currentData() ?
model()->currentData()->pixmap() : QPixmap();
@@ -216,12 +216,11 @@ void comboBox::paintEvent( QPaintEvent * _pe )
p.drawPixmap( tx, 3, pm );
tx += pm.width() + 2;
}
const int y = ( height()+p.fontMetrics().height() ) /2;
p.setPen( QColor( 64, 64, 64 ) );
p.drawText( tx+1, p.fontMetrics().height()-2,
model()->currentText() );
p.drawText( tx+1, y-2, model()->currentText() );
p.setPen( QColor( 224, 224, 224 ) );
p.drawText( tx, p.fontMetrics().height()-3,
model()->currentText() );
p.drawText( tx, y-3, model()->currentText() );
}
}