From d64a981ac138a5656d1ceadcd14a7f6beabc1fca Mon Sep 17 00:00:00 2001 From: Gabriel Wang Date: Wed, 8 Jan 2025 12:05:03 +0000 Subject: [PATCH] minor fix --- ARM.Arm-2D.pdsc | 4 ++-- examples/common/benchmark/benchmark_watch_panel.c | 2 +- examples/common/controls/progress_bar_flowing.c | 11 ++--------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ARM.Arm-2D.pdsc b/ARM.Arm-2D.pdsc index 4239e97f..f8005c6c 100644 --- a/ARM.Arm-2D.pdsc +++ b/ARM.Arm-2D.pdsc @@ -453,7 +453,7 @@ - + A set of example controls, e.g. round-corner-box, spinning-wheels etc @@ -565,7 +565,7 @@ - + A watch-panel benchmark for arm-2d. diff --git a/examples/common/benchmark/benchmark_watch_panel.c b/examples/common/benchmark/benchmark_watch_panel.c index 2e5dcf2f..45bdd1e9 100644 --- a/examples/common/benchmark/benchmark_watch_panel.c +++ b/examples/common/benchmark/benchmark_watch_panel.c @@ -408,7 +408,7 @@ void benchmark_watch_panel_draw(const arm_2d_tile_t *ptTile, bool bIsNewFrame) progress_bar_flowing_show( ptTile, &__bottom_centre_region, - 0, + -1, bIsNewFrame, GLCD_COLOR_BLACK, __RGB(0x92, 0xD0, 0x50), diff --git a/examples/common/controls/progress_bar_flowing.c b/examples/common/controls/progress_bar_flowing.c index e13e02af..58a23a7e 100644 --- a/examples/common/controls/progress_bar_flowing.c +++ b/examples/common/controls/progress_bar_flowing.c @@ -147,11 +147,8 @@ void __progress_bar_flowing_show( const arm_2d_tile_t *ptTarget, } //! draw a white box - arm_2d_fill_colour( ptTarget, - &tBarRegion, - //__RGB(0xa5, 0xc6, 0xef)/*0xA63D*/ - tBoarderColour); - + arm_2d_helper_draw_box(ptTarget, &tBarRegion, 1, tBoarderColour, 255); + ARM_2D_OP_WAIT_ASYNC(); //! pave inter texture @@ -159,10 +156,6 @@ void __progress_bar_flowing_show( const arm_2d_tile_t *ptTarget, tBarRegion.tSize.iWidth-=2; tBarRegion.tLocation.iX += 1; tBarRegion.tLocation.iY += 1; - - arm_2d_fill_colour(ptTarget, &tBarRegion, GLCD_COLOR_WHITE); - - ARM_2D_OP_WAIT_ASYNC(); if (iProgress >= 0) { //! calculate the width of the inner stripe