diff options
| author | Jason Sams <rjsams@android.com> | 2010-01-20 13:34:30 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-01-20 13:34:30 -0800 |
| commit | 1a94ee3a8b2f46c5b46acff15ba9d22dfca36261 (patch) | |
| tree | 3c2cda29a24523366c4b6b628282b223e59b40a8 /res/raw | |
| parent | 37f262d924a177472957d8e68793c9433f2a2de4 (diff) | |
| download | android_packages_apps_Trebuchet-1a94ee3a8b2f46c5b46acff15ba9d22dfca36261.tar.gz android_packages_apps_Trebuchet-1a94ee3a8b2f46c5b46acff15ba9d22dfca36261.tar.bz2 android_packages_apps_Trebuchet-1a94ee3a8b2f46c5b46acff15ba9d22dfca36261.zip | |
Fix selection highligh in all apps. Selection highlight now follows the curve and uses a smaller bitmap.
Diffstat (limited to 'res/raw')
| -rw-r--r-- | res/raw/allapps.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/res/raw/allapps.rs b/res/raw/allapps.rs index 1502a55c4..abcf0dc47 100644 --- a/res/raw/allapps.rs +++ b/res/raw/allapps.rs @@ -291,21 +291,21 @@ void drawFrontGrid(float rowOffset, float p) if (iconNum >= 0) { float x = colWidth * col + (colWidth / 2); - - 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); + bindProgramFragment(NAMED_PFTexNearest); + bindTexture(NAMED_PFTexNearest, 0, state->selectedIconTexture); + storeF(ALLOC_VP_CONSTANTS, 0, SELECTION_TEXTURE_WIDTH_PX); + storeF(ALLOC_VP_CONSTANTS, 1, SELECTION_TEXTURE_HEIGHT_PX); + storeF(ALLOC_VP_CONSTANTS, 3, y - (SELECTION_TEXTURE_HEIGHT_PX - ICON_TEXTURE_HEIGHT_PX) * 0.5f); + drawSimpleMesh(NAMED_SMCell); } - storeF(ALLOC_VP_CONSTANTS, 0, 74.f); - storeF(ALLOC_VP_CONSTANTS, 1, 74.f); + bindProgramFragment(NAMED_PFTexMip); + storeF(ALLOC_VP_CONSTANTS, 0, ICON_TEXTURE_WIDTH_PX); + storeF(ALLOC_VP_CONSTANTS, 1, ICON_TEXTURE_HEIGHT_PX); + storeF(ALLOC_VP_CONSTANTS, 3, y); bindTexture(NAMED_PFTexMip, 0, loadI32(ALLOC_ICON_IDS, iconNum)); drawSimpleMesh(NAMED_SMCell); |