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
author: Jonathan Gordon <rockbox@jdgordon.info> 2008-06-29 05:54:02 +0000
committer: Jonathan Gordon <rockbox@jdgordon.info> 2008-06-29 05:54:02 +0000
commit: 322bfd2f0a6c17e5795045ef9e61f14ffca81446 (patch)
tree: f110f57df3251bdc20bf48defd8872a460443825
parent: 47b67ba6f60b0f4b04f2583f35a553619bcf3ca1 (diff)
download: rockbox-322bfd2f0a6c17e5795045ef9e61f14ffca81446.tar.gz
rockbox-322bfd2f0a6c17e5795045ef9e61f14ffca81446.zip
7 files changed, 17 insertions, 17 deletions
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index ae99889032..50ebd53b11 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 0a2f71abd9..e354ba8e4b 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 18f4fa71b0..11e890b8ec 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 @@ Next Track:
 %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:
 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 57177c207b..eb2aca2b56 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 ef01e0e420..d12f1ac410 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 d2874bf167..3784bcf200 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 041396181c..d745021e73 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
author	Jonathan Gordon <rockbox@jdgordon.info>	2008-06-29 05:54:02 +0000
committer	Jonathan Gordon <rockbox@jdgordon.info>	2008-06-29 05:54:02 +0000
commit	322bfd2f0a6c17e5795045ef9e61f14ffca81446 (patch)
tree	f110f57df3251bdc20bf48defd8872a460443825
parent	47b67ba6f60b0f4b04f2583f35a553619bcf3ca1 (diff)
download	rockbox-322bfd2f0a6c17e5795045ef9e61f14ffca81446.tar.gz rockbox-322bfd2f0a6c17e5795045ef9e61f14ffca81446.zip

diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps index ae99889032..50ebd53b11 100644 --- a/wps/cabbiev2.128x128x16.wps +++ b/wps/cabbiev2.128x128x16.wps
@@ -37,7 +37,7 @@
37	%s%ac%iy	37	%s%ac%iy
38		38
39	#next and playlist	39	#next and playlist
40	%V\|0\|70\|-\|-\|1\|-\|-\|	40	%V\|0\|70\|-\|18\|1\|-\|-\|
41	%s%acNext:%?It<%It\|%Fn>	41	%s%acNext:%?It<%It\|%Fn>
42		42
43	%al %pc%ac%pp of %pe%ar%pr	43	%al %pc%ac%pp of %pe%ar%pr


diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps index 0a2f71abd9..e354ba8e4b 100644 --- a/wps/cabbiev2.138x110x2.wps +++ b/wps/cabbiev2.138x110x2.wps
@@ -35,5 +35,5 @@
35	%s%acNext Track:	35	%s%acNext Track:
36	%s%ac%?It<%It\|%Fn>	36	%s%ac%?It<%It\|%Fn>
37		37
38	%V\|0\|82\|-\|-\|1\|-\|-\|	38	%V\|0\|82\|-\|13\|1\|-\|-\|
39	%al %pc%ac%pp of %pe%ar%pr	39	%al %pc%ac%pp of %pe%ar%pr


diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps index 18f4fa71b0..11e890b8ec 100644 --- a/wps/cabbiev2.160x128x16.wps +++ b/wps/cabbiev2.160x128x16.wps
@@ -20,7 +20,7 @@
20	%?C<%C%Vda\|%Vdb>	20	%?C<%C%Vda\|%Vdb>
21		21
22	# NowPlaying - AA	22	# NowPlaying - AA
23	%Vl\|a\|77\|10\|-\|-\|1\|-\|-\|	23	%Vl\|a\|77\|10\|-\|75\|1\|-\|-\|
24	%s%al%?it<%it\|%fn>	24	%s%al%?it<%it\|%fn>
25	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>	25	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>
26	%s%al%?id<%id\|%?d1<%d1\|(root)>>	26	%s%al%?id<%id\|%?d1<%d1\|(root)>>
@@ -29,7 +29,7 @@ Next Track:
29	%s%?It<%It\|%Fn>	29	%s%?It<%It\|%Fn>
30		30
31	# NowPlaying - no AA	31	# NowPlaying - no AA
32	%Vl\|b\|0\|10\|-\|-\|1\|-\|-\|	32	%Vl\|b\|0\|10\|-\|75\|1\|-\|-\|
33	%s%ac%?it<%it\|%fn>	33	%s%ac%?it<%it\|%fn>
34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>	34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>
35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>	35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>
@@ -37,6 +37,6 @@ Next Track:
37	Next Track:	37	Next Track:
38	%s%?It<%It\|%Fn>	38	%s%?It<%It\|%Fn>
39		39
40	%V\|0\|96\|-\|-\|1\|-\|-\|	40	%V\|0\|96\|-\|10\|1\|-\|-\|
41	%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr	41	%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr
42		42


diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps index 57177c207b..eb2aca2b56 100644 --- a/wps/cabbiev2.160x128x2.wps +++ b/wps/cabbiev2.160x128x2.wps
@@ -21,7 +21,7 @@
21	%?mp<%xdFa\|%xdFb\|%xdFc\|%xdFd\|%xdFe>	21	%?mp<%xdFa\|%xdFb\|%xdFc\|%xdFd\|%xdFe>
22	%?C<%C%Vda\|%Vdb>	22	%?C<%C%Vda\|%Vdb>
23		23
24	%Vl\|a\|70\|10\|-\|-\|1\|-\|-\|	24	%Vl\|a\|70\|10\|-\|75\|1\|-\|-\|
25	%s%al%?it<%it\|%fn>	25	%s%al%?it<%it\|%fn>
26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>	26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>
27	%s%al%?id<%id\|%?d1<%d1\|(root)>>	27	%s%al%?id<%id\|%?d1<%d1\|(root)>>
@@ -29,7 +29,7 @@
29	%s%alNext Track:	29	%s%alNext Track:
30	%s%al%?It<%It\|%Fn>	30	%s%al%?It<%It\|%Fn>
31		31
32	%Vl\|b\|0\|10\|-\|-\|1\|-\|-\|	32	%Vl\|b\|0\|10\|-\|75\|1\|-\|-\|
33	%s%ac%?it<%it\|%fn>	33	%s%ac%?it<%it\|%fn>
34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>	34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>
35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>	35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>
@@ -37,6 +37,6 @@
37	%s%acNext Track:	37	%s%acNext Track:
38	%s%ac%?It<%It\|%Fn>	38	%s%ac%?It<%It\|%Fn>
39		39
40	%V\|0\|96\|-\|-\|1\|-\|-\|	40	%V\|0\|96\|-\|10\|1\|-\|-\|
41	%al %pc%ac%pp of %pe%ar%pr	41	%al %pc%ac%pp of %pe%ar%pr
42		42


diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps index ef01e0e420..d12f1ac410 100644 --- a/wps/cabbiev2.176x132x16.wps +++ b/wps/cabbiev2.176x132x16.wps
@@ -21,7 +21,7 @@
21	%?C<%C%Vda\|%Vdb>	21	%?C<%C%Vda\|%Vdb>
22		22
23	#NowPlaying	23	#NowPlaying
24	%Vl\|a\|81\|12\|-\|-\|1\|-\|-\|	24	%Vl\|a\|81\|12\|-\|74\|1\|-\|-\|
25	%s%al%?it<%it\|%fn>	25	%s%al%?it<%it\|%fn>
26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>	26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>
27	%s%al%?id<%id\|%?d1<%d1\|(root)>>	27	%s%al%?id<%id\|%?d1<%d1\|(root)>>
@@ -29,7 +29,7 @@
29	%s%alNext Track:	29	%s%alNext Track:
30	%s%al%?It<%It\|%Fn>	30	%s%al%?It<%It\|%Fn>
31		31
32	%Vl\|b\|0\|12\|-\|-\|1\|-\|-\|	32	%Vl\|b\|0\|12\|-\|74\|1\|-\|-\|
33	%s%ac%?it<%it\|%fn>	33	%s%ac%?it<%it\|%fn>
34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>	34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>
35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>	35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>
@@ -37,5 +37,5 @@
37	%acNext Track:	37	%acNext Track:
38	%s%ac%?It<%It\|%Fn>	38	%s%ac%?It<%It\|%Fn>
39		39
40	%V\|0\|96\|-\|-\|1\|-\|-\|	40	%V\|0\|96\|-\|12\|1\|-\|-\|
41	%al %pc%ac%pc%ac%pp of %pe%ar%pr%ar%pr	41	%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 d2874bf167..3784bcf200 100644 --- a/wps/cabbiev2.220x176x16.wps +++ b/wps/cabbiev2.220x176x16.wps
@@ -21,7 +21,7 @@
21	#NowPlaying	21	#NowPlaying
22	%?C<%Vda%C\|%Vdb>	22	%?C<%Vda%C\|%Vdb>
23		23
24	%Vl\|a\|105\|30\|-\|-\|1\|-\|-\|	24	%Vl\|a\|105\|30\|-\|90\|1\|-\|-\|
25	%s%al%?it<%it\|%fn>	25	%s%al%?it<%it\|%fn>
26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>	26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>
27	%s%al%?id<%id\|%?d1<%d1\|(root)>>	27	%s%al%?id<%id\|%?d1<%d1\|(root)>>
@@ -29,7 +29,7 @@
29	%s%alNext Track:	29	%s%alNext Track:
30	%s%al%?It<%It\|%Fn>	30	%s%al%?It<%It\|%Fn>
31		31
32	%Vl\|b\|0\|30\|-\|-\|1\|-\|-\|	32	%Vl\|b\|0\|30\|-\|90\|1\|-\|-\|
33	%s%ac%?it<%it\|%fn>	33	%s%ac%?it<%it\|%fn>
34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>	34	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>
35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>	35	%s%ac%?id<%id\|%?d1<%d1\|(root)>>
@@ -38,5 +38,5 @@
38	%s%ac%?It<%It\|%Fn>	38	%s%ac%?It<%It\|%Fn>
39		39
40		40
41	%V\|0\|130\|-\|-\|1\|-\|-\|	41	%V\|0\|130\|-\|20\|1\|-\|-\|
42	%al %pc%ac%pp of %pe%ar%pr	42	%al %pc%ac%pp of %pe%ar%pr


diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps index 041396181c..d745021e73 100644 --- a/wps/cabbiev2.320x240x16.wps +++ b/wps/cabbiev2.320x240x16.wps
@@ -21,7 +21,7 @@
21	%?C<%Vda%C\|%Vdb>	21	%?C<%Vda%C\|%Vdb>
22	#NowPlaying	22	#NowPlaying
23		23
24	%Vl\|a\|153\|30\|-\|-\|1\|-\|-\|	24	%Vl\|a\|153\|30\|-\|130\|1\|-\|-\|
25	%s%al%?it<%it\|%fn>	25	%s%al%?it<%it\|%fn>
26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>	26	%s%al%?ia<%ia\|%?d2<%d2\|(root)>>
27	%s%al%?id<%id\|%?d1<%d1\|(root)>>	27	%s%al%?id<%id\|%?d1<%d1\|(root)>>
@@ -31,7 +31,7 @@
31	%s%al%?It<%It\|%Fn>	31	%s%al%?It<%It\|%Fn>
32	%s%al%Ia	32	%s%al%Ia
33		33
34	%Vl\|b\|0\|30\|-\|-\|1\|-\|-\|	34	%Vl\|b\|0\|30\|-\|130\|1\|-\|-\|
35	%s%ac%?it<%it\|%fn>	35	%s%ac%?it<%it\|%fn>
36	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>	36	%s%ac%?ia<%ia\|%?d2<%d2\|(root)>>
37	%s%ac%?id<%id\|%?d1<%d1\|(root)>>	37	%s%ac%?id<%id\|%?d1<%d1\|(root)>>
@@ -41,6 +41,6 @@
41	%s%ac%?It<%It\|%Fn>	41	%s%ac%?It<%It\|%Fn>
42	%s%ac%Ia	42	%s%ac%Ia
43		43
44	%V\|0\|180\|-\|-\|1\|-\|-\|	44	%V\|0\|180\|-\|20\|1\|-\|-\|
45	%al %pc%ac%pp of %pe%ar%pr	45	%al %pc%ac%pp of %pe%ar%pr
46		46