Hello community,
here is the log from the commit of package compiz
checked in at Tue Jul 1 21:53:56 CEST 2008.
--------
--- compiz/compiz.changes 2008-06-24 15:03:34.000000000 +0200
+++ compiz/compiz.changes 2008-07-01 21:51:12.352538000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 1 16:35:45 CEST 2008 - mhopf@suse.de
+
+- Cleanup of no longer used patches.
+- Add compile support for kde 4.1, courtesy of Dirk Mueller.
+
+-------------------------------------------------------------------
@@ -6,0 +13,29 @@
+Wed Jun 18 18:34:00 IST 2008 - cyberorg@opensuse.org
+
+- Add patch compiz-kde4-unlink-plasma.diff
+
+-------------------------------------------------------------------
+Wed Jun 18 18:34:00 IST 2008 - cyberorg@opensuse.org
+
+- kde4 paint fix patch
+
+-------------------------------------------------------------------
+Sat May 31 19:30:00 IST 2008 - cyberorg@opensuse.org
+
+- Rewrite of place plugin, which significantly improves multi-output
+ behaviour.
+- Configurable multi-output behaviour in place.
+- Removed plane plugin. Former plane plugin users are encouraged to use
+ the wall plugin of Compiz Fusion.
+- Removed cube wallpaper painting. Users are encouraged to use the Compiz
+ Fusion wallpaper plugin instead.
+- Place plugin viewport placement viewport numbers are now 1-based.
+- Panel and desktop selection mode in switcher plugin.
+- Improved painting behaviour when using overlapping outputs.
+- Gtk-window-decorator now emits accessibility events when switching.
+- Gtk-window-decorator behaviour when using Metacity themes has been
+ improved to match Metacity better.
+- KDE4-window-decorator has been adapted to current KDE4 API.
+- Various bugfixes.
+
+-------------------------------------------------------------------
@@ -10 +45 @@
- KDE3 one
+ KDE3 one
@@ -22,0 +58,5 @@
+Mon May 05 14:00:00 IST 2008 - cyberorg@opensuse.org
+
+- Fix compiz-decorator to start kde4-window-decorator properly
+
+-------------------------------------------------------------------
@@ -29,0 +70,5 @@
+Mon Apr 28 17:06:00 IST 2008 - cyberorg@opensuse.org
+
+- Fix *control-center* deps
+
+-------------------------------------------------------------------
Old:
----
compiz-0.7.4.tar.bz2
compiz-blur-buffer-overflow-fix.diff
compiz-fix-sm.diff
disable-plasma-dep.diff
New:
----
compiz-0.7.6.tar.bz2
compiz-kde4-decorator-rollback.diff
compiz-kde4-paint-fix.diff
kde41-update.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.l31526/_old 2008-07-01 21:51:31.000000000 +0200
+++ /var/tmp/diff_new_pack.l31526/_new 2008-07-01 21:51:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package compiz (Version 0.7.4)
+# spec file for package compiz (Version 0.7.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: compiz
-BuildRequires: Mesa-devel freeglut-devel gcc-c++ gconf2-devel gnome-control-center-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel
+BuildRequires: Mesa-devel freeglut-devel fuse-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel
%if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10"
BuildRequires: xorg-x11-compat70-devel
%endif
@@ -20,13 +20,10 @@
BuildRequires: metacity-devel
%endif
%if 0%{suse_version} > 01030
-BuildRequires: kde4-kwin kdebase4-workspace-devel libkde4-devel
+BuildRequires: gnome-control-center-devel kde4-kwin kdebase4-workspace-devel libkde4-devel
%endif
-%if %suse_version <= 1021
-BuildRequires: gconf2-rpm-macros
-%endif
-%if 0%{suse_version} >= 01020
-BuildRequires: fuse-devel
+%if 0%{suse_version} <= 01030
+BuildRequires: control-center2-devel
%endif
Url: http://www.compiz.org
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
@@ -34,8 +31,8 @@
PreReq: %fillup_prereq
Enhances: xgl >= git_070104
AutoReqProv: on
-Version: 0.7.4
-Release: 34
+Version: 0.7.6
+Release: 1
Requires: compiz-decorator = %{version}
Summary: OpenGL window and compositing manager.
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,17 +45,17 @@
Source4: compiz-decorator
Patch: compiz-java-config-notify.diff
Patch1: compiz-default-gconf-settings.diff
+#Patch3: compiz-libqtpath.diff
Patch4: compiz-ldpreload-indirect.diff
Patch5: compiz-no-focus-prevention-for-windows-without-decorations.diff
Patch6: compiz-scale-mode-toggle-1.diff
-Patch7: compiz-fix-sm.diff
Patch8: compiz-core-default-plugins.diff
-Patch10: compiz-blur-buffer-overflow-fix.diff
-#Patch9: compiz-prepend-core-to-gconf.diff
+Patch9: compiz-kde4-decorator-rollback.diff
+Patch10: compiz-kde4-paint-fix.diff
+Patch12: kde41-update.diff
Patch29: gnome-xgl-settings-remove-gconf.diff
Patch36: gnome-xgl-settings-hwinfo-primary-display-bno335445.patch
Patch60: Mesa-x86_64-fixes.diff
-Patch61: disable-plasma-dep.diff
%if "%(xft-config --prefix)" == "/usr"
%define xorg_prefix %_prefix
%else
@@ -89,8 +86,14 @@
License: GPL v2 or later; X11/MIT
Summary: OpenGL window and compositing manager configuration utilities
Group: System/GUI/GNOME
-Requires: gnome-desktop gnome-control-center xgl-hardware-list >= 060526 3ddiag freeglut pciutils %name = %version
+Requires: gnome-desktop xgl-hardware-list >= 060526 3ddiag freeglut pciutils %name = %version
Requires: metacity >= 2.15.1
+%if 0%{suse_version} > 01030
+Requires: gnome-control-center
+%endif
+%if 0%{suse_version} <= 01030
+Requires: control-center2
+%endif
Provides: compiz-decorator = %version
AutoReqProv: on
@@ -144,18 +147,12 @@
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
Summary: OpenGL window and compositing manager.
Group: System/GUI/Other
-Requires: Mesa-devel gnome-control-center-devel freeglut-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel metacity pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel %name = %version
-%if 0%{suse_version} < 01020
-Requires: xorg-x11-compat70-devel
-%endif
-%if 0%{suse_version} >= 01021
-Requires: metacity-devel
-%endif
-%if %suse_version <= 01021
-Requires: gconf2-rpm-macros
+Requires: freeglut-devel fuse-devel gcc-c++ gconf2-devel gtk2-devel intltool kdebase3-devel kdelibs3-devel librsvg-devel libwnck-devel Mesa-devel metacity-devel pango-devel perl-XML-Parser update-desktop-files xorg-x11-devel %name = %version
+%if 0%{suse_version} > 01030
+Requires: gnome-control-center-devel
%endif
-%if 0%{suse_version} >= 01020
-Requires: fuse-devel
+%if 0%{suse_version} <= 01030
+Requires: control-center2-devel
%endif
AutoReqProv: on
@@ -172,33 +169,20 @@
David Reveman
%prep
-#%%setup -q -c -n %name -T -a 0 -a 1 -a 2
-#%setup -q -c -n %name -T -a 0 -a 2
%setup -q -c -n %name -T -a 0
cd compiz-*
%patch
%patch1 -p1
+#%ifarch x86_64
+#%patch3
+#%endif
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-#%patch9 -p1
+%patch9 -p1
%patch10 -p1
-%patch61
+%patch12
cd -
-#cd gnome-xgl-*
-#%patch29 -p1
-#%patch36 -p1
-#sed -i -e "s@/opt/gnome/@%gnome_prefix/@g" ./xgl-settings/switch.c ./xgl-settings/gnome-xgl-switch
-cd -
-#cd Mesa-*
-#%patch60
-#sed -e 's@^OPT_FLAGS *= *-O -g@OPT_FLAGS = -O2@' \
-# -e 's@^SRC_DIRS *= *glx/x11 .*@SRC_DIRS = glx/x11@' \
-# -e 's@CONFIG_NAME *=.*@CONFIG_NAME = linux-indirect-static@' \
-# configs/linux-indirect-static
-#echo "MKLIB_OPTIONS = -static" >>configs/linux-indirect-static
-#cd -
%build
#
@@ -225,7 +209,7 @@
##### compiz
#
pushd compiz-*
-#sh autogen.sh
+#autoreconf -fi
%configure --sysconfdir=%gnome_etc \
--disable-schemas-install \
QTLIB=%{_prefix}/lib/qt3/%_lib \
@@ -236,13 +220,6 @@
:
fi
popd
-#
-##### gnome-xgl-settings
-#
-#pushd gnome-xgl-settings-*
-#./configure --prefix=%gnome_prefix
-#make %{?jobs:-j%jobs} CFLAGS="%optflags"
-#popd
%install
pushd compiz-*
@@ -299,7 +276,6 @@
%_libdir/compiz/libminimize.so
%_libdir/compiz/libmove.so
%_libdir/compiz/libplace.so
-%_libdir/compiz/libplane.so
%_libdir/compiz/libpng.so
%_libdir/compiz/libregex.so
%_libdir/compiz/libresize.so
@@ -362,8 +338,30 @@
%endif
%changelog
+* Tue Jul 01 2008 mhopf@suse.de
+- Cleanup of no longer used patches.
+- Add compile support for kde 4.1, courtesy of Dirk Mueller.
* Tue Jun 24 2008 dmueller@suse.de
- remove unnecessary linking of (disappeared) plasma lib (bnc#400088)
+* Wed Jun 18 2008 cyberorg@opensuse.org
+- Add patch compiz-kde4-unlink-plasma.diff
+- kde4 paint fix patch
+* Sat May 31 2008 cyberorg@opensuse.org
+- Rewrite of place plugin, which significantly improves multi-output
+ behaviour.
+- Configurable multi-output behaviour in place.
+- Removed plane plugin. Former plane plugin users are encouraged to use
+ the wall plugin of Compiz Fusion.
+- Removed cube wallpaper painting. Users are encouraged to use the Compiz
+ Fusion wallpaper plugin instead.
+- Place plugin viewport placement viewport numbers are now 1-based.
+- Panel and desktop selection mode in switcher plugin.
+- Improved painting behaviour when using overlapping outputs.
+- Gtk-window-decorator now emits accessibility events when switching.
+- Gtk-window-decorator behaviour when using Metacity themes has been
+ improved to match Metacity better.
+- KDE4-window-decorator has been adapted to current KDE4 API.
+- Various bugfixes.
* Mon May 26 2008 rodrigo@suse.de
- Changed compiz-decorator to try KDE4 window decorator before
KDE3 one
@@ -371,10 +369,14 @@
- Added compiz-fix-sm.diff from llunak@novell.com
* Mon May 12 2008 schwab@suse.de
- Work around broken Qt configuration.
+* Mon May 05 2008 cyberorg@opensuse.org
+- Fix compiz-decorator to start kde4-window-decorator properly
* Wed Apr 30 2008 rodrigo@suse.de
- Added compiz-blur-buffer-overflow-fix.diff to increase first pass
shader buffer, to fix buffer overflows with gaussian shader from
cyberorg@opensuse.org in the X11:XGL build service repository
+* Mon Apr 28 2008 cyberorg@opensuse.org
+- Fix *control-center* deps
* Tue Apr 22 2008 rodrigo@suse.de
- Disable gnome-xgl-settings, its functionality is now provided
in simple-ccsm.
++++++ compiz-0.7.4.tar.bz2 -> compiz-0.7.6.tar.bz2 ++++++
++++ 43059 lines of diff (skipped)
++++++ compiz-default-gconf-settings.diff ++++++
--- /var/tmp/diff_new_pack.l31526/_old 2008-07-01 21:51:34.000000000 +0200
+++ /var/tmp/diff_new_pack.l31526/_new 2008-07-01 21:51:34.000000000 +0200
@@ -50,7 +50,7 @@
<option name="command" type="string">
<_short>Command
<_long>Decorator command line that is executed if no decorator is already running
-+ <default>compiz-decorator</default>
++ <default>compiz-decorator --replace</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap
++++++ compiz-kde4-decorator-rollback.diff ++++++
diff -ur a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp
--- a/kde/window-decorator-kde4/decorator.cpp 2008-05-29 17:28:33.000000000 +0530
+++ b/kde/window-decorator-kde4/decorator.cpp 2008-06-01 23:59:06.000000000 +0530
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
#include
#include
@@ -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
Only in b/kde/window-decorator-kde4: decorator.cpp~
diff -ur a/kde/window-decorator-kde4/switcher.cpp b/kde/window-decorator-kde4/switcher.cpp
--- a/kde/window-decorator-kde4/switcher.cpp 2008-05-29 17:28:33.000000000 +0530
+++ b/kde/window-decorator-kde4/switcher.cpp 2008-06-02 00:07:44.000000000 +0530
@@ -30,7 +30,7 @@
#include
-#include
+#include
#include
#include
@@ -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
+ * Copyright (C) 2007 Sebastian Kuegler
+ * Copyright (C) 2006 Aaron Seigo
+ */
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,13 +250,14 @@
}
p.setCompositionMode (QPainter::CompositionMode_Source);
-
+ mBackground->resize (mPixmap.width (), mPixmap.height ());
mBackground->paint (&p, QRect (mBorder.left, mBorder.top +
mGeometry.height () + 5, mGeometry.width (),
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);
Only in b/kde/window-decorator-kde4: switcher.cpp~
diff -ur a/kde/window-decorator-kde4/switcher.h b/kde/window-decorator-kde4/switcher.h
--- a/kde/window-decorator-kde4/switcher.h 2008-05-29 17:28:33.000000000 +0530
+++ b/kde/window-decorator-kde4/switcher.h 2008-06-02 00:08:42.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;
Only in b/kde/window-decorator-kde4: switcher.h~
++++++ compiz-kde4-paint-fix.diff ++++++
From: Dennis Kasprzyk
Date: Wed, 18 Jun 2008 12:58:30 +0000 (+0200)
Subject: Use a single shot timer to prevent recursive repaint calls, if a decoration sets...
X-Git-Url: http://gitweb.compiz-fusion.org/?p=compiz;a=commitdiff_plain;h=819acbd18169d...
Use a single shot timer to prevent recursive repaint calls, if a decoration sets its mask during repaint.
---
diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
index b13dc23..c24c3c1 100644
--- a/kde/window-decorator-kde4/window.cpp
+++ b/kde/window-decorator-kde4/window.cpp
@@ -1147,7 +1147,7 @@ KWD::Window::setMask (const QRegion ®, int)
mUniqueVertShape = uniqueVertShape;
if (mPixmap)
- updateShadow ();
+ QTimer::singleShot (0, this, SLOT (updateShadow ()));
}
}
@@ -1288,8 +1288,6 @@ KWD::Window::rebindPixmap (void)
xformat, 0, NULL);
updateShadow ();
-
- mDecor->widget ()->update ();
}
bool
diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
index 0441fbb..5a77a27 100644
--- a/kde/window-decorator-kde4/window.h
+++ b/kde/window-decorator-kde4/window.h
@@ -187,7 +187,6 @@ class Window:public QWidget, public KDecorationBridge {
private:
void createDecoration (void);
- void updateShadow (void);
bool resizeDecoration (bool force = false);
void updateBlurProperty (int topOffset,
int bottomOffset,
@@ -203,6 +202,7 @@ class Window:public QWidget, public KDecorationBridge {
private slots:
+ void updateShadow (void);
void handlePopupActivated (QAction *action);
void handleOpacityPopupActivated (QAction *action);
void handleDesktopPopupActivated (QAction *action);
++++++ kde41-update.diff ++++++
--- kde/window-decorator-kde4/decorator.cpp
+++ kde/window-decorator-kde4/decorator.cpp
@@ -237,8 +237,7 @@ KWD::Decorator::enableDecorations (Time timestamp,
connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ()));
- connect (Plasma::Theme::self (), SIGNAL (changed ()),
- SLOT (plasmaThemeChanged ()));
+ connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), SLOT(plasmaThemeChanged()));
// select for client messages
XSelectInput (QX11Info::display(), QX11Info::appRootWindow(),
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -43,7 +43,7 @@ mId (id)
{
QPalette palette;
long prop[4];
- QColor color = Plasma::Theme::self ()->textColor ();
+ QColor color = Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor);
mBackground = new Plasma::Svg("widgets/background");
@@ -51,7 +51,7 @@ mId (id)
mBorder.right = mBackground->elementSize ("right").width ();
mBorder.top = mBackground->elementSize ("top").height ();
mBorder.bottom = mBackground->elementSize ("bottom").height () +
- Plasma::Theme::self ()->fontMetrics ().height () + 10;
+ Plasma::Theme::defaultTheme ()->fontMetrics ().height () + 10;
mContext.extents.left = mBorder.left;
mContext.extents.right = mBorder.right;
@@ -232,8 +232,8 @@ KWD::Switcher::redrawPixmap ()
void
KWD::Switcher::update ()
{
- QFontMetrics fm = Plasma::Theme::self ()->fontMetrics ();
- QFont font (Plasma::Theme::self ()->font ());
+ QFontMetrics fm = Plasma::Theme::defaultTheme ()->fontMetrics ();
+ QFont font (Plasma::Theme::defaultTheme ()->font (Plasma::Theme::DefaultFont));
QString name;
QPainter p (&mPixmap);
@@ -257,7 +257,7 @@ KWD::Switcher::update ()
mBackground->resize ();
p.setFont (font);
- p.setBrush (QBrush (Plasma::Theme::self()->backgroundColor()));
+ p.setBrush (QBrush (Plasma::Theme::defaultTheme()->color(Plasma::Theme::BackgroundColor)));
p.drawText ((mPixmap.width () - fm.width (name)) / 2,
mBorder.top + mGeometry.height () + 5 + fm.ascent (), name);
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -167,7 +167,7 @@ KWD::Switcher::redrawPixmap ()
mBackground->paint (&p, QRect (rightOffset, bottomOffset,
rightWidth, bottomHeight), "bottomright");
- if (mBackground->elementExists ("hint-stretch-borders")) {
+ if (mBackground->hasElement ("hint-stretch-borders")) {
mBackground->paint (&p, QRect (leftOffset, contentTop,
leftWidth, contentHeight), "left");
mBackground->paint (&p, QRect (rightOffset, contentTop,
--- kde/window-decorator-kde4/switcher.cpp
+++ kde/window-decorator-kde4/switcher.cpp
@@ -45,7 +45,8 @@ mId (id)
long prop[4];
QColor color = Plasma::Theme::defaultTheme ()->color(Plasma::Theme::TextColor);
- mBackground = new Plasma::Svg("widgets/background");
+ mBackground = new Plasma::Svg();
+ mBackground->setImagePath("widgets/background");
mBorder.left = mBackground->elementSize ("left").width ();
mBorder.right = mBackground->elementSize ("right").width ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org