From 2c886537e9ca0877159667d65751ae0263c28da7 Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Fri, 7 May 2021 15:46:31 -0400 Subject: [PATCH 1/3] chore(docs) specify concurrency to avoid potential race condition --- .github/workflows/compile_docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compile_docs.yml b/.github/workflows/compile_docs.yml index aadd2dbf4..c51367c8d 100644 --- a/.github/workflows/compile_docs.yml +++ b/.github/workflows/compile_docs.yml @@ -62,6 +62,7 @@ jobs: id: version - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1 + concurrency: docs-push with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ACCESS_TOKEN: ${{ secrets.LVGL_BOT_TOKEN }} From 241a0bead8f318b212b9eb6e86f2564c3e077516 Mon Sep 17 00:00:00 2001 From: guoweilkd <35251456+guoweilkd@users.noreply.github.com> Date: Sat, 8 May 2021 21:15:51 +0800 Subject: [PATCH 2/3] docs(coords) fix spelling errors (#2244) Co-authored-by: guowei15 --- docs/overview/coords.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/overview/coords.md b/docs/overview/coords.md index 33fe42572..4e994ab0a 100644 --- a/docs/overview/coords.md +++ b/docs/overview/coords.md @@ -102,7 +102,7 @@ lv_obj_set_x(btn, lv_pct(10)); //x = 10 % of parant content area width ``` ### Align -In some cases it's convenient to change the origin of the positioning from the the default top left. If the the orogin is changed e.g. to bottom-right, the (0,0) position means: align to the bottom-right corner. +In some cases it's convenient to change the origin of the positioning from the the default top left. If the origin is changed e.g. to bottom-right, the (0,0) position means: align to the bottom-right corner. To change the origin use: ```c lv_obj_set_align(obj, align); @@ -171,13 +171,13 @@ lv_obj_set_height(obj, 100); lv_obj_set_size(obj, 200, 100); //Or in one function ``` -Percentage values aer calculated based on the parent's content area size. For example to set the object's height to the screen height: +Percentage values are calculated based on the parent's content area size. For example to set the object's height to the screen height: ```c lv_obj_set_height(obj, lv_pct(100)); ``` Size setting supports a value: `LV_SIZE_CONTENT`. It means the object's size in the respective direction will be set to involve its the children. -Note that only children on the right and bottom will be considered and children o nthe top and left remains cropped. This limitation makes the behavior more predictable. +Note that only children on the right and bottom will be considered and children on the top and left remains cropped. This limitation makes the behavior more predictable. Object with `LV_OBJ_FLAG_HIDDEN` or `LV_OBJ_FLAG_FLOATING` will be ignored by `LV_SIZE_CONTENT` calculation. From 918db238403f23b010a15c10a4e5dba5c72d5eb0 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 8 May 2021 20:34:16 -0400 Subject: [PATCH 3/3] chore(docs) specify concurrency at job level --- .github/workflows/compile_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compile_docs.yml b/.github/workflows/compile_docs.yml index c51367c8d..ed2d8dd23 100644 --- a/.github/workflows/compile_docs.yml +++ b/.github/workflows/compile_docs.yml @@ -10,6 +10,7 @@ jobs: build-and-deploy: if: github.repository == 'lvgl/lvgl' runs-on: ubuntu-latest + concurrency: docs-build-and-deploy steps: - name: Checkout uses: actions/checkout@v2 @@ -62,7 +63,6 @@ jobs: id: version - name: Deploy uses: JamesIves/github-pages-deploy-action@3.7.1 - concurrency: docs-push with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} ACCESS_TOKEN: ${{ secrets.LVGL_BOT_TOKEN }}