2177 Commits

Author SHA1 Message Date
Jinhao
bbc2dc2aea rename pixels() to width_px() 2017-11-22 00:29:09 +08:00
Jinhao
b71427334a listbox header font 2017-11-21 17:20:47 +08:00
Jinhao
14cc7cdaa1 fix issue that progress is incorrect when it is resized 2017-11-19 07:04:34 +08:00
Jinhao
77f7bdb37c fix bug that a font lapse after widget resizes 2017-11-14 02:06:48 +08:00
King_DuckZ
b713b01dbe Fix missing closing brace. 2017-11-10 00:49:46 +00:00
King_DuckZ
97297ae511 Fix cmake warning. 2017-11-10 00:46:08 +00:00
King_DuckZ
b9946f2624 Fix up some wrong parts I missed to conform with the rest of my changes. 2017-11-10 00:29:07 +00:00
King_DuckZ
32e6ee532c Fix build after rebase. 2017-11-10 00:16:50 +00:00
King_DuckZ
309a95d321 Maybe not needed anymore? 2017-11-10 00:10:11 +00:00
King_DuckZ
d3f5577625 These need be set *before* find_package, or it will be too late. 2017-11-10 00:10:11 +00:00
King_DuckZ
b5c69dc386 Use target_compile_definitions instead of add_definitions.
This allows macro definitions to be inherited. There might
be symbols that can be made private.
This is likely breaking the build on non-linux systems.
2017-11-10 00:10:11 +00:00
King_DuckZ
7f35b240b5 Remove the NANA_LINKS variable since it's not tracking what's really happening anymore. 2017-11-10 00:09:08 +00:00
King_DuckZ
bfba8fa233 Fix typo 2017-11-10 00:07:46 +00:00
King_DuckZ
872ed69519 Whitespace changes 2017-11-10 00:07:36 +00:00
King_DuckZ
a09d23210f Use target_include_directories instead of include_directories.
Also change the linked libraries where necessary and link
to fontconfig, which fixes my build error.
2017-11-10 00:06:57 +00:00
King_DuckZ
00c923df8f Use target_compile_features instead of setting CXX_STANDARD.
This allows child projects to just link to nana and automatically
inherit the -std=c++14 setting. Minimum cmake version for this
to work is 3.1.
2017-11-10 00:01:58 +00:00
Jinhao
60c85cff52 refactor picture widget 2017-11-06 05:56:08 +08:00
Jinhao
3dc7e3ae5b fix bug where picture throws if image is empty 2017-11-02 17:55:14 +08:00
Jinhao
74f5a8f40b fix caret issue 2017-11-02 16:36:23 +08:00
Jinhao
0796c1540b fix issue that listbox scheme mouse_wheel.lines has no effect 2017-11-01 11:57:52 +08:00
Jinhao
e5dc98bf4e Merge branch 'cjacker-xim_cursor_follow' into hotfix-1.5.5 2017-10-29 02:17:59 +08:00
Jinhao
2df2b21830 Merge branch 'xim_cursor_follow' of https://github.com/cjacker/nana into cjacker-xim_cursor_follow 2017-10-29 02:17:26 +08:00
Jinhao
c230f084ea Merge branch 'qPCR4vir-hotfix-1.5.5' into hotfix-1.5.5 2017-10-29 02:14:29 +08:00
Jinhao
f2e7a4c044 Merge branch 'hotfix-1.5.5' of https://github.com/qPCR4vir/nana into qPCR4vir-hotfix-1.5.5 2017-10-29 02:13:30 +08:00
Jinhao
a57c7ac409 Merge branch 'qPCR4vir-dev' into develop 2017-10-29 02:05:00 +08:00
Cjacker
b7ad2d99e0 Also need to check addr 2017-10-25 15:29:29 +08:00
Cjacker
9379f19c19 Use tab instead of space to match original source format 2017-10-25 15:09:09 +08:00
Cjacker
7c7b0333d4 Fix input method cursor follow issue under X11 2017-10-25 15:03:21 +08:00
qPCR4vir
708152ed78 FEATURE: use width and height instead of weight 2017-10-20 02:11:39 +02:00
qPCR4vir
97ca4ac3de add h file into project for convenient IDE browsing 2017-10-20 02:10:31 +02:00
qPCR4vir
d889db7c1e Merge remote-tracking branch 'cnjinhao/develop' into develop 2017-10-20 02:08:36 +02:00
Jinhao
94ab3b9f78 fix bug that dropdown list of combox may excess screen 2017-10-20 04:19:35 +08:00
qPCR4vir
cff3ec58d4 Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.5 2017-10-19 22:19:11 +02:00
Jinhao
24bbfc6493 small changes 2017-10-17 06:49:39 +08:00
Jinhao
99a0cd2f8d fix issue that listbox selected event behaves incorrectly in single mode
In single selection mode, the selected event is firstly raised for the
deselecting item. It is different from the selected event in
multi-selection mode.
2017-10-17 03:35:04 +08:00
Jinhao
3ce374f010 Merge branch 'frostbane-feature/shared_library' into develop 2017-10-15 08:49:07 +08:00
qPCR4vir
2ccfda24d0 Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.5 2017-10-10 14:39:31 +02:00
Ac
b486823177 add cmake option for dynamic linking 2017-10-05 09:59:32 +09:00
Jinhao
9b8cc1018e Merge branch 'frostbane-feature/gcc_std_thread' into develop 2017-10-04 19:22:22 +08:00
Jinhao
b730f368a4 fix syntax errors 2017-09-30 07:29:27 +08:00
Jinhao
28e9bb8a7d fix some legacy issues 2017-09-30 07:19:15 +08:00
Ac
d86a8cfad2 use std::thread if gcc is compiled with c++11 threading support
NANA_CMAKE_ENABLE_MINGW_STD_THREADS_WITH_MEGANZ option must still be enabled but mingw.thread.h and mingw.mutex.h will be ignored if _GLIBCXX_HAS_GTHREADS is defined
2017-09-29 11:06:22 +09:00
Jinhao
a3cd37b9d5 fix a GCC compiler error 2017-09-28 08:42:11 +08:00
Jinhao
d715c87d93 correct the process of failure of resizing a window 2017-09-28 08:29:19 +08:00
Jinhao
8d9351e051 graphics::make throws std::bad_alloc when it fails 2017-09-27 08:13:55 +08:00
qPCR4vir
c982717012 Merge remote-tracking branch 'cnjinhao/hotfix-1.5.5' into hotfix-1.5.5 2017-09-26 19:24:56 +02:00
Jinhao
a777447cfd Merge branch 'wjiali6-master' into develop 2017-09-25 21:54:42 +08:00
Jinhao
ae6ca7a5f5 Merge branch 'master' of https://github.com/wjiali6/nana into wjiali6-master 2017-09-25 21:54:19 +08:00
Jinhao
a3ff2af4ab Merge branch 'hotfix-1.5.5' into develop 2017-09-25 21:53:04 +08:00
Mexsut
dcb472cb06 add a native wstring version textbox::append
added a textbox::append which accepts texts in std::wstring
2017-09-25 15:20:38 +08:00