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

Align status sep and mode-select rows to 0902 draft. 

Put the status divider at y=36 and start mode rows at CARD_Y=48 so Universal matches transpose/tempo tops with draft row height 88 and pitch 92.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
yuquanjun 2026-09-06 19:43:47 +08:00
parent bce08be772
commit 8a7e8169a2
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/UI_Idle.c
View File

@ -21,12 +21,12 @@ void RGB_Y_TO_G()
extern bool InModeFlag; extern bool InModeFlag;
/* 0902/0819：三行模式撑满状态栏下方至底边（无底栏），222x88 @ y=43/135/225 */ /* 0902-01：行高88、行距92；顶边与模式主页移调/速度(CARD_Y=48)对齐，分割线居中 */
#define UI0902_MODE_ROW_X 9 #define UI0902_MODE_ROW_X 9
#define UI0902_MODE_ROW_W 222 #define UI0902_MODE_ROW_W 222
#define UI0902_MODE_ROW_H 88 #define UI0902_MODE_ROW_H 88
#define UI0902_MODE_ROW_Y0 43 #define UI0902_MODE_ROW_Y0 UI0902_CARD_Y /* 48，与移调/速度顶对齐 */
#define UI0902_MODE_ROW_DY 92 #define UI0902_MODE_ROW_DY 92 /* 48 / 140 / 232 */
/* 模式页不显示焦点：三行均用未选中资源；单击直接进入 */ /* 模式页不显示焦点：三行均用未选中资源；单击直接进入 */
static const uint32_t s_mode_row_addr[3] = { static const uint32_t s_mode_row_addr[3] = {
@ -73,10 +73,10 @@ void UI_DrawModeSelectScreen(void)
} }
const Touch_AreaTypeDef Touch_ModeSelect_Areas[] = { const Touch_AreaTypeDef Touch_ModeSelect_Areas[] = {
/* Flag=按钮序号(0万能/1普通/2专业)；ID=进入 TAB。全宽便于命中 */ /* Flag=按钮序号(0万能/1普通/2专业)；ID=进入 TAB。全宽便于命中；Y 与 MODE_ROW_* 一致 */
{ 0, 239, 43, 130, 0, 0, 0, NULL }, { 0, 239, 48, 135, 0, 0, 0, NULL },
{ 0, 239, 135, 222, 1, 0, 2, NULL }, { 0, 239, 140, 227, 1, 0, 2, NULL },
{ 0, 239, 225, 312, 2, 0, 1, NULL }, { 0, 239, 232, 319, 2, 0, 1, NULL },
}; };
#define TOUCH_AREA_MODE_SELECT_NUM (sizeof(Touch_ModeSelect_Areas)/sizeof(Touch_AreaTypeDef)) #define TOUCH_AREA_MODE_SELECT_NUM (sizeof(Touch_ModeSelect_Areas)/sizeof(Touch_AreaTypeDef))

2
UI/UI_global.c
View File

@ -237,7 +237,7 @@ uint8_t UI_SetFocus(uint8_t widget_id)
void UI_DrawStatusSepLine(void) void UI_DrawStatusSepLine(void)
{ {
/* 与模式选择/各模式主页统一：状态栏底部分割线 y=26 */ /* 与模式选择/各模式主页统一：需求稿分割线 y=36 */
LCD_DrawLine(0, UI0902_STATUS_SEP_Y, 239, UI0902_STATUS_SEP_Y, LCD_DrawLine(0, UI0902_STATUS_SEP_Y, 239, UI0902_STATUS_SEP_Y,
UI0902_STATUS_SEP_COLOR); UI0902_STATUS_SEP_COLOR);
} }

3
UI/UI_global.h
View File

@ -28,7 +28,8 @@ void CallUI_RestoreSelect(void);
#define UI_STATUS_BAR_H 26 #define UI_STATUS_BAR_H 26
#define UI0902_STATUS_SEP_Y 26 /* 0902-01/02 需求稿：分割线 y=36，居中于顶栏图标底与移调/速度控件顶之间 */
#define UI0902_STATUS_SEP_Y 36
#define UI0902_STATUS_SEP_COLOR 0x52AA /* 比旧 0x2988 更清晰，避免在蓝牙下看成断开 */ #define UI0902_STATUS_SEP_COLOR 0x52AA /* 比旧 0x2988 更清晰，避免在蓝牙下看成断开 */
/* 0902 设计稿配色与底栏导航 */ /* 0902 设计稿配色与底栏导航 */
#define UI0902_BG_COLOR 0x0042 /* #000813 页面背景 */ #define UI0902_BG_COLOR 0x0042 /* #000813 页面背景 */