Jinhao
|
68c6e67d08
|
Merge branch 'qPCR4vir-cmake-dev' into develop-1.7
|
2018-10-03 01:33:53 +08:00 |
|
qPCR4vir
|
6355d9ac7e
|
Fontconfig scripts from https://github.com/cnjinhao/nana/pull/278
|
2018-10-02 18:50:49 +02:00 |
|
qPCR4vir
|
2e6a85bf89
|
reorganize cmake in small scripts with some fix from https://github.com/cnjinhao/nana/pull/278
|
2018-10-02 18:47:04 +02:00 |
|
qPCR4vir
|
b430f82855
|
delete files for deprecated Biicode
|
2018-10-02 18:40:27 +02:00 |
|
qPCR4vir
|
dc666a893f
|
Merge remote-tracking branch 'KingDuckZ/develop' into merge-KingDuckZ
# Conflicts:
# CMakeLists.txt
|
2018-10-02 09:31:14 +02:00 |
|
qPCR4vir
|
4f42041388
|
fix definition of boolean in jpeg by default
|
2018-10-01 19:55:06 +02:00 |
|
qPCR4vir
|
2e0bf06dcb
|
trying to fix a definition duplication of boolean window.h vs jpeg
|
2018-10-01 19:37:33 +02:00 |
|
qPCR4vir
|
8c8adb397e
|
target_link_libraries
|
2018-10-01 19:04:12 +02:00 |
|
qPCR4vir
|
65d2440e26
|
Merge remote-tracking branch 'cnjinhao/develop-1.7' into cmake-dev
|
2018-10-01 11:39:04 +02:00 |
|
Jinhao
|
f09e9bcf43
|
small changes
|
2018-10-01 11:47:33 +08:00 |
|
Jinhao
|
d925be809b
|
Merge branch 'hotfix-1.6.2' into develop-1.7
|
2018-10-01 11:40:41 +08:00 |
|
Jinhao
|
b6028f8079
|
fix bug that font is missing when measure a zero-sized label
|
2018-10-01 07:43:57 +08:00 |
|
Jinhao
|
2c3d75c709
|
fix bug of C++ feature detection(#338)
|
2018-09-25 02:07:15 +08:00 |
|
Jinhao
|
7fea766f99
|
fix bug that causes dead-lock under Linux
|
2018-09-22 00:37:36 +08:00 |
|
Jinhao
|
bbe2aca483
|
fix bug that treebox.scroll_into_view() generated a wrong position
|
2018-09-21 01:47:34 +08:00 |
|
Jinhao
|
284a153be0
|
fix bug that treebox scroll_into_view wrongly calcuates a position
|
2018-09-19 22:37:24 +08:00 |
|
Jinhao
|
361bcbc81f
|
Merge branch 'hotfix-1.6.2' into develop-1.7
|
2018-09-18 00:49:26 +08:00 |
|
Jinhao
|
a41eb44714
|
fix bug that label uses all ram when its width is zero.
|
2018-09-17 07:48:23 +08:00 |
|
Jinhao
|
ee4bba1bee
|
Merge branch 'hotfix-1.6.2' into develop-1.7
|
2018-09-16 23:15:38 +08:00 |
|
Jinhao
|
2de08f8f9f
|
add move-semantics and delete copy-ctor/assignment for animation
|
2018-09-13 07:27:50 +08:00 |
|
qPCR4vir
|
df1059d297
|
cmake_print_variables (NANA_CMAKE_INSTALL)
|
2018-09-11 16:32:24 +02:00 |
|
Jinhao
|
4cca88e0f3
|
Merge branch 'hotfix-1.6.2' into develop-1.7
|
2018-09-11 07:48:16 +08:00 |
|
Jinhao
|
aac9ef525a
|
fix crash when close owner window
window position issue makes popup menu at wrong position
|
2018-09-11 07:34:25 +08:00 |
|
qPCR4vir
|
1821f3018e
|
travis calls nana-demo directly
|
2018-09-10 14:44:42 +02:00 |
|
qPCR4vir
|
8c6b0d4653
|
simplify CMakeList with cmake scripts
|
2018-09-10 14:27:56 +02:00 |
|
qPCR4vir
|
8057bf95e1
|
use NANA_CMAKE_INSTALL
|
2018-09-09 11:49:30 +02:00 |
|
qPCR4vir
|
8e7985e0e3
|
fixing travis
|
2018-09-09 02:06:06 +02:00 |
|
qPCR4vir
|
4f11de3d60
|
fixing travis
|
2018-09-09 01:55:21 +02:00 |
|
qPCR4vir
|
ba530b8377
|
fixing travis
|
2018-09-09 01:37:21 +02:00 |
|
qPCR4vir
|
88b0206016
|
target_include_directories INTERFACE ${CMAKE_INSTALL_PREFIX}/include)?
|
2018-09-09 01:25:43 +02:00 |
|
Jinhao
|
074b96a05a
|
add new overloading of scroll_into_view for treebox
|
2018-09-09 05:52:59 +08:00 |
|
Jinhao
|
c1b88c430a
|
add new scroll_into_view() for treebox
|
2018-09-08 18:01:48 +08:00 |
|
qPCR4vir
|
b58f4ddc9f
|
Merge remote-tracking branch 'origin/CMake' into CMake
|
2018-09-07 15:09:41 +02:00 |
|
qPCR4vir
|
6fab0f5354
|
simplify cmake usage by nana-demo including nana
|
2018-09-06 13:12:46 +02:00 |
|
qPCR4vir
|
de2ec3928d
|
modernize CMakeList and make it posible to just include nana
|
2018-09-06 10:49:54 +02:00 |
|
qPCR4vir
|
3e19326421
|
Merge remote-tracking branch 'cnjinhao/hotfix-1.6.2' into CMake
|
2018-09-03 13:30:54 +02:00 |
|
Jinhao
|
8d22ff3b51
|
Merge branch 'hotfix-1.6.2' into develop
|
2018-09-02 08:09:46 +08:00 |
|
Jinhao
|
986c635548
|
refactoring label
|
2018-09-02 07:49:43 +08:00 |
|
qPCR4vir
|
80968f3569
|
Merge remote-tracking branch 'cnjinhao/hotfix-1.6.2' into CMake
|
2018-09-01 00:24:33 +02:00 |
|
Jinhao
|
745a228dae
|
refine the label
|
2018-08-31 06:27:47 +08:00 |
|
Jinhao
|
93bbdb4a88
|
fix bug that a linkage error caused by VC2017v15.8
|
2018-08-31 01:21:45 +08:00 |
|
qPCR4vir
|
0309e79701
|
FIX using newer Boost
TODO use std::filesystem not experimental
|
2018-08-30 15:05:40 +02:00 |
|
Jinhao
|
dbd8a4a691
|
Merge branch 'develop'
|
2018-08-29 05:18:42 +08:00 |
|
qPCR4vir
|
4ba35bd323
|
Merge branch 'develop' into CMake
|
2018-08-28 14:54:09 +02:00 |
|
qPCR4vir
|
8afbc29302
|
Merge branch 'hotfix-1.6.1' into develop
|
2018-08-28 14:53:58 +02:00 |
|
qPCR4vir
|
e0b9e19c1c
|
Merge remote-tracking branch 'jinhao/hotfix-1.6.1' into hotfix-1.6.1
|
2018-08-28 10:40:40 +02:00 |
|
Jinhao
|
852aa698ed
|
Merge branch 'hotfix-1.6.1' into develop
|
2018-08-28 07:36:51 +08:00 |
|
Jinhao
|
1145e3d5cd
|
fix crash that occurs when rendering an empty label(#333)
|
2018-08-28 07:31:05 +08:00 |
|
qPCR4vir
|
d4c9a3f640
|
Merge branch 'develop' into CMake
|
2018-08-27 11:55:16 +02:00 |
|
qPCR4vir
|
fa85855ac5
|
Merge branch 'hotfix-1.6.1' into develop
|
2018-08-27 11:54:54 +02:00 |
|