vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make button symbols show up in the custom button 

position editor..

svn path=/trunk/KDE/kdebase/workspace/; revision=715934
icc-effect-5.14.5
Maks Orlovich 2007-09-23 14:18:35 +00:00
parent a0f8c2b681
commit cc57137f16
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kcmkwin/kwindecoration/buttons.cpp
View File

@ -600,8 +600,9 @@ void ButtonDropSite::drawButtonList(QPainter *p, const ButtonList& btns, int off
}
}
void ButtonDropSite::drawContents( QPainter* p )
void ButtonDropSite::paintEvent( QPaintEvent* pe )
{
QPainter p( this );
int leftoffset = calcButtonListWidth( buttonsLeft );
int rightoffset = calcButtonListWidth( buttonsRight );
int offset = 3;
@ -613,20 +614,20 @@ void ButtonDropSite::drawContents( QPainter* p )
r.setWidth( r.width() - 2 - leftoffset - rightoffset );
r.setHeight( r.height() - 2 );
drawButtonList( p, buttonsLeft, offset );
drawButtonList( &p, buttonsLeft, offset );
QColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour
p->fillRect( r, c1 );
p->setPen( Qt::white );
p->setFont( QFont( KGlobalSettings::generalFont().family(), 12, QFont::Bold) );
p->drawText( r, Qt::AlignLeft | Qt::AlignVCenter, i18n("KDE") );
p.fillRect( r, c1 );
p.setPen( Qt::white );
p.setFont( QFont( KGlobalSettings::generalFont().family(), 12, QFont::Bold) );
p.drawText( r, Qt::AlignLeft | Qt::AlignVCenter, i18n("KDE") );
offset = geometry().width() - 3 - rightoffset;
drawButtonList( p, buttonsRight, offset );
drawButtonList( &p, buttonsRight, offset );
if (m_oldDropVisualizer.isValid() )
{
p->fillRect(m_oldDropVisualizer, Qt::Dense4Pattern);
p.fillRect(m_oldDropVisualizer, Qt::Dense4Pattern);
}
}

2
kcmkwin/kwindecoration/buttons.h
View File

@ -177,7 +177,7 @@ class ButtonDropSite: public QFrame
void dropEvent( QDropEvent* e );
void mousePressEvent( QMouseEvent* e ); ///< Starts dragging a button...
void drawContents( QPainter* p );
void paintEvent( QPaintEvent* p );
ButtonDropSiteItem *buttonAt(QPoint p);
bool removeButton(ButtonDropSiteItem *item);
int calcButtonListWidth(const ButtonList& buttons); ///< Computes the total space the buttons will take in the titlebar