Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: lc-soft/LCUI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: cccvt/LCUI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Oct 3, 2019

  1. Copy the full SHA
    88f8728 View commit details
  2. Copy the full SHA
    16778f0 View commit details
  3. Copy the full SHA
    de3bbc0 View commit details
  4. Copy the full SHA
    f673434 View commit details
  5. build: update version info

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    dddb81f View commit details
  6. test: remove LoggerHandler()

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    2cbbb11 View commit details
  7. Copy the full SHA
    3cefc02 View commit details
  8. Copy the full SHA
    d0be8bf View commit details
  9. Copy the full SHA
    65154a1 View commit details
  10. test: format code style

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    9785cf3 View commit details
  11. Copy the full SHA
    208c536 View commit details
  12. feat: add LCUI_GetVersion()

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    d9db927 View commit details
  13. Copy the full SHA
    68236bd View commit details
  14. Copy the full SHA
    6fb3cef View commit details
  15. Copy the full SHA
    a94fc08 View commit details
  16. Copy the full SHA
    c5940ce View commit details
  17. test: remove png file output

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    423859d View commit details
  18. Copy the full SHA
    5d78daf View commit details
  19. Copy the full SHA
    3799435 View commit details
  20. Copy the full SHA
    bc76fb8 View commit details
  21. Copy the full SHA
    dc1e902 View commit details
  22. docs: update README.md

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    42126f5 View commit details
  23. build(deps): bump js-yaml from 3.12.2 to 3.13.1 (#178)

    Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.2 to 3.13.1.
    - [Release notes](https://github.com/nodeca/js-yaml/releases)
    - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
    - [Commits](nodeca/js-yaml@3.12.2...3.13.1)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and lc-soft committed Oct 3, 2019
    Copy the full SHA
    8ae9971 View commit details
  24. build(deps): bump lodash from 4.17.11 to 4.17.15 (#179)

    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](lodash/lodash@4.17.11...4.17.15)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored and lc-soft committed Oct 3, 2019
    Copy the full SHA
    4cb9de3 View commit details
  25. Copy the full SHA
    a7d014f View commit details
  26. Copy the full SHA
    f9d11c6 View commit details
  27. Copy the full SHA
    9761307 View commit details
  28. chore: add FIXME comments

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    c06dbc2 View commit details
  29. ci: remove apt update

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    dcf9255 View commit details
  30. ci: remove notifications

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    ae5afea View commit details
  31. feat(gui): add Widget_Each()

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    826695e View commit details
  32. Copy the full SHA
    7712b09 View commit details
  33. Copy the full SHA
    7348725 View commit details
  34. docs: add lcui-cli usage

    lc-soft committed Oct 3, 2019
    Copy the full SHA
    0ca7c24 View commit details
  35. Copy the full SHA
    3b0f01a View commit details
  36. Copy the full SHA
    0d9d499 View commit details

Commits on Oct 5, 2019

  1. Copy the full SHA
    1af38c8 View commit details
  2. Copy the full SHA
    3fd16c6 View commit details
  3. Copy the full SHA
    982e3c4 View commit details
  4. Copy the full SHA
    4258c58 View commit details
  5. Copy the full SHA
    a9d2eb0 View commit details
Showing with 4,229 additions and 2,043 deletions.
  1. +1 −0 .gitignore
  2. +3 −13 .travis.yml
  3. +8 −0 .vscode/settings.json
  4. +76 −0 CODE_OF_CONDUCT.md
  5. +53 −0 CODE_OF_CONDUCT.zh-cn.md
  6. +17 −4 Makefile.am
  7. +235 −61 README.md
  8. +251 −75 README.zh-cn.md
  9. +0 −4 build/Makefile.am
  10. +24 −0 build/windows/LCUI-Demo.sln
  11. +4 −4 build/windows/LCUI/LCUI.vcxproj
  12. +4 −4 build/windows/LCUI/LCUI.vcxproj.user
  13. +0 −1 build/windows/LCUITest/LCUITest.vcxproj
  14. +0 −3 build/windows/LCUITest/LCUITest.vcxproj.filters
  15. +32 −14 build/windows/LCUIUWP/LCUIUWP.vcxproj
  16. +38 −0 build/windows/LCUIUWP/LCUIUWP.vcxproj.filters
  17. +26 −8 build/windows/LCUIUWPApp/LCUIUWPApp.vcxproj
  18. +187 −0 build/windows/test_border/test_border.vcxproj
  19. +32 −0 build/windows/test_border/test_border.vcxproj.filters
  20. +198 −0 build/windows/test_box_shadow/test_box_shadow.vcxproj
  21. +28 −0 build/windows/test_box_shadow/test_box_shadow.vcxproj.filters
  22. +192 −0 build/windows/test_string_render/test_string_render.vcxproj
  23. +22 −0 build/windows/test_string_render/test_string_render.vcxproj.filters
  24. +14 −12 configure.ac
  25. +5 −0 debian/changelog
  26. +1 −0 debian/compat
  27. +23 −0 debian/control
  28. +24 −0 debian/copyright
  29. +2 −0 debian/lcui-dev.dirs
  30. +4 −0 debian/lcui-dev.install
  31. +1 −0 debian/lcui-docs.docs
  32. +1 −0 debian/lcui1.dirs
  33. +1 −0 debian/lcui1.install
  34. +25 −0 debian/rules
  35. +1 −0 debian/source/format
  36. +2 −1 include/LCUI/Makefile.am
  37. +40 −0 include/LCUI/config.win32.h.in
  38. +5 −2 include/LCUI/draw/border.h
  39. +4 −24 include/LCUI/draw/boxshadow.h
  40. +23 −15 include/LCUI/graph.h
  41. +50 −43 include/LCUI/gui/css_parser.h
  42. +2 −1 include/LCUI/gui/widget/Makefile.am
  43. +3 −0 include/LCUI/gui/widget_base.h
  44. +3 −0 include/LCUI/gui/widget_helper.h
  45. +4 −0 include/LCUI/gui/widget_tree.h
  46. +1 −1 include/LCUI/main.h
  47. +44 −48 include/LCUI/platform.h
  48. +5 −9 include/LCUI/thread.h
  49. +8 −5 include/LCUI/types.h
  50. +3 −6 include/LCUI/util/dirent.h
  51. +3 −3 include/LCUI/util/object.h
  52. +6 −0 include/LCUI/util/rect.h
  53. +8 −23 include/LCUI_Build.h
  54. +1 −1 include/Makefile.am
  55. +12 −3 lcpkg.json
  56. +137 −0 lcpkg/ports/libxml2-lite/CMakeLists.txt
  57. +6 −6 package-lock.json
  58. +17 −0 scripts/make-dist-deb.sh
  59. +1 −7 src/Makefile.am
  60. +17 −2 src/display.c
  61. +679 −507 src/draw/border.c
  62. +519 −513 src/draw/boxshadow.c
  63. +5 −4 src/font/fontlibrary.c
  64. +2 −2 src/font/freetype.c
  65. +1 −2 src/graph.c
  66. +1 −0 src/gui/builder.c
  67. +55 −38 src/gui/css_fontstyle.c
  68. +4 −0 src/gui/css_library.c
  69. +119 −109 src/gui/css_parser.c
  70. +20 −13 src/gui/widget/scrollbar.c
  71. +17 −3 src/gui/widget/textedit.c
  72. +38 −21 src/gui/widget_border.c
  73. +31 −22 src/gui/widget_event.c
  74. +18 −0 src/gui/widget_helper.c
  75. +67 −84 src/gui/widget_paint.c
  76. +1 −0 src/gui/widget_prototype.c
  77. +25 −8 src/gui/widget_shadow.c
  78. +2 −2 src/gui/widget_style.c
  79. +22 −3 src/gui/widget_tree.c
  80. +1 −0 src/image/jpeg.c
  81. +1 −0 src/image/png.c
  82. +1 −0 src/image/reader.c
  83. +6 −0 src/main.c
  84. +1 −1 src/platform/linux/linux_display.c
  85. +1 −0 src/platform/linux/linux_events.c
  86. +1 −0 src/platform/linux/linux_fbdisplay.c
  87. +1 −0 src/platform/linux/linux_ime.c
  88. +1 −0 src/platform/linux/linux_keyboard.c
  89. +1 −0 src/platform/linux/linux_mouse.c
  90. +9 −4 src/platform/linux/linux_x11display.c
  91. +1 −0 src/platform/linux/linux_x11events.c
  92. +1 −0 src/platform/linux/linux_x11keyboard.c
  93. +1 −0 src/platform/linux/linux_x11mouse.c
  94. +0 −1 src/platform/windows/uwp_app.cpp
  95. +1 −1 src/platform/windows/uwp_input.cpp
  96. +28 −23 src/thread/pthread/cond.c
  97. +2 −1 src/thread/pthread/mutex.c
  98. +43 −42 src/thread/pthread/thread.c
  99. +1 −0 src/thread/win32/cond.c
  100. +1 −0 src/thread/win32/mutex.c
  101. +1 −1 src/thread/win32/thread.c
  102. +2 −2 src/util/object.c
  103. +2 −1 src/util/parse.c
  104. +120 −58 src/util/rect.c
  105. +6 −2 test/Makefile.am
  106. +0 −1 test/test.c
  107. +2 −2 test/test.h
  108. +24 −0 test/test_border.c
  109. +47 −0 test/test_border.css
  110. +150 −0 test/test_border.xml
  111. +22 −0 test/test_box_shadow.c
  112. +46 −0 test/test_box_shadow.css
  113. +32 −0 test/test_box_shadow.xml
  114. +4 −20 test/test_image_scaling_bench.c
  115. +34 −54 test/test_scaling_support.c
  116. +6 −6 test/test_widget.c
  117. +0 −18 test/test_widget_opacity.c
  118. +56 −71 test/test_widget_rect.c
  119. +8 −0 test/valgrind-suppressions.txt
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -56,6 +56,7 @@ stamp-h1
Thumbs.db
m4/
bin/
build/debian
build/*/*.sdf
build/*/*.opensdf
build/*/*.suo
16 changes: 3 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
dist: trusty
dist: bionic
language: c
compiler:
- clang
- gcc

before_install:
- sudo apt-get update -qq
- sudo apt-get install valgrind libpng-dev libjpeg-dev libxml2-dev libfreetype6-dev libx11-dev lcov -qq
- pip install --user cpp-coveralls
- npm install
@@ -17,20 +16,11 @@ before_script:
script:
- ./configure --enable-code-coverage
- make
- make check
- make distcheck
- cd test
- make
- ./test
- valgrind --leak-check=full --error-exitcode=42 .libs/lt-test
- ../libtool --mode=execute valgrind --leak-check=full --error-exitcode=42 ./test

after_success:
- coveralls --gcov-options '\-lp'

notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/5b09ab7b7688f3152de0
- https://hook.bearychat.com/=bwASg/travis/5b13360858a94c2c3caa6a4ab2dca9e5
on_success: change
on_failure: always
on_start: never
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -20,6 +20,14 @@
"editor.tabSize": 2,
"editor.insertSpaces": true
},
"[xml]": {
"editor.tabSize": 2,
"editor.insertSpaces": true
},
"[css]": {
"editor.tabSize": 2,
"editor.insertSpaces": true
},
"files.associations": {
"unistd.h": "c",
"errno.h": "c",
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies within all project spaces, and it also applies when
an individual is representing the project or its community in public spaces.
Examples of representing a project or community include using an official
project e-mail address, posting via an official social media account, or acting
as an appointed representative at an online or offline event. Representation of
a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at root@lc-soft.io. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
53 changes: 53 additions & 0 deletions CODE_OF_CONDUCT.zh-cn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# 参与者公约

## 我们的保证

为了促进一个开放透明且友好的环境,我们作为贡献者和维护者保证:无论年龄、种族、民族、性别认同和表达(方式)、体型、身体健全与否、经验水平、国籍、个人表现、宗教或性别取向,参与者在我们项目和社区中都免于骚扰。

## 我们的标准

有助于创造正面环境的行为包括但不限于:

* 使用友好和包容性语言
* 尊重不同的观点和经历
* 耐心地接受建设性批评
* 关注对社区最有利的事情
* 友善对待其他社区成员

身为参与者不能接受的行为包括但不限于:

* 使用与性有关的言语或是图像,以及不受欢迎的性骚扰
* 捣乱/煽动/造谣的行为或进行侮辱/贬损的评论,人身攻击及政治攻击
* 公开或私下的骚扰
* 未经许可地发布他人的个人资料,例如住址或是电子地址
* 其他可以被合理地认定为不恰当或者违反职业操守的行为

## 我们的责任

项目维护者有责任为「可接受的行为」标准做出诠释,以及对已发生的不被接受的行为采取恰当且公平的纠正措施。

项目维护者有权利及责任去删除、编辑、拒绝与本行为标准有所违背的评论 (comments)、提交 (commits)、代码、wiki 编辑、问题 (issues) 和其他贡献,以及项目维护者可暂时或永久性的禁止任何他们认为有不适当、威胁、冒犯、有害行为的贡献者。

## 使用范围

当一个人代表该项目或是其社区时,本行为标准适用于其项目平台和公共平台。

代表项目或是社区的情况,举例来说包括使用官方项目的电子邮件地址、通过官方的社区媒体账号发布或线上或线下事件中担任指定代表。

该项目的呈现方式可由其项目维护者进行进一步的定义及解释。

## 强制执行

可以通过 root@lc-soft.io,来联系项目团队来举报滥用、骚扰或其他不被接受的行为。

任何维护团队认为有必要且适合的所有投诉都将进行审查及调查,并做出相对应的回应。项目小组有对事件回报者有保密的义务。具体执行的方针近一步细节可能会单独公布。

没有切实地遵守或是执行本行为标准的项目维护人员,可能会因项目领导人或是其他成员的决定,暂时或是永久地取消其参与资格。

## 来源

本行为标准改编自[贡献者公约][homepage], 版本 1.4 可参阅:https://www.contributor-covenant.org/zh-cn/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

有关此行为准则的常见问题的答案,请参阅:https://www.contributor-covenant.org/faq
21 changes: 17 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
AUTOMAKE_OPTIONS=foreign
SUBDIRS=src build include
SUBDIRS=src build include test
ACLOCAL_AMFLAGS=-I m4
pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = $(PACKAGE).pc

EXTRA_DIST=autogen.sh README README.zh-cn.md README.md LICENSE.TXT \
CHANGELOG.md \
CHANGELOG.zh-cn.md \
debian/compat \
debian/lcui-dev.install \
debian/control \
debian/copyright \
debian/source \
debian/source/format \
debian/rules \
debian/changelog \
debian/lcui-dev.dirs \
debian/lcui-docs.docs \
debian/lcui1.install \
debian/lcui1.dirs \
docs/CodingStyle.zh-cn.md \
test/valgrind-suppressions.txt \
test/README.zh-cn \
test/Makefile.in \
test/Makefile.am \
@@ -28,6 +40,7 @@ test/test_css_parser.css \
test/test_css_parser.xml \
test/test_css_parser.c \
test/test_xml_parser.xml \
test/test_xml_parser.nested.xml \
test/test_xml_parser.c \
test/test_font_load.c \
test/test_font_load.css \
@@ -53,11 +66,11 @@ test/test_widget_inline_block_layout.css \
test/test_widget_inline_block_layout.xml \
test/test_widget_rect.c \
test/test_textview_resize.c \
test/text_textedit.c
test/test_textedit.c

.PHONY: test

test:
cd test && make && ./test && valgrind --leak-check=full --error-exitcode=42 .libs/lt-test
cd test && make && ../libtool --mode=execute valgrind --suppressions="valgrind-suppressions.txt" --leak-check=full --error-exitcode=42 ./test

@CODE_COVERAGE_RULES@
Loading