rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ユーザーカラー選択をタッチパネルに対応

Browse Source 
miscをsmallfix

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@206 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yoshida_teruhisa 2007-11-19 01:46:18 +00:00
parent ad04364b9b
commit 09f470a951
2 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
View File

@ -707,6 +707,39 @@ static void DrawColorSample( void )
}
}
// SetUserColorMainのSelectSomethingByTPで使うSelectSomethingFuncの実装
static BOOL SelectColorFunc( u16 *csr, TPData *tgt )
{
// まずは候補となる座標（カーソル単位）を取得
int csrx;
int csry;
int csrxy;
int a;
int b;
BOOL ret;
csrx = (tgt->x - 88) / 24;
csry = (tgt->y - 54) / 24;
if(csrx < 0 ) return FALSE;
if ( csrx >= 4 ) csrx = 3;
csrxy = csrx + csry * 4;
if ( csrxy < 0 || csrxy >= 16) return FALSE;// はみ出した
a = 88 + csrx * 24;
b = 54 + csry * 24;
// 候補座標の領域にタッチ座標が含まれているかチェック
ret = WithinRangeTP( a, b, a+11, b+11, tgt );
if(ret)
{
*csr = (u16)csrxy;
}
return ret;
}
// ユーザーカラー編集の初期化
static void SetUserColorInit( void )
{
@ -718,6 +751,7 @@ static void SetUserColorInit( void )
SVC_CpuClear( 0x0000, &tpd, sizeof(TpWork), 16 );
s_color_csr = TSD_GetUserColor();
tp_csr = s_color_csr;
GX_SetVisiblePlane ( GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1);
GXS_SetVisiblePlane( GX_PLANEMASK_BG0 );
@ -728,7 +762,7 @@ static void SetUserColorInit( void )
// ユーザーカラー編集メイン
static int SetUserColorMain( void )
{
SelectSomethingFunc func[2]={SelectCancelFunc, SelectOKFunc};
SelectSomethingFunc func[3]={SelectColorFunc, SelectCancelFunc, SelectOKFunc};
BOOL tp_touch = FALSE;
ReadTP();
@ -754,8 +788,8 @@ static int SetUserColorMain( void )
}
// TPチェック
tp_touch = SelectSomethingByTP(&tp_csr, func, 2 );
if (tp_touch && (tp_csr != KEY_OK && tp_csr != KEY_CANCEL)){
tp_touch = SelectSomethingByTP(&tp_csr, func, 3 );
if (tp_csr != KEY_OK && tp_csr != KEY_CANCEL){
s_color_csr = (u8)tp_csr;
}

5
build/systemMenu_RED/misc/src/misc.c
View File

@ -557,11 +557,6 @@ BOOL SelectSomethingByTP( u16 *nowCsr, SelectSomethingFunc func[], int funcnum )
if( csr_old == csr ) {
if( same_csr_count < TP_CSR_TOUCH_COUNT ) {
same_csr_count++;
{
static int a;
a = csr_old;
a++;
}
}
if( same_csr_count == TP_CSR_TOUCH_COUNT ) {
*nowCsr = csr;