sdk(M7.0a): 视图事件接线 + IconButton + 主题色板导出/注入（launcher 重写基座前置）
M7 launcher 整体 MD3 重写的 SDK 基座补全（只动 patch_v2/sdk/）： - 缺口#7 meow_view 事件接线：meow_view_dispatch_event 接入 meow_ui_run 主循环 （§6.4 分流之上，TAP/KEY/SWIPE/LONG_PRESS 先经 view 路由、命中即消费、未命中回落 on_* —— 无 view 树/未命中完全向后兼容）；meow_view_add_child 在父已进入时挂子视图 立即进入（递归 children 修正）；meow_view_sub_push/pop 标注废弃（设计定案 b 不做页内 子导航栈）。 - 缺口#2 IconButton：meow_iconbtn_create —— sb_icons 位图 + 圆形命中 + 按压/按住态 （实时，同 meow_btn）+ owner/enabled 闸门；电源菜单/播放控制/锁屏通用件。 - 缺口#6 SDK 半主题收口：meow_theme_export/meow_theme_inject（§8.1.5 色板导出/注入）， launcher s_ui_theme() 将据此变读 SDK 的薄壳（launcher 侧改动不在此批）。 - 文档：MEOW_APP_SDK.md 补 meow_iconbtn_create + meow_theme_export/inject 说明。 - 验证：新增 test_meow_ui_iconbtn / test_meow_ui_theme_export / test_meow_ui_view_event 全 PASS；全量 SDK 宿主回归（widgets/dispatch/box/anim/scroll/listvirt/str/ime/pinyin/ overlay/notif/input_keys/p1p2p3/umbrella/ft）全 PASS；交叉 -Wall -Wextra 0 warning。 meow_ui.a md5: be24214e24faadba63577f3a98c2c9d1 -> 7fc83f7731cadb2f91df1c3ed7d3814f
This commit is contained in:
AskaEth committed
1 parent
e67cc50afa
commit
a8c51be1fc
12 files changed
+595
-11
No files matched your search
@@ -0,0 +1,121 @@
|
||||
/* test_meow_ui_iconbtn.c — M7.0a 缺口#2 宿主验证：IconButton 圆形命中 + 按压态 + 位图图标。
|
||||
*
|
||||
* 覆盖：
|
||||
* I1 圆形命中：中心/边界命中，角部/外缘不命中（区别于矩形按钮）；
|
||||
* I2 owner==active + enabled 双闸门：非 active 或禁用不命中；
|
||||
* I3 按压态视觉：设 MEOW_WS_PRESSED 后重绘，圆心像素向 onSurface 变亮（与未按不同）；
|
||||
* 禁用时圆心向灰变暗；
|
||||
* I4 实时按压（meow_input_touch 注入）：按下命中圆心 → 圆心变亮；释放恢复。
|
||||
*
|
||||
* 编译（宿主 gcc，链真实 gfx/sys/theme/vol/log/widget/input/activity/dialog/ime + 打桩 font/global）：
|
||||
* gcc -Wall -Wextra -o test_meow_ui_iconbtn test_meow_ui_iconbtn.c test_host_stub.c \
|
||||
* meow_ui_gfx.c meow_ui_sys.c meow_ui_theme.c meow_ui_vol.c meow_ui_log.c \
|
||||
* meow_ui_widget.c meow_ui_input.c meow_ui_activity.c meow_ui_dialog.c meow_ui_ime.c meow_ui_str.c \
|
||||
* meow_pinyin.c meow_ui_draw.c meow_ui_view.c meow_ui_box.c meow_ui_anim.c meow_ui_scroll.c \
|
||||
* meow_ui_img.c meow_ui_media.c meow_notify_ipc.c stb_image.c \
|
||||
* -I. -I../meow_launcherd -DMEOW_UI_HOST_TEST -pthread -lm
|
||||
* 运行：./test_meow_ui_iconbtn
|
||||
*/
|
||||
#include "meow_ui.h"
|
||||
#include "meow_ui_internal.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
static int g_fail = 0;
|
||||
#define CHECK(cond, name) do { \
|
||||
if (cond) printf(" PASS %s\n", name); \
|
||||
else { printf(" FAIL %s\n", name); g_fail++; } } while (0)
|
||||
|
||||
/* ---- back_buf 像素读取（断言真实渲染，不依赖目检） ---- */
|
||||
static void rd_px(int x, int y, unsigned short *p)
|
||||
{
|
||||
unsigned char *bb = meow_ui_back_buf();
|
||||
int line = meow_ui_back_buf_pitch(), bpp = meow_ui_back_buf_bpp();
|
||||
if (!bb || x < 0 || y < 0) { *p = 0; return; }
|
||||
if (bpp == 16) *p = *(unsigned short *)(bb + (size_t)y * line + (size_t)x * 2);
|
||||
else *p = (unsigned short)(*(unsigned int *)(bb + (size_t)y * line + (size_t)x * 4) >> 16);
|
||||
}
|
||||
static unsigned short px565_at(int x, int y)
|
||||
{
|
||||
unsigned short p; rd_px(x, y, &p); return p;
|
||||
}
|
||||
|
||||
int main(void)
|
||||
{
|
||||
setenv("MEOW_UI_DUMP", "/tmp/iconbtn.ppm", 1);
|
||||
meow_ui_opts o = { 480, 720 };
|
||||
assert(meow_ui_init(&o) == 0);
|
||||
meow_ui_activity_push(7); /* owner 对齐：IconButton 绑定 active=7 */
|
||||
meow_theme_set_mode(MEOW_THEME_DARK);
|
||||
|
||||
/* size=64 → 外接框 (100,100,64,64) → 圆心 (132,132) r=32 */
|
||||
meow_widget *ic = meow_iconbtn_create(100, 100, 64, MEOW_ICON_PLAY_ARROW);
|
||||
assert(ic != NULL);
|
||||
|
||||
/* ============ I1 圆形命中 ============ */
|
||||
printf("I1 circular hit\n");
|
||||
CHECK(meow_widget_hit(ic, 132, 132), "center hits");
|
||||
CHECK(meow_widget_hit(ic, 100, 132), "left edge (boundary) hits");
|
||||
CHECK(meow_widget_hit(ic, 132, 100), "top edge (boundary) hits");
|
||||
CHECK(!meow_widget_hit(ic, 100, 100), "corner (dist>r) MISSES (rect would hit)");
|
||||
CHECK(!meow_widget_hit(ic, 132, 165), "below center (dist 33>32) MISSES");
|
||||
|
||||
/* ============ I2 owner 闸门：切 active 后不命中 ============ */
|
||||
printf("I2 owner gate\n");
|
||||
meow_ui_activity_push(8); /* 换 active：original owner=7 ≠ active=8 */
|
||||
CHECK(!meow_widget_hit(ic, 132, 132), "non-active owner -> MISS (gate)");
|
||||
meow_ui_activity_pop(); /* 回 active=7 */
|
||||
CHECK(meow_widget_hit(ic, 132, 132), "back to active -> hits");
|
||||
/* enabled 闸门 */
|
||||
meow_widget_set_enabled(ic, 0);
|
||||
CHECK(!meow_widget_hit(ic, 132, 132), "disabled -> MISS");
|
||||
meow_widget_set_enabled(ic, 1);
|
||||
CHECK(meow_widget_hit(ic, 132, 132), "enabled -> hits");
|
||||
|
||||
/* ============ I3 按压态视觉（状态机位 + 禁用变暗） ============
|
||||
* 采样点选 (162,132)：圆内 (r=30<32) 但超出图标 ink 右缘（约 x≤148）——取的是圆形底色，
|
||||
* 而非图标墨色（圆心为图标覆盖，不适合测底色 tint）。 */
|
||||
printf("I3 pressed visual (state machine / disabled)\n");
|
||||
const meow_theme *th = meow_theme_get();
|
||||
meow_ui_clear(th->bg);
|
||||
unsigned short p_bg = px565_at(100, 100); /* 空屏角部 = 页面底色 */
|
||||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0); /* 未按 */
|
||||
meow_widget_draw(ic);
|
||||
unsigned short p_idle = px565_at(162, 132);
|
||||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 1); /* 按下 */
|
||||
meow_widget_draw(ic);
|
||||
unsigned short p_press = px565_at(162, 132);
|
||||
CHECK(p_press != p_idle, "pressed circle-bg pixel differs from idle (tint layer)");
|
||||
/* 禁用：向灰变暗，圆 bg 应更接近 onSurface 混合（与 idle 不同且更亮/更灰） */
|
||||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0);
|
||||
meow_widget_set_enabled(ic, 0);
|
||||
meow_widget_draw(ic);
|
||||
unsigned short p_dis = px565_at(162, 132);
|
||||
CHECK(p_dis != p_idle, "disabled circle-bg pixel differs from idle (dim)");
|
||||
meow_widget_set_enabled(ic, 1);
|
||||
/* 角部（圆外）不应出现圆形底色：等于页面底色（圆形命中/填充不外溢） */
|
||||
meow_widget_draw(ic);
|
||||
CHECK(px565_at(100, 100) == p_bg, "corner (outside circle) = page bg (no stray fill)");
|
||||
|
||||
/* ============ I4 实时按压（meow_input_touch 注入） ============ */
|
||||
printf("I4 live press via input touch\n");
|
||||
meow_widget_set_state(ic, MEOW_WS_PRESSED, 0);
|
||||
meow_ui_clear(th->bg);
|
||||
meow_widget_draw(ic);
|
||||
unsigned short q_idle = px565_at(162, 132);
|
||||
meow_input_touch_set(1, 132, 132, 0); /* 按在圆心 */
|
||||
meow_widget_draw(ic);
|
||||
unsigned short q_live = px565_at(162, 132);
|
||||
CHECK(q_live != q_idle, "live touch press -> circle bg brightens");
|
||||
meow_input_touch_set(0, 0, 0, 0); /* 释放 */
|
||||
meow_widget_draw(ic);
|
||||
CHECK(px565_at(162, 132) == q_idle, "release -> circle bg restores");
|
||||
|
||||
meow_widget_free(ic);
|
||||
meow_ui_activity_pop();
|
||||
meow_ui_shutdown();
|
||||
printf(g_fail ? "\nRESULT: %d FAIL(S)\n" : "\nRESULT: ALL PASS\n", g_fail);
|
||||
return g_fail;
|
||||
}
|
||||
Reference in new issue
Block a user