summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-11-27 17:54:34 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-11-27 17:54:34 +0800
commit632c21c4b05dd56aea5a515a95d5e9bb77666af2 (patch)
tree784804fb877e87045401ec9c4f14d1dc084af1bc
parent6f304e586c1a073456229d564efa48da89144f9a (diff)
parent246cfdb98b6724ff4d9791f853cb65a7777104c9 (diff)
downloadelements-632c21c4b05dd56aea5a515a95d5e9bb77666af2.tar.gz
elements-632c21c4b05dd56aea5a515a95d5e9bb77666af2.tar.bz2
Merge branch 'master' of git+ssh://git.opencompositing.org/git/compiz/plugins/elements
Conflicts: src/elements.cpp
-rwxr-xr-xelements.xml.in9
-rw-r--r--src/elements.cpp5
-rw-r--r--src/osd.cpp2
3 files changed, 10 insertions, 6 deletions
diff --git a/elements.xml.in b/elements.xml.in
index 66d4316..bf2fa66 100755
--- a/elements.xml.in
+++ b/elements.xml.in
@@ -3,18 +3,17 @@
<plugin name="elements" useBcop="true">
<_short>Elements</_short>
<_long>Draw elements on screen</_long>
- <category>Extras</category>
+ <category>Extras</category>
<deps>
<requirement>
- <plugin>composite</plugin>
<plugin>opengl</plugin>
</requirement>
<relation type="after">
<plugin>composite</plugin>
<plugin>opengl</plugin>
- <plugin>png</plugin>
- <plugin>svg</plugin>
- <plugin>jpeg</plugin>
+ <plugin>imgpng</plugin>
+ <plugin>imgsvg</plugin>
+ <plugin>imgjpeg</plugin>
<plugin>text</plugin>
<plugin>decor</plugin>
</relation>
diff --git a/src/elements.cpp b/src/elements.cpp
index 09efd07..1e60176 100644
--- a/src/elements.cpp
+++ b/src/elements.cpp
@@ -405,8 +405,13 @@ PrivateElementScreen::switchTimeout ()
{
if (!text->eTextures.empty ())
{
+<<<<<<< HEAD
text->nTexture =
++text->nTexture %
+=======
+ text->nTexture =
+ (text->nTexture + 1) %
+>>>>>>> 246cfdb98b6724ff4d9791f853cb65a7777104c9
(text->eTextures.size ());
}
}
diff --git a/src/osd.cpp b/src/osd.cpp
index f501a89..c247814 100644
--- a/src/osd.cpp
+++ b/src/osd.cpp
@@ -325,7 +325,7 @@ PrivateElementScreen::removeText ()
bool
ElementsTextSurface::switchTextures ()
{
- nTexture = ++nTexture % (eTextures.size ());
+ nTexture = (nTexture + 1) % (eTextures.size ());
ElementScreen::get (screen)->priv->cScreen->damageScreen ();
return true;