remove the overlapping viewports in cabbie so there is no bitmpa flickering when the WPS is redrawn... hopefully I havnt stuffed any of them up...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17865 a1c6a512-1295-4272-9138-f99709370657
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index ae99889..50ebd53 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -37,7 +37,7 @@
%s%ac%iy
#next and playlist
-%V|0|70|-|-|1|-|-|
+%V|0|70|-|18|1|-|-|
%s%acNext:%?It<%It|%Fn>
%al %pc%ac%pp of %pe%ar%pr
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 0a2f71a..e354ba8 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -35,5 +35,5 @@
%s%acNext Track:
%s%ac%?It<%It|%Fn>
-%V|0|82|-|-|1|-|-|
+%V|0|82|-|13|1|-|-|
%al %pc%ac%pp of %pe%ar%pr
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 18f4fa7..11e890b 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -20,7 +20,7 @@
%?C<%C%Vda|%Vdb>
# NowPlaying - AA
-%Vl|a|77|10|-|-|1|-|-|
+%Vl|a|77|10|-|75|1|-|-|
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
@@ -29,7 +29,7 @@
%s%?It<%It|%Fn>
# NowPlaying - no AA
-%Vl|b|0|10|-|-|1|-|-|
+%Vl|b|0|10|-|75|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -37,6 +37,6 @@
Next Track:
%s%?It<%It|%Fn>
-%V|0|96|-|-|1|-|-|
+%V|0|96|-|10|1|-|-|
%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 57177c2..eb2aca2 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -21,7 +21,7 @@
%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
%?C<%C%Vda|%Vdb>
-%Vl|a|70|10|-|-|1|-|-|
+%Vl|a|70|10|-|75|1|-|-|
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
@@ -29,7 +29,7 @@
%s%alNext Track:
%s%al%?It<%It|%Fn>
-%Vl|b|0|10|-|-|1|-|-|
+%Vl|b|0|10|-|75|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -37,6 +37,6 @@
%s%acNext Track:
%s%ac%?It<%It|%Fn>
-%V|0|96|-|-|1|-|-|
+%V|0|96|-|10|1|-|-|
%al %pc%ac%pp of %pe%ar%pr
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index ef01e0e..d12f1ac 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -21,7 +21,7 @@
%?C<%C%Vda|%Vdb>
#NowPlaying
-%Vl|a|81|12|-|-|1|-|-|
+%Vl|a|81|12|-|74|1|-|-|
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
@@ -29,7 +29,7 @@
%s%alNext Track:
%s%al%?It<%It|%Fn>
-%Vl|b|0|12|-|-|1|-|-|
+%Vl|b|0|12|-|74|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -37,5 +37,5 @@
%acNext Track:
%s%ac%?It<%It|%Fn>
-%V|0|96|-|-|1|-|-|
+%V|0|96|-|12|1|-|-|
%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index d2874bf..3784bcf 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -21,7 +21,7 @@
#NowPlaying
%?C<%Vda%C|%Vdb>
-%Vl|a|105|30|-|-|1|-|-|
+%Vl|a|105|30|-|90|1|-|-|
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
@@ -29,7 +29,7 @@
%s%alNext Track:
%s%al%?It<%It|%Fn>
-%Vl|b|0|30|-|-|1|-|-|
+%Vl|b|0|30|-|90|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -38,5 +38,5 @@
%s%ac%?It<%It|%Fn>
-%V|0|130|-|-|1|-|-|
+%V|0|130|-|20|1|-|-|
%al %pc%ac%pp of %pe%ar%pr
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index 0413961..d745021 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -21,7 +21,7 @@
%?C<%Vda%C|%Vdb>
#NowPlaying
-%Vl|a|153|30|-|-|1|-|-|
+%Vl|a|153|30|-|130|1|-|-|
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?d2<%d2|(root)>>
%s%al%?id<%id|%?d1<%d1|(root)>>
@@ -31,7 +31,7 @@
%s%al%?It<%It|%Fn>
%s%al%Ia
-%Vl|b|0|30|-|-|1|-|-|
+%Vl|b|0|30|-|130|1|-|-|
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?d2<%d2|(root)>>
%s%ac%?id<%id|%?d1<%d1|(root)>>
@@ -41,6 +41,6 @@
%s%ac%?It<%It|%Fn>
%s%ac%Ia
-%V|0|180|-|-|1|-|-|
+%V|0|180|-|20|1|-|-|
%al %pc%ac%pp of %pe%ar%pr