AskaEth/MeowOS-SDK
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sdk/hello): P1 z-order重叠(FAB被下层动态控件抹掉,d_redraw→d_paint_region按z栈重画重叠区) + P2 list焦点(命中非list区域释放焦点滚页面) + P3 list脏区(W_LIST裁剪视口,标题栏/底部无残留) (agent-166)

Browse Source
This commit is contained in:
MeowOS committed 2026-08-31 01:27:01 +08:00
1 parent 6b55cd012b
commit 4afd1abb4a
2 files changed
+172 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

meow_ui_widget.c
+24 -10
View File
@@ -984,26 +984,40 @@ void meow_widget_draw(meow_widget *w)
int last = (item > 0) ? (off + vp) / item + 1 : 0;
if (first < 0) first = 0;
if (last > w->count) last = w->count;
/* 视口绝对边界：列表只在其内绘制，杜绝越界泄漏（部分行滚出视口时把填充/分隔线/文本
* 画到视口外 → 标脏并上屏 → 标题栏/底部残留脏区，P3）。 */
int vx0 = w->x, vy0 = w->y, vx1 = w->x + w->w, vy1 = w->y + w->h;
int thh = meow_ui_text_height(th->font_body);
for (int i = first; i < last; i++) {
char label[64] = "";
if (!w->src || !w->src(i, label, (int)sizeof label, w->ctx)) continue;
int pos = i * item - off; /* 相对容器起点的可视位置 */
if (w->horizontal) {
int rx = w->x + pos;
if (rx >= w->x + w->w) break;
if (i == w->sel) meow_ui_fill_rect(rx, w->y, item, w->h, th->primary);
if (rx >= vx1) break; /* 完全在右缘外 */
if (rx + item <= vx0) continue; /* 完全在左缘外（滚出残余） */
int cl = rx > vx0 ? rx : vx0; /* 可见左界 */
int cr = (rx + item) < vx1 ? (rx + item) : vx1; /* 可见右界 */
if (i == w->sel) meow_ui_fill_rect(cl, w->y, cr - cl, w->h, th->primary);
uint32_t col = (i == w->sel) ? 0xFFFFFF : th->onSurface;
meow_ui_text_center(rx + item / 2, w->y + (w->h - meow_ui_text_height(th->font_body)) / 2,
label, th->font_body, col);
meow_ui_fill_rect(rx + item - 1, w->y, 1, w->h, th->onSurfaceVariant);
int ty = w->y + (w->h - thh) / 2;
if (rx >= vx0 && rx + item <= vx1) /* 仅整项可见才画文本（防泄漏） */
meow_ui_text_center(rx + item / 2, ty, label, th->font_body, col);
int sxp = rx + item - 1; /* 分隔线：仅当落在可见区 */
if (sxp >= cl && sxp < cr) meow_ui_fill_rect(sxp, w->y, 1, w->h, th->onSurfaceVariant);
} else {
int ry = w->y + pos;
if (ry >= w->y + w->h) break;
if (i == w->sel) meow_ui_fill_rect(w->x, ry, w->w, item, th->primary);
if (ry >= vy1) break; /* 完全在底缘外 */
if (ry + item <= vy0) continue; /* 完全在顶缘外（滚出残余） */
int cl = ry > vy0 ? ry : vy0; /* 可见顶界 */
int cr = (ry + item) < vy1 ? (ry + item) : vy1; /* 可见底界 */
if (i == w->sel) meow_ui_fill_rect(w->x, cl, w->w, cr - cl, th->primary);
uint32_t col = (i == w->sel) ? 0xFFFFFF : th->onSurface;
meow_ui_text(w->x + pad, ry + (item - meow_ui_text_height(th->font_body)) / 2,
label, th->font_body, col);
meow_ui_fill_rect(w->x, ry + item - 1, w->w, 1, th->onSurfaceVariant);
int ty = ry + (item - thh) / 2;
if (ty >= vy0 && ty + thh <= vy1) /* 文本不越界才画（防标题/底部泄漏） */
meow_ui_text(w->x + pad, ty, label, th->font_body, col);
int sy = ry + item - 1; /* 分隔线：仅当落在可见区 */
if (sy >= cl && sy < cr) meow_ui_fill_rect(w->x, sy, w->w, 1, th->onSurfaceVariant);
}
}
if (disabled) meow_ui_fill_rect_alpha(w->x, w->y, w->w, w->h, th->onSurface, 90);
test_p1p2p3_repro.c
+148
View File
@@ -0,0 +1,148 @@
/* test_p1p2p3_repro.c — 宿主复现并校验 P1/P2/P3 三个真机问题的修复（离屏 480x720，16bpp）。
*
* 方法：#include 真实 `hello.c`（改 hello 的 main 名），直接驱动 demo 的真实函数
* （demo_paint / d_redraw / demo_touch_down / demo_rebuild_to），对 back_buf 做像素断言。
* 这样测的是「真实 demo 代码 + 真实 SDK」，不是模拟桩。不依赖 /dev/fb0 / 字库 / launcher。
*
* 覆盖：
* P1 z-order 叠层：圆形进度条(实时重绘)与 FAB 浮层重叠时，局部重绘不再清掉/盖住 FAB。
* 旧 d_redraw=清底+只画单控件 → FAB 重叠区被抹成背景；新 d_redraw=d_paint_region
* 重画重叠区完整 z 栈（内容→标题→slider值→chrome）→ FAB 保持。
* P2 list 焦点：命中非 list 区域时释放列表焦点、切页滚动（不再沿用旧焦点继续滚列表）。
* P3 list 脏区：W_LIST 绘制已裁剪到视口；滚动(非整行偏移)+选中行不再向标题间隙/底缘下泄漏
* 填充（此前泄漏会标脏并上屏 → 标题栏/底部残留）。
*
* 编译（宿主 gcc，链真实 gfx/sys/theme/vol/log/widget/input/activity/dialog/ime/img/config/
* notify/ipc + 打桩 font/global(test_host_stub) + stb_image）：
* gcc -Wall -Wextra -DMEOW_UI_HOST_TEST -Dmain=hello_app_main \
* -o test_p1p2p3_repro test_p1p2p3_repro.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_img.c meow_ui_config.c meow_ui_notify.c meow_notify_ipc.c stb_image.c \
* -I. -I../hello_app -I../meow_launcherd -pthread -lm
* 运行：MEOW_UI_DUMP=/tmp/repro.ppm ./test_p1p2p3_repro （optional，dump 最终屏幕）
*
* 修复前（无 P1/P2/P3 修法）预期输出：RESULT: 4 FAIL(S)；
* 修复后：RESULT: ALL PASS。
*/
#include "meow_ui.h"
#include "meow_ui_internal.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#define main hello_app_main /* 让 hello.c 的 main 改名，由本文件提供 main */
#include "hello.c"
#undef main
/* ---- 像素读取 ---- */
static void rd_px(int x, int y, int *r, int *g, int *b)
{
unsigned char *bb = meow_ui_back_buf();
int line = meow_ui_back_buf_pitch(), bpp = meow_ui_back_buf_bpp();
if (!bb) { *r=*g=*b=0; return; }
if (bpp == 16) {
uint16_t px = *(uint16_t *)(bb + (size_t)y * line + (size_t)x * 2);
*r = (((px >> 11) & 0x1F) << 3) | ((px >> 11) & 0x1F) >> 2;
*g = (((px >> 5) & 0x3F) << 2) | ((px >> 5) & 0x3F) >> 4;
*b = ((px & 0x1F) << 3) | ((px & 0x1F) >> 2);
} else {
uint32_t px = *(uint32_t *)(bb + (size_t)y * line + (size_t)x * 4);
*r = (px >> 16) & 0xFF; *g = (px >> 8) & 0xFF; *b = px & 0xFF;
}
}
static int near(int a, int b) { int d = a - b; if (d < 0) d = -d; return d <= 12; }
static int is_bg(int r, int g, int b)
{
const meow_theme *th = meow_theme_get();
int br = (th->bg >> 16) & 0xFF, bg = (th->bg >> 8) & 0xFF, bb = th->bg & 0xFF;
return near(r, br) && near(g, bg) && near(b, bb);
}
static void pr_px(const char *tag, int x, int y)
{
int r, g, b; rd_px(x, y, &r, &g, &b);
printf(" %-26s px(%d,%d)=%02X%02X%02X %s\n", tag, x, y, r, g, b, is_bg(r, g, b) ? "[bg]" : "[ink]");
}
int main(void)
{
setenv("MEOW_UI_DUMP", "/tmp/repro.ppm", 1);
meow_ui_opts o = { 480, 720 };
if (meow_ui_init(&o) != 0) { printf("init failed\n"); return 1; }
meow_ui_activity_push(ACT_DEMO); /* demo 控件 owner=ACT_DEMO，命中/绘制对齐 */
demo_init(); /* 建造 chrome + 内容(scroll=0)，owner=ACT_DEMO */
int fails = 0;
/* ================= P1：局部重绘不盖浮层（FAB） =================
* 场景：scroll=0 时圆形进度(413..453,605..645) 与 FAB(406..462,616..672) 重叠。
* demo_paint 先画内容后画 chrome → 场景正确 FAB 在上。随后「局部重绘进度条」：
* 旧（清底+只画进度条+flush 其矩形）→ FAB 重叠区被清掉；
* 新（清底+重画重叠区内所有控件=hello d_redraw/d_paint_region）→ FAB 保持。 */
demo_paint();
int fx = r_fab.x + 28, fy = r_fab.y + 6; /* FAB 内、远离 "+" 文本处 */
int s0r, s0g, s0b; rd_px(fx, fy, &s0r, &s0g, &s0b);
printf("P1 scene (demo_paint) FAB-overlap "); pr_px("scene", fx, fy);
if (is_bg(s0r, s0g, s0b))
printf(" [warn] expected FAB ink at scene, got bg — geometry assumptions off\n");
/* 旧式局部重绘：清底+只画进度条（复现根因） */
{
const meow_theme *th = meow_theme_get();
meow_progress_set(g_dprc, 30);
meow_ui_fill_rect(r_prc.x, r_prc.y, r_prc.w, r_prc.h, th->bg);
meow_widget_draw(g_dprc);
meow_ui_flush_region(r_prc.x, r_prc.y, r_prc.w, r_prc.h);
}
int obr, obg, obb; rd_px(fx, fy, &obr, &obg, &obb);
printf("P1 old-partial (clear+single draw) "); pr_px("old", fx, fy);
if (is_bg(obr, obg, obb)) printf(" [BUG-CONFIRMED] old path erased FAB overlap (bg)\n");
else printf(" [note] old path did NOT erase FAB here (color %02X%02X%02X)\n", obr, obg, obb);
/* 新式局部重绘（真实 hello d_redraw → d_paint_region，重画重叠栈）*/
demo_paint(); /* 还原场景 */
meow_progress_set(g_dprc, 30);
d_redraw(g_dprc, r_prc); /* hello 的局部重绘入口 */
int nbr, nbg, nbb; rd_px(fx, fy, &nbr, &nbg, &nbb);
printf("P1 new-partial (d_redraw stack) "); pr_px("new", fx, fy);
if (near(s0r, nbr) && near(s0g, nbg) && near(s0b, nbb))
printf(" P1-PASS FAB preserved over live progress redraw\n");
else { printf(" P1-FAIL FAB not preserved (scene %02X%02X%02X vs new %02X%02X%02X)\n",
s0r, s0g, s0b, nbr, nbg, nbb); fails++; }
/* ================= P2：列表焦点按本次触摸绑定/释放 =================
* demo_touch_down 命中非 list 区域时应释放列表焦点 → 页滚动，而不是继续滚列表。 */
g_demo_focus = 1; /* 模拟此前点过列表（焦点留存） */
g_demo = 1; /* demo 页已进入（demo_touch_down 前置闸门） */
demo_touch_down(240, 300); /* 非 list 非 slider 的内容区 */
printf("P2 touch_down(240,300) with focus=1 -> drag_list=%d drag_page=%d focus=%d\n",
g_drag_list, g_drag_page, g_demo_focus);
if (g_drag_list == 0 && g_drag_page == 1 && g_demo_focus == 0)
printf(" P2-PASS non-list touch releases focus, drags page\n");
else { printf(" P2-FAIL (expected drag_page=1 focus=0; got drag_list=%d drag_page=%d focus=%d)\n",
g_drag_list, g_drag_page, g_demo_focus); fails++; }
/* ================= P3：列表滚动 W_LIST 视口外泄漏 =================
* 把页面 scroll 拉到底，列表上屏；再把列表 scroll 设非整行倍数 + 选中一个跨底/跨顶行，
* 观察视口外（标题间隙/底缘下）是否漏出选中行填充（标脏泄漏 = 标题栏/底部卡脏区）。 */
demo_rebuild_to(100000); /* clamp 到 max，列表上屏 */
printf("P3 list rect = (%d,%d,%d,%d)\n", r_list.x, r_list.y, r_list.w, r_list.h);
/* 顶部泄漏：选中行0 + scroll=20 → 行0 ry=top-20，填充越顶泄漏 */
meow_list_set_selected(g_dlc, 0); meow_list_set_scroll(g_dlc, 20);
d_redraw(g_dlc, r_list);
int ux = r_list.x + 10, uy = r_list.y - 5; /* 列表顶上方 5px（标题间隙） */
int ur, ug, ub; rd_px(ux, uy, &ur, &ug, &ub);
printf("P3 top-leak "); pr_px("above-top", ux, uy);
if (is_bg(ur, ug, ub)) printf(" P3-top-PASS no leak into title gap\n");
else { printf(" P3-top-FAIL leaked into title gap\n"); fails++; }
/* 底部泄漏：选中行4 + scroll=20 → 行4 ry=590..630 越底泄漏 */
meow_list_set_selected(g_dlc, 4); meow_list_set_scroll(g_dlc, 20);
d_redraw(g_dlc, r_list);
int dx = r_list.x + 10, dy_ = r_list.y + r_list.h + 5; /* 列表底下方 5px */
int dr, dg, db; rd_px(dx, dy_, &dr, &dg, &db);
printf("P3 bot-leak "); pr_px("below-bottom", dx, dy_);
if (is_bg(dr, dg, db)) printf(" P3-bottom-PASS no leak below list\n");
else { printf(" P3-bottom-FAIL leaked below list\n"); fails++; }
printf(fails ? "\nRESULT: %d FAIL(S)\n" : "\nRESULT: ALL PASS\n", fails);
return fails;
}