diff --git a/hello b/hello index 4b98a74..3c6fc5f 100755 Binary files a/hello and b/hello differ diff --git a/hello.c b/hello.c index 388a014..4d4e87c 100644 --- a/hello.c +++ b/hello.c @@ -369,16 +369,46 @@ static void demo_rebuild_to(int scroll) demo_paint(); } -/* 局部刷新一个控件:清底 + 重画 + flush 其几何矩形(App 自记 rect) */ -static void d_redraw(meow_widget *w, rect_t r) +/* 两矩形是否相交(P1:局部重绘时判定哪些控件落在该区) */ +static int d_rect_overlap(rect_t a, rect_t b) { - if (!w) return; + return a.x < b.x + b.w && a.x + a.w > b.x && a.y < b.y + b.h && a.y + a.h > b.y; +} + +/* 局部刷新一个区域:清底 + 按 demo_paint 同序重画「落在该区的所有控件/文本/chrome」,再 flush。 + * 根治 P1:旧 d_redraw 只清底 + 重画单个控件,会把重叠区里上层控件(chrome 如 FAB/导航栏) + * 一并清掉、只刷单个控件矩形 → 下层动态控件(如圆形进度条实时重绘)盖住/抹掉上层浮层。 + * 修法:局部刷新=重画该区内完整 z 栈(内容→标题→slider 值→chrome,与整帧 paint 一致), + * 下层动态重绘不再抹掉上层。仍是局部(只画相交控件,不整帧、不冲状态栏)。 */ +static void d_paint_region(rect_t r) +{ + if (r.w <= 0 || r.h <= 0) return; const meow_theme *th = meow_theme_get(); meow_ui_fill_rect(r.x, r.y, r.w, r.h, th->bg); - meow_widget_draw(w); + for (int i = 0; i < g_dslot_n; i++) + if (d_rect_overlap(g_dslot[i].r, r)) meow_widget_draw(g_dslot[i].w); + for (int i = 0; i < g_dtitle_n; i++) + if (g_dtitle[i].y < r.y + r.h && g_dtitle[i].y + meow_ui_text_height(20) > r.y && + g_dtitle[i].x < r.x + r.w && g_dtitle[i].x + meow_ui_text_width(g_dtitle[i].s, 20) > r.x) + meow_ui_text(g_dtitle[i].x, g_dtitle[i].y, g_dtitle[i].s, 20, th->primary); + if (g_dslider && d_rect_overlap(r_slider_txt, r)) { + char buf[28]; snprintf(buf, sizeof buf, "slider = %d", meow_slider_get(g_dslider)); + meow_ui_text(r_slider_txt.x, r_slider_txt.y, buf, 20, th->dim); + } + /* chrome(固定;后画保证覆盖内容区溢出) */ + if (d_rect_overlap(r_tb, r)) meow_widget_draw(g_tb); + if (d_rect_overlap(r_nav, r)) meow_widget_draw(g_nav); + if (d_rect_overlap(r_fab, r)) meow_widget_draw(g_fab); meow_ui_flush_region(r.x, r.y, r.w, r.h); } +/* 局部刷新一个控件:整区清底 + 重画重叠 z 栈(w 仅用于取矩形;重画逻辑见 d_paint_region) */ +static void d_redraw(meow_widget *w, rect_t r) +{ + (void)w; + d_paint_region(r); +} + static void d_toggle_sel(meow_widget *w, rect_t r) { if (!w) return; @@ -433,8 +463,7 @@ static void demo_on_tap(int x, int y) char lb[16]; snprintf(lb, sizeof lb, "+%d", g_demo_fab); meow_widget_free(g_fab); g_fab = meow_fab_create(r_fab.x, r_fab.y, 56, lb); - meow_widget_draw(g_fab); - meow_ui_flush_region(r_fab.x, r_fab.y, r_fab.w, r_fab.h); + d_paint_region(r_fab); /* 重画 FAB 及其下重叠内容(z 序一致,防抹掉下层) */ return; } if (g_nav) { @@ -463,24 +492,24 @@ static void demo_slider_drag(int x) g_ds.slider = frac * 100 / r_slider.w; meow_slider_set(g_dslider, g_ds.slider); d_redraw(g_dslider, r_slider); - const meow_theme *th = meow_theme_get(); - char buf[28]; snprintf(buf, sizeof buf, "slider = %d", g_ds.slider); - meow_ui_fill_rect(r_slider_txt.x, r_slider_txt.y, r_slider_txt.w, r_slider_txt.h, th->bg); - meow_ui_text(r_slider_txt.x, r_slider_txt.y, buf, 20, th->dim); - meow_ui_flush_region(r_slider_txt.x, r_slider_txt.y, r_slider_txt.w, r_slider_txt.h); + d_paint_region(r_slider_txt); /* 重画 slider 值文本(z 序一致) */ } -/* demo 页 on_touch_down:锁一种拖拽(slider > list > 页内容)。非 demo 态跳过。 */ +/* demo 页 on_touch_down:锁一种拖拽(slider > list > 页内容)。非 demo 态跳过。 + * P2:滚动焦点按「本次触摸起作用的控件」绑定、抬手/命中其它区域即释放——命中非 list + * 区域时不再沿用「已聚焦列表」的旧焦点去滚列表,而是切到页/上一层滚动(否则滑完列表再 + * 滑页面,焦点仍在列表里继续滚列表,需额外点一下才出来)。 */ static void demo_touch_down(int x, int y) { g_drag_slider = 0; g_drag_list = 0; g_drag_page = 0; g_drag_page_delta = 0; if (!g_demo) return; if (meow_widget_hit(g_dslider, x, y)) { g_drag_slider = 1; demo_slider_drag(x); return; } - /* 命中列表,或「已聚焦列表」时(g_demo_focus=1)→ 拖动滚列表(与原 on_swipe 的焦点语义一致) */ - if (g_dlc && (meow_widget_hit(g_dlc, x, y) || g_demo_focus)) { + /* 命中列表 → 本次手势滚列表(焦点绑到列表) */ + if (g_dlc && meow_widget_hit(g_dlc, x, y)) { g_demo_focus = 1; g_drag_list = 1; g_drag_list_last_y = y; return; } - /* 页内容视口内非 slider/list:页面拖拽跟手(按钮亦视为可滚动起点,阈值由 SDK tap/swipe 分流) */ + /* 未命中列表 → 释放列表焦点,本次手势滚页面 */ + g_demo_focus = 0; if (y >= g_demo_ct && y < g_demo_cb && x >= 0 && x < meow_ui_width()) { g_drag_page = 1; g_drag_page_last_y = y; }