Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
compiz
compiz-kde4-decorator-rollback.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File compiz-kde4-decorator-rollback.diff of Package compiz
diff -ur a/configure.ac b/configure.ac --- a/configure.ac 2008-06-20 13:37:23.000000000 +0530 +++ b/configure.ac 2008-06-20 14:16:32.000000000 +0530 @@ -487,7 +487,7 @@ kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" + kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h" dnl Check for KWin headers AC_MSG_CHECKING([for KWin headers]) diff -ur a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp --- a/kde/window-decorator-kde4/decorator.cpp 2008-06-20 13:37:23.000000000 +0530 +++ b/kde/window-decorator-kde4/decorator.cpp 2008-06-20 14:10:58.000000000 +0530 @@ -23,7 +23,6 @@ #include <KDE/KCmdLineArgs> #include <KDE/KConfig> -#include <KDE/KConfigGroup> #include <KDE/KGlobal> #include <kwindowsystem.h> #include <KDE/KLocale> @@ -107,9 +106,6 @@ mActiveId = 0; - KConfigGroup cfg (KSharedConfig::openConfig("plasmarc"), QString("Theme")); - Plasma::Theme::defaultTheme ()->setThemeName (cfg.readEntry ("name")); - Atoms::init (); (void *) new KWinAdaptor (this); @@ -241,7 +237,7 @@ connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ())); - connect (Plasma::Theme::defaultTheme (), SIGNAL (themeChanged ()), + connect (Plasma::Theme::self (), SIGNAL (changed ()), SLOT (plasmaThemeChanged ())); // select for client messages diff -ur a/kde/window-decorator-kde4/switcher.cpp b/kde/window-decorator-kde4/switcher.cpp --- a/kde/window-decorator-kde4/switcher.cpp 2008-06-20 13:37:23.000000000 +0530 +++ b/kde/window-decorator-kde4/switcher.cpp 2008-06-20 14:10:58.000000000 +0530 @@ -30,7 +30,7 @@ #include <fixx11h.h> -#include <KDE/Plasma/PanelSvg> +#include <KDE/Plasma/Svg> #include <KDE/Plasma/Theme> #include <kwindowsystem.h> @@ -43,18 +43,15 @@ { QPalette palette; long prop[4]; - QColor color; - color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor); + QColor color = Plasma::Theme::self ()->textColor (); - mBackground = new Plasma::PanelSvg(); - mBackground->setImagePath ("dialogs/background"); - mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders); - - mBorder.left = mBackground->marginSize(Plasma::LeftMargin); - mBorder.right = mBackground->marginSize(Plasma::RightMargin); - mBorder.top = mBackground->marginSize(Plasma::TopMargin); - mBorder.bottom = mBackground->marginSize(Plasma::BottomMargin) + - Plasma::Theme::defaultTheme ()->fontMetrics ().height () + 10; + mBackground = new Plasma::Svg("widgets/background"); + + mBorder.left = mBackground->elementSize ("left").width (); + mBorder.right = mBackground->elementSize ("right").width (); + mBorder.top = mBackground->elementSize ("top").height (); + mBorder.bottom = mBackground->elementSize ("bottom").height () + + Plasma::Theme::self ()->fontMetrics ().height () + 10; mContext.extents.left = mBorder.left; mContext.extents.right = mBorder.right; @@ -117,6 +114,13 @@ updateWindowProperties (); } +/* + * This code is taken from KDE/kdebase/workspace/libs/plasma/dialog.cpp + * + * Copyright (C) 2007 by Alexis Ménard <darktears31@gmail.com> + * Copyright (C) 2007 Sebastian Kuegler <sebas@kde.org> + * Copyright (C) 2006 Aaron Seigo <aseigo@kde.org> + */ void KWD::Switcher::redrawPixmap () @@ -126,14 +130,95 @@ const int contentWidth = mPixmap.width (); const int contentHeight = mPixmap.height (); + const int topHeight = mBackground->elementSize ("top").height (); + const int topWidth = mBackground->elementSize ("top").width (); + const int leftWidth = mBackground->elementSize ("left").width (); + const int leftHeight = mBackground->elementSize ("left").height (); + const int rightHeight = mBackground->elementSize ("right").height (); + const int rightWidth = mBackground->elementSize ("right").width (); + const int bottomHeight = mBackground->elementSize ("bottom").height (); + const int bottomWidth = mBackground->elementSize ("bottom").width (); + + const int topOffset = 0; + const int leftOffset = 0; + const int rightOffset = contentWidth - rightWidth; + const int bottomOffset = contentHeight - bottomHeight; + const int contentTop = topHeight; + const int contentLeft = leftWidth; + + mPixmap.fill (Qt::transparent); p.setCompositionMode (QPainter::CompositionMode_Source); p.setRenderHint (QPainter::SmoothPixmapTransform); - mBackground->resizePanel (QSizeF (contentWidth, contentHeight)); - mBackground->paintPanel (&p, QRect (0, 0, contentWidth, - contentHeight)); + mBackground->resize (contentWidth, contentHeight); + + mBackground->paint (&p, QRect (contentLeft, contentTop, contentWidth, + contentHeight), "center"); + mBackground->resize (); + + mBackground->paint (&p, QRect (leftOffset, topOffset, + leftWidth, topHeight), "topleft"); + mBackground->paint (&p, QRect (rightOffset, topOffset, + rightWidth, topHeight), "topright"); + mBackground->paint (&p, QRect (leftOffset, bottomOffset, + leftWidth, bottomHeight), "bottomleft"); + mBackground->paint (&p, QRect (rightOffset, bottomOffset, + rightWidth, bottomHeight), "bottomright"); + + if (mBackground->elementExists ("hint-stretch-borders")) { + mBackground->paint (&p, QRect (leftOffset, contentTop, + leftWidth, contentHeight), "left"); + mBackground->paint (&p, QRect (rightOffset, contentTop, + rightWidth, contentHeight), "right"); + mBackground->paint (&p, QRect (contentLeft, topOffset, + contentWidth, topHeight), "top"); + mBackground->paint (&p, QRect (contentLeft, bottomOffset, + contentWidth, bottomHeight), "bottom"); + } else { + QPixmap left (leftWidth, leftHeight); + QPixmap right (rightWidth, rightHeight); + QPixmap top (topWidth, topHeight); + QPixmap bottom (bottomWidth, bottomHeight); + + left.fill (Qt::transparent); + { + QPainter sidePainter (&left); + sidePainter.setCompositionMode (QPainter::CompositionMode_Source); + mBackground->paint (&sidePainter, QPoint (0, 0), "left"); + } + p.drawTiledPixmap (QRect (leftOffset, contentTop, leftWidth, + contentHeight - topHeight - bottomHeight), left); + + right.fill (Qt::transparent); + { + QPainter sidePainter (&right); + sidePainter.setCompositionMode (QPainter::CompositionMode_Source); + mBackground->paint (&sidePainter, QPoint (0, 0), "right"); + } + p.drawTiledPixmap (QRect (rightOffset, contentTop, rightWidth, + contentHeight - topHeight - bottomHeight), right); + + top.fill (Qt::transparent); + { + QPainter sidePainter (&top); + sidePainter.setCompositionMode (QPainter::CompositionMode_Source); + mBackground->paint (&sidePainter, QPoint (0, 0), "top"); + } + p.drawTiledPixmap (QRect (contentLeft, topOffset, contentWidth - + rightWidth - leftWidth, topHeight), top); + + bottom.fill (Qt::transparent); + { + QPainter sidePainter (&bottom); + sidePainter.setCompositionMode (QPainter::CompositionMode_Source); + mBackground->paint (&sidePainter, QPoint (0, 0), "bottom"); + } + p.drawTiledPixmap (QRect (contentLeft, bottomOffset, contentWidth - + rightWidth - leftWidth, bottomHeight), bottom); + } + mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top, mGeometry.width (), @@ -147,9 +232,8 @@ void KWD::Switcher::update () { - QFontMetrics fm = Plasma::Theme::defaultTheme ()->fontMetrics (); - QFont font (Plasma::Theme::defaultTheme ()-> - font (Plasma::Theme::DefaultFont)); + QFontMetrics fm = Plasma::Theme::self ()->fontMetrics (); + QFont font (Plasma::Theme::self ()->font ()); QString name; QPainter p (&mPixmap); @@ -166,14 +250,14 @@ } p.setCompositionMode (QPainter::CompositionMode_Source); - - - mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top + + mBackground->resize (mPixmap.width (), mPixmap.height ()); + mBackground->paint (&p, QRect (mBorder.left, mBorder.top + mGeometry.height () + 5, mGeometry.width (), - fm.height ())); + fm.height ()), "center"); + mBackground->resize (); p.setFont (font); - p.setPen (Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor)); + p.setBrush (QBrush (Plasma::Theme::self()->backgroundColor())); p.drawText ((mPixmap.width () - fm.width (name)) / 2, mBorder.top + mGeometry.height () + 5 + fm.ascent (), name); diff -ur a/kde/window-decorator-kde4/switcher.h b/kde/window-decorator-kde4/switcher.h --- a/kde/window-decorator-kde4/switcher.h 2008-06-20 13:37:23.000000000 +0530 +++ b/kde/window-decorator-kde4/switcher.h 2008-06-20 14:10:58.000000000 +0530 @@ -30,7 +30,7 @@ namespace Plasma { -class PanelSvg; +class Svg; } class QSpacerItem; @@ -70,7 +70,7 @@ QRect mGeometry; - Plasma::PanelSvg *mBackground; + Plasma::Svg *mBackground; QPixmap mPixmap; QPixmap mBackgroundPixmap; diff -ur a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp --- a/kde/window-decorator-kde4/window.cpp 2008-06-20 13:37:23.000000000 +0530 +++ b/kde/window-decorator-kde4/window.cpp 2008-06-02 11:11:58.000000000 +0530 @@ -1147,7 +1147,7 @@ mUniqueVertShape = uniqueVertShape; if (mPixmap) - QTimer::singleShot (0, this, SLOT (updateShadow ())); + updateShadow (); } } @@ -1288,6 +1288,8 @@ xformat, 0, NULL); updateShadow (); + + mDecor->widget ()->update (); } bool diff -ur a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h --- a/kde/window-decorator-kde4/window.h 2008-06-20 13:37:23.000000000 +0530 +++ b/kde/window-decorator-kde4/window.h 2008-06-02 11:11:58.000000000 +0530 @@ -187,6 +187,7 @@ private: void createDecoration (void); + void updateShadow (void); bool resizeDecoration (bool force = false); void updateBlurProperty (int topOffset, int bottomOffset, @@ -202,7 +203,6 @@ private slots: - void updateShadow (void); void handlePopupActivated (QAction *action); void handleOpacityPopupActivated (QAction *action); void handleDesktopPopupActivated (QAction *action);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
