yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

This is a quick hack to get kwmthemes working in the upcoming alpha release.

Browse source 
- Temporarily disabled use of the stretchPixmap() function because it
  loses the pixmap mask, causing KWin to segfault.
  (This will just make some themes a bit slower)
- Fixed the border drawing problem reported by Vadim Plessky on kde-devel.
- Fixed a titlebar shade/un-shade flicker problem.
- Made the client compile when QT_NO_COMPAT is defined.

svn path=/trunk/kdebase/kwin/; revision=115973
This commit is contained in:
Fredrik Höglund 2001-09-30 20:29:21 +00:00
parent 0223deb116
commit b6df0940fa
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clients/kwmtheme/kwmthemeclient.cpp
View file

@ -94,12 +94,12 @@ static void create_pixmaps()
if(framePixmaps[i]->isNull()) if(framePixmaps[i]->isNull())
qWarning("Unable to load frame pixmap for %s", keys[i]); qWarning("Unable to load frame pixmap for %s", keys[i]);
} }
/*
*framePixmaps[FrameTop] = stretchPixmap(*framePixmaps[FrameTop], false); *framePixmaps[FrameTop] = stretchPixmap(*framePixmaps[FrameTop], false);
*framePixmaps[FrameBottom] = stretchPixmap(*framePixmaps[FrameBottom], false); *framePixmaps[FrameBottom] = stretchPixmap(*framePixmaps[FrameBottom], false);
*framePixmaps[FrameLeft] = stretchPixmap(*framePixmaps[FrameLeft], true); *framePixmaps[FrameLeft] = stretchPixmap(*framePixmaps[FrameLeft], true);
*framePixmaps[FrameRight] = stretchPixmap(*framePixmaps[FrameRight], true); *framePixmaps[FrameRight] = stretchPixmap(*framePixmaps[FrameRight], true);
*/
maxExtent = framePixmaps[FrameTop]->height(); maxExtent = framePixmaps[FrameTop]->height();
if(framePixmaps[FrameBottom]->height() > maxExtent) if(framePixmaps[FrameBottom]->height() > maxExtent)
maxExtent = framePixmaps[FrameBottom]->height(); maxExtent = framePixmaps[FrameBottom]->height();
@ -108,6 +108,8 @@ static void create_pixmaps()
if(framePixmaps[FrameRight]->width() > maxExtent) if(framePixmaps[FrameRight]->width() > maxExtent)
maxExtent = framePixmaps[FrameRight]->width(); maxExtent = framePixmaps[FrameRight]->width();
maxExtent++;
menuPix = new QPixmap(locate("appdata", menuPix = new QPixmap(locate("appdata",
"pics/"+config->readEntry("menu", " "))); "pics/"+config->readEntry("menu", " ")));
iconifyPix = new QPixmap(locate("appdata", iconifyPix = new QPixmap(locate("appdata",
@ -247,7 +249,7 @@ void MyButton::drawButtonLabel(QPainter *p)
KWMThemeClient::KWMThemeClient( Workspace *ws, WId w, QWidget *parent, KWMThemeClient::KWMThemeClient( Workspace *ws, WId w, QWidget *parent,
const char *name ) const char *name )
: Client( ws, w, parent, name, WResizeNoErase | WNorthWestGravity) : Client( ws, w, parent, name, WResizeNoErase | WStaticContents )
{ {
stickyBtn = maxBtn = mnuBtn = 0; stickyBtn = maxBtn = mnuBtn = 0;
connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); connect(options, SIGNAL(resetClients()), this, SLOT(slotReset()));
@ -732,7 +734,6 @@ void KWMThemeClient::mouseDoubleClickEvent( QMouseEvent * e )
{ {
if (titlebar->geometry().contains( e->pos() ) ) if (titlebar->geometry().contains( e->pos() ) )
setShade( !isShade() ); setShade( !isShade() );
workspace()->requestFocus( this );
} }
void KWMThemeClient::stickyChange(bool on) void KWMThemeClient::stickyChange(bool on)