summaryrefslogtreecommitdiffstats
path: root/res/raw
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-01-20 11:19:51 -0800
committerJason Sams <rjsams@android.com>2010-01-20 11:19:51 -0800
commit37f262d924a177472957d8e68793c9433f2a2de4 (patch)
tree4849891712bfd041ce6e99396761164c30973392 /res/raw
parent6ec11bc3a80341206be9506619deb7f9171d38c9 (diff)
downloadandroid_packages_apps_Trebuchet-37f262d924a177472957d8e68793c9433f2a2de4.tar.gz
android_packages_apps_Trebuchet-37f262d924a177472957d8e68793c9433f2a2de4.tar.bz2
android_packages_apps_Trebuchet-37f262d924a177472957d8e68793c9433f2a2de4.zip
Fix issues with text drawing in Froyo for all-apps.
Diffstat (limited to 'res/raw')
-rw-r--r--res/raw/allapps.rs18
1 files changed, 14 insertions, 4 deletions
diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs
index 8cbbea2f4..1502a55c4 100644
--- a/res/raw/allapps.rs
+++ b/res/raw/allapps.rs
@@ -292,17 +292,28 @@ void drawFrontGrid(float rowOffset, float p)
if (iconNum >= 0) {
float x = colWidth * col + (colWidth / 2);
- storeF(ALLOC_VP_CONSTANTS, 0, 74.f);
- storeF(ALLOC_VP_CONSTANTS, 1, 74.f);
+ bindProgramFragment(NAMED_PFTexMip);
+
storeF(ALLOC_VP_CONSTANTS, 2, x);
storeF(ALLOC_VP_CONSTANTS, 3, y);
+ if (state->selectedIconIndex == iconNum && !p) {
+ //bindTexture(NAMED_PFTexMip, 0, state->selectedIconTexture);
+ //bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum));
+ //storeF(ALLOC_VP_CONSTANTS, 0, 100.f);
+ //storeF(ALLOC_VP_CONSTANTS, 1, 100.f);
+ //drawSimpleMesh(NAMED_SMCell);
+ }
+
+ storeF(ALLOC_VP_CONSTANTS, 0, 74.f);
+ storeF(ALLOC_VP_CONSTANTS, 1, 74.f);
bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum));
drawSimpleMesh(NAMED_SMCell);
+ bindProgramFragment(NAMED_PFTexMipAlpha);
storeF(ALLOC_VP_CONSTANTS, 0, 128.f);
storeF(ALLOC_VP_CONSTANTS, 1, 64.f);
storeF(ALLOC_VP_CONSTANTS, 3, y - 64.f);
- bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_LABEL_IDS, iconNum));
+ bindTexture(NAMED_PFTexMipAlpha, 0, loadI32(ALLOC_LABEL_IDS, iconNum));
drawSimpleMesh(NAMED_SMCell);
}
iconNum++;
@@ -372,7 +383,6 @@ main(int launchID)
//debugF(" draw g_PosPage", g_PosPage);
// Draw the icons ========================================
- bindProgramFragment(NAMED_PFTexMip);
drawFrontGrid(g_PosPage, 1-g_Zoom);
bindProgramFragment(NAMED_PFTexNearest);