From 2f39bbb4f9a5ecf6916e39b07354bf7b5b0132ca Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Fri, 30 Nov 2007 01:09:36 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB=E3=83=90?= =?UTF-8?q?=E3=83=BC=E8=8B=A5=E5=B9=B2=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@295 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/systemMenu_RED/Launcher/ARM9/src/launcher.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c index 8e8e44df..93018f15 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c @@ -38,7 +38,7 @@ #define BAR_ZERO_Y WINDOW_HEIGHT - 32 #define BAR_HEIGHT 14 #define BAR_WIDTH 32 //((ITEM_SIZE + ITEM_INTERVAL) * 4 + ITEM_SIZE + 2) -#define BAR_LOOSENESS 0 +#define BAR_LOOSENESS 2 #define ITEMDOT_PER_FRAME ((double)(ITEM_SIZE + ITEM_INTERVAL) / (double)FRAME_PER_SELECT) #define FRAME_PER_ITEMDOT ((double)FRAME_PER_SELECT / (double)(ITEM_SIZE + ITEM_INTERVAL)) #define BAR_OFFSET 0 // 表示に"■"テキストを使っているので、タッチ座標を補正する目的のOFFSET @@ -105,6 +105,7 @@ static GXOamAttr banner_oam_attr[MAX_SHOW_BANNER+10];// static u8 *pbanner_image_list[ LAUNCHER_TITLE_LIST_NUM ]; static int banner_count = 0; static int selected = 0; +static int bar_left = BAR_ZERO_X; // const data ----------------------------------------- @@ -528,7 +529,6 @@ static void MoveByScrollBar( void ) { static BOOL holding = FALSE; static int dx; - int bar_left = (int)(BAR_ZERO_X + (ITEMDOT_PER_FRAME * s_csr)); if(tpd.disp.touch) { if(holding) @@ -557,10 +557,14 @@ static void MoveByScrollBar( void ) holding = FALSE; csr_v = (det < FRAME_PER_SELECT/2) ? (det == 0 ? 0 : -1) : 1; } + bar_left = (int)(BAR_ZERO_X + (ITEMDOT_PER_FRAME * s_csr)); } } // タッチパッドによるスクロール後の調整 + if( BAR_ZERO_X + (ITEM_SIZE + ITEM_INTERVAL) * (LAUNCHER_TITLE_LIST_NUM - 1) < bar_left ) + bar_left = BAR_ZERO_X + (ITEM_SIZE + ITEM_INTERVAL) * (LAUNCHER_TITLE_LIST_NUM - 1); + if( bar_left < BAR_ZERO_X ) bar_left = BAR_ZERO_X; if((LAUNCHER_TITLE_LIST_NUM-1)*FRAME_PER_SELECT < s_csr) s_csr = (LAUNCHER_TITLE_LIST_NUM-1)*FRAME_PER_SELECT; if( s_csr < 0 ) s_csr = 0; } @@ -574,7 +578,7 @@ static void DrawScrollBar( TitleProperty *pTitleList ) } for(l=0; l<4; l++) { - PutStringUTF16( (int)(BAR_ZERO_X + (ITEMDOT_PER_FRAME * s_csr) - l%2), BAR_ZERO_Y - l/2, TXT_UCOLOR_G1, (const u16 *)L"□" ); + PutStringUTF16( (int)(bar_left - l%2), BAR_ZERO_Y - l/2, TXT_UCOLOR_G1, (const u16 *)L"□" ); } }