SoundWalker
/
K1Guitar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align bottom nav, section, and settings row geometry to 0904. 

Centers 40/100/160/210, SECTION_Y 231, and SET_ROW 16x207 so play/settings pages match the standard art.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yuquanjun 2026-09-05 07:05:23 +08:00
parent 66ccfdccf6
commit 70e608e2ce
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Global/Global.c
View File

@ -89,11 +89,11 @@ const Touch_AreaTypeDef Touch_Areas[] =
{ 126, 172, UI0902_SECTION_Y, UI0902_SECTION_Y + UI0902_SECTION_BTN_H - 1, 0, 2, GUI_PLAY_SECTION, NULL }, { 126, 172, UI0902_SECTION_Y, UI0902_SECTION_Y + UI0902_SECTION_BTN_H - 1, 0, 2, GUI_PLAY_SECTION, NULL },
{ 183, 229, UI0902_SECTION_Y, UI0902_SECTION_Y + UI0902_SECTION_BTN_H - 1, 0, 3, GUI_PLAY_SECTION, NULL }, { 183, 229, UI0902_SECTION_Y, UI0902_SECTION_Y + UI0902_SECTION_BTN_H - 1, 0, 3, GUI_PLAY_SECTION, NULL },
/* 底栏四键：万能 | 普通 | 专业 | 设置 */ /* 底栏四键：万能 | 普通 | 专业 | 设置（触区中线对齐 cx 40/100/160/210） */
{ 0, 59, 280, 319, 0, UI0902_NAV_UNIVERSAL, GUI_NAV_BAR, NULL }, { 0, 69, 280, 319, 0, UI0902_NAV_UNIVERSAL, GUI_NAV_BAR, NULL },
{ 60, 119, 280, 319, 0, UI0902_NAV_NORMAL, GUI_NAV_BAR, NULL }, { 70, 129, 280, 319, 0, UI0902_NAV_NORMAL, GUI_NAV_BAR, NULL },
{ 120, 179, 280, 319, 0, UI0902_NAV_EXPERT, GUI_NAV_BAR, NULL }, { 130, 184, 280, 319, 0, UI0902_NAV_EXPERT, GUI_NAV_BAR, NULL },
{ 180, 239, 280, 319, 0, UI0902_NAV_SETTING, GUI_NAV_BAR, NULL }, { 185, 239, 280, 319, 0, UI0902_NAV_SETTING, GUI_NAV_BAR, NULL },
}; };
int16_t MIC_VOL_MAP[10]= {-9000,-7000,-5000,-3000,-1000,1000,3000,5000,7000,9000}; int16_t MIC_VOL_MAP[10]= {-9000,-7000,-5000,-3000,-1000,1000,3000,5000,7000,9000};

8
UI/UI_SystemSet.c
View File

@ -12,10 +12,10 @@ const Touch_AreaTypeDef Touch_SetingSelect_Areas[] = {
UI0902_HUB_CARD_Y1, (uint16_t)(UI0902_HUB_CARD_Y1 + UI0902_HUB_CARD_H - 1), UI0902_HUB_CARD_Y1, (uint16_t)(UI0902_HUB_CARD_Y1 + UI0902_HUB_CARD_H - 1),
0, 0, GUI_SETING_SELECT3, NULL }, 0, 0, GUI_SETING_SELECT3, NULL },
/* 底栏四键 */ /* 底栏四键 */
{ 0, 59, 280, 319, 0, UI0902_NAV_UNIVERSAL, GUI_NAV_BAR, NULL }, { 0, 69, 280, 319, 0, UI0902_NAV_UNIVERSAL, GUI_NAV_BAR, NULL },
{ 60, 119, 280, 319, 0, UI0902_NAV_NORMAL, GUI_NAV_BAR, NULL }, { 70, 129, 280, 319, 0, UI0902_NAV_NORMAL, GUI_NAV_BAR, NULL },
{ 120, 179, 280, 319, 0, UI0902_NAV_EXPERT, GUI_NAV_BAR, NULL }, { 130, 184, 280, 319, 0, UI0902_NAV_EXPERT, GUI_NAV_BAR, NULL },
{ 180, 239, 280, 319, 0, UI0902_NAV_SETTING, GUI_NAV_BAR, NULL }, { 185, 239, 280, 319, 0, UI0902_NAV_SETTING, GUI_NAV_BAR, NULL },
}; };
#define TOUCH_AREA_SETING_SELECT_NUM (sizeof(Touch_SetingSelect_Areas)/sizeof(Touch_AreaTypeDef)) #define TOUCH_AREA_SETING_SELECT_NUM (sizeof(Touch_SetingSelect_Areas)/sizeof(Touch_AreaTypeDef))

3
UI/UI_global.c
View File

@ -826,7 +826,8 @@ void Draw_Bottom_Bar(uint8_t sel, uint8_t first_back)
/* 需求稿四键：万能 | 普通 | 专业 | 设置；first_back 时设置位仍高亮（返回用触控逻辑） */ /* 需求稿四键：万能 | 普通 | 专业 | 设置；first_back 时设置位仍高亮（返回用触控逻辑） */
const uint8_t *icons[4]; const uint8_t *icons[4];
uint8_t ws[4], hs[4]; uint8_t ws[4], hs[4];
const uint16_t cx[4] = { 30, 90, 150, 210 }; /* 0904：四键中心约 40 / 100 / 160 / 210 */
const uint16_t cx[4] = { 40, 100, 160, 210 };
uint8_t i; uint8_t i;
(void)first_back; (void)first_back;

8
UI/UI_global.h
View File

@ -45,7 +45,7 @@ void CallUI_RestoreSelect(void);
#define UI0902_MODE_H 53 /* TAB18 + 间隙4 + 曲目行31 */ #define UI0902_MODE_H 53 /* TAB18 + 间隙4 + 曲目行31 */
#define UI0902_TIMBRE_Y 180 #define UI0902_TIMBRE_Y 180
#define UI0902_TIMBRE_H 30 #define UI0902_TIMBRE_H 30
#define UI0902_SECTION_Y 229 #define UI0902_SECTION_Y 231 /* 0904：段落钮顶 ≈231 */
#define UI0902_SECTION_H 34 #define UI0902_SECTION_H 34
#define UI0902_FONT_LABEL 11 /* 标注：移调/速度 Medium 11 */ #define UI0902_FONT_LABEL 11 /* 标注：移调/速度 Medium 11 */
#define UI0902_FONT_BODY 13 /* 曲目/音色正文、演奏段落 */ #define UI0902_FONT_BODY 13 /* 曲目/音色正文、演奏段落 */
@ -143,9 +143,9 @@ void CallUI_RestoreSelect(void);
#define UI0902_SUB_TITLE_SIZE UI0902_FONT_HERO #define UI0902_SUB_TITLE_SIZE UI0902_FONT_HERO
#define UI0902_SUB_SEP_Y 38 #define UI0902_SUB_SEP_Y 38
/* 0904 / 0902-07 系统设置四行 */ /* 0904 / 0902-07 系统设置四行（稿面行框 ≈x16 w207） */
#define UI0902_SET_ROW_X 13 #define UI0902_SET_ROW_X 16
#define UI0902_SET_ROW_W 214 #define UI0902_SET_ROW_W 207
#define UI0902_SET_ROW_H 58 #define UI0902_SET_ROW_H 58
#define UI0902_SET_ROW_Y0 51 #define UI0902_SET_ROW_Y0 51
#define UI0902_SET_ROW_PITCH 63 #define UI0902_SET_ROW_PITCH 63