mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-21 06:53:01 +08:00
Merge branch 'master' into dev-6.0
This commit is contained in:
commit
0b53f0f9ed
@ -14,14 +14,24 @@ But first, start with the most Frequently Asked Questions.
|
|||||||
|
|
||||||
## FAQ about contributing
|
## FAQ about contributing
|
||||||
|
|
||||||
### Where can I write my question and remarks?
|
### What license does my code need to be under?
|
||||||
|
|
||||||
We use [GitHub's issue tracker](https://github.com/littlevgl/lvgl/issues) to ask questions., report bugs and suggest features. But there are some simple rules:
|
Any code added to LittlevGL must be licensed under [MIT](https://choosealicense.com/licenses/mit/) or another license that is fully compatible. Contributions under other licenses are highly likely to be rejected.
|
||||||
|
|
||||||
|
If you borrow code from another project, please make sure to add their copyright notice to your contribution.
|
||||||
|
|
||||||
|
### Where do I ask questions, give feedback, or report bugs?
|
||||||
|
|
||||||
|
We use the [forum](http://forum.littlevgl.com/) for questions, feature suggestions, and discussions.
|
||||||
|
|
||||||
|
We use [GitHub's issue tracker](https://github.com/littlevgl/lvgl/issues) to report bugs.
|
||||||
|
|
||||||
|
For both of these there are some rules:
|
||||||
- Be kind and friendly.
|
- Be kind and friendly.
|
||||||
- Speak about one thing in one issue.
|
- Speak about one thing in one issue.
|
||||||
- Give feedback and close the issue if your question is answered.
|
- Give feedback and close the issue if your question is answered.
|
||||||
- Tell what you experience or expect. _"The button is not working"_ is not enough info to get help.
|
- Explain exactly what you experience or expect. _"The button is not working"_ is not enough info to get help.
|
||||||
- If possible send an absolute minimal code example in order to reproduce the issue
|
- For most issues you should send an absolute minimal code example in order to reproduce the issue. Ideally this should be easily usable in the PC simulator.
|
||||||
- Use [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) to format your post.
|
- Use [Markdown](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) to format your post.
|
||||||
- If you don't get any answer in a week write a comment like "Can somebody help?". Maybe your issue wasn't noticed.
|
- If you don't get any answer in a week write a comment like "Can somebody help?". Maybe your issue wasn't noticed.
|
||||||
|
|
||||||
@ -30,7 +40,7 @@ Merging new code happens via Pull Requests. If you are still not familiar with t
|
|||||||
1. **Fork** the [lvgl repository](https://github.com/littlevgl/lvgl). To do this click the "Fork" button in the top right corner. It will "copy" the `lvgl` repository to your GitHub account (`https://github.com/your_name?tab=repositories`)
|
1. **Fork** the [lvgl repository](https://github.com/littlevgl/lvgl). To do this click the "Fork" button in the top right corner. It will "copy" the `lvgl` repository to your GitHub account (`https://github.com/your_name?tab=repositories`)
|
||||||
2. **Clone** the forked repository and add your updates
|
2. **Clone** the forked repository and add your updates
|
||||||
3. **Create a PR** on the GitHub on the page of you `lvgl` repository(`https://github.com/your_name/lvgl`) by hitting the "New pull request" button
|
3. **Create a PR** on the GitHub on the page of you `lvgl` repository(`https://github.com/your_name/lvgl`) by hitting the "New pull request" button
|
||||||
4. **Set the base branch**. It means where you want to merge your update. Fixes go to `master`, new features to the actual `dev-x.y` branch.
|
4. **Set the base branch**. It means where you want to merge your update. Bugfixes for the last release go to `master`, new features to the actual `dev-x.y` branch.
|
||||||
5. **Describe** what is in the update. An example code is welcome if applicable.
|
5. **Describe** what is in the update. An example code is welcome if applicable.
|
||||||
|
|
||||||
Some advice:
|
Some advice:
|
||||||
|
@ -184,7 +184,7 @@ void lv_ddlist_set_selected(lv_obj_t * ddlist, uint16_t sel_opt)
|
|||||||
if(ext->sel_opt_id == sel_opt) return;
|
if(ext->sel_opt_id == sel_opt) return;
|
||||||
|
|
||||||
ext->sel_opt_id = sel_opt < ext->option_cnt ? sel_opt : ext->option_cnt - 1;
|
ext->sel_opt_id = sel_opt < ext->option_cnt ? sel_opt : ext->option_cnt - 1;
|
||||||
|
ext->sel_opt_id_ori = ext->sel_opt_id;
|
||||||
/*Move the list to show the current option*/
|
/*Move the list to show the current option*/
|
||||||
if(ext->opened == 0) {
|
if(ext->opened == 0) {
|
||||||
lv_ddlist_pos_current_option(ddlist);
|
lv_ddlist_pos_current_option(ddlist);
|
||||||
|
@ -238,7 +238,7 @@ void lv_tileview_set_tile_act(lv_obj_t * tileview, lv_coord_t x, lv_coord_t y, b
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
lv_obj_set_size(tileview, x_coord, y_coord);
|
lv_obj_set_pos(scrl, x_coord, y_coord);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user