2202 Commits

Author SHA1 Message Date
Xeverous
b0ae6425ca
add alias nana::nana in CMakeLists.txt
This commit adds the alias to allow the use of nana::nana in other projects as per guideline https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1#using-a-library-defined-in-the-same-cmake-tree-should-look-the-same-as-using-an-external-library.

This change should not break anything, it only adds an alternative name
2019-05-30 10:59:45 +02:00
Jinhao
0cce667005 Merge branch 'wpp2014-ad_textbox_text_function' into develop 2019-05-24 08:53:41 +08:00
Jinhao
913801244d Merge branch 'ad_textbox_text_function' of https://github.com/wpp2014/nana into wpp2014-ad_textbox_text_function 2019-05-24 08:52:01 +08:00
Jinhao
eb4b8d4b89 Merge branch 'qPCR4vir-develop' into develop 2019-05-24 02:14:21 +08:00
Jinhao
6f30307a63 Merge branch 'develop' of https://github.com/qPCR4vir/nana into qPCR4vir-develop 2019-05-24 02:13:57 +08:00
Jinhao
742cde9779 Merge branch 'glavangeorge-hotfix-1.7.1' into hotfix-1.7.1 2019-05-23 23:34:52 +08:00
Gheorghe Florian GLAVAN
0e8328eba3 fix for #440 (unicode_bidi aletter always true) 2019-05-23 12:17:30 +03:00
Jinhao
396319ea28 add new method listbox;:set_deselect
set a predicate that decides to deselect selected items in mouse_up event.
2019-05-23 00:49:56 +08:00
Jinhao
a21d58a5fe Merge branch 'hotfix-1.7.1' into develop 2019-05-16 23:23:11 +08:00
qPCR4vir
6fe009961f fix comments: Boost as workaround 2019-05-15 14:08:53 +02:00
qPCR4vir
c6b0a7093d use target_link_libraries 2019-05-15 13:44:32 +02:00
qPCR4vir
fbffbcd75d target_compile_options(nana PUBLIC -static -static-libstdc++) for MINGW too 2019-05-15 13:05:19 +02:00
PearlWang
037ef43594 add text() function to class textbox 2019-05-15 09:25:37 +08:00
Jinhao
5575a9f2b8 fix bug that transparent widget may not be updated in event handler(#431) 2019-05-13 04:28:30 +08:00
Jinhao
d96efd11a6 Merge branch 'besh81-develop' into develop 2019-05-10 04:33:42 +08:00
Jinhao
44cbb18a50 Merge branch 'develop' of https://github.com/besh81/nana into besh81-develop 2019-05-10 04:33:25 +08:00
besh81
67f5d1743f toolbar: show text inside the button
Added function/method both to toolbar and item_proxy:
void textout(size_type index, bool show); ///< Show/Hide the text inside the button

Before: button without image weren't display
Now: button without image is display as empty square. In case the textout is on the text is show
2019-05-09 09:44:37 +02:00
besh81
5422c43002 toolbar : added toggle button
Following functions/methods have been add both to toolbar and item_proxy:
bool istoggle() const; ///< Returns true if the tool style is toggle.
				bool toggle() const; ///< Gets the tool toggle state (only if tool style is toggle).
				item_proxy& toggle(bool toggle_state); ///< Sets the tool toggle state (only if tool style is toggle).
				std::string toggle_group() const;	///< Returns the toggle group associated with the tool (only if tool style is toggle).
				item_proxy& toggle_group(const ::std::string& group);	///< Adds the tool to a toggle group (only if tool style is toggle).
2019-05-08 18:11:21 +02:00
Jinhao
5c19c9a9c3 Merge branch 'ErrorFlynn-hotfix-1.7' into hotfix-1.7.1 2019-05-07 00:29:47 +08:00
Jinhao
dfc3cf0cbd Merge branch 'hotfix-1.7' of https://github.com/ErrorFlynn/nana into ErrorFlynn-hotfix-1.7 2019-05-07 00:29:04 +08:00
Jinhao
3d89eb2ea1 Merge branch 'qPCR4vir-test_error' into develop 2019-05-07 00:25:46 +08:00
qPCR4vir
9e60ae87ba better text error 2019-05-05 23:47:44 +02:00
qPCR4vir
4d42409a54 cover more place methods with place:error 2019-05-05 23:05:25 +02:00
qPCR4vir
ca96a9d3ca Fix merge
# Conflicts:
#	include/nana/gui/widgets/treebox.hpp
#	source/gui/place.cpp
2019-05-05 22:15:41 +02:00
qPCR4vir
d6088e5d7d nana dev point to nana-demo cmake-dev. No Boost, print CMAKE_CXX_FLAGS_RELEASE. 2019-05-05 21:53:05 +02:00
qPCR4vir
20c40a091a fix warning about order of initialization 2019-05-05 21:46:20 +02:00
ErrorFlynn
4e3641ed88
fix for issue #428 2019-05-05 11:13:08 -04:00
qPCR4vir
74b486e267 first "working" version of place::error - compiles and run when Ok
tested with some errors as espected
2019-05-05 11:20:09 +02:00
qPCR4vir
003ffee01a implement error 2019-05-05 11:20:09 +02:00
qPCR4vir
45bb9f4318 \todo introduce a place::implement::field_gather::error ?? 2019-05-05 11:20:09 +02:00
qPCR4vir
5b1d0b4606 tokenizer errors 2019-05-05 11:20:09 +02:00
qPCR4vir
1d2e489c7f full error msg at one place 2019-05-05 11:20:09 +02:00
qPCR4vir
7830f430c0 tokenizer::error 2019-05-05 11:20:09 +02:00
qPCR4vir
064d59de13 rename to valid_field_name 2019-05-05 11:20:09 +02:00
qPCR4vir
6b3c02b558 introduce place::error and badname 2019-05-05 11:20:09 +02:00
qPCR4vir
77dd467f73 Add field name to place error 2019-05-05 11:20:02 +02:00
qPCR4vir
d18a4e9506 LanguageStandard -> stdcpplatest 2019-05-05 11:18:02 +02:00
qPCR4vir
ce3dd2e9a1 scheme code format 2019-05-05 11:17:20 +02:00
qPCR4vir
662a9b6b80 FIX big executables in release mode: from 103 MB to 3 MB 2019-05-05 11:14:16 +02:00
Jinhao
36556b44f5 Merge branch 'hotfix-1.7.1' into develop 2019-04-28 05:00:20 +08:00
Jinhao
ec38e666a1 fix bug that grayscale png is mistakely processed 2019-04-24 01:18:27 +08:00
Jinhao
ffa170b5f5 Merge branch 'develop' 2019-04-22 05:58:06 +08:00
Jinhao
b9ab3f8a4f remove deprecated code 2019-04-22 05:51:56 +08:00
Jinhao
4df1689b46 Merge branch 'develop' 2019-04-22 05:06:30 +08:00
Jinhao
a08e274088 Merge branch 'hotfix-1.7' into develop 2019-04-22 01:08:49 +08:00
Jinhao
ac9cb8e589 add a member type item_interface to float_listbox::item_renderer 2019-04-22 01:07:15 +08:00
ErrorFlynn
e36a3270e9
bug: second parameter of category_icon() is rvalue reference 2019-04-18 17:13:19 -04:00
ErrorFlynn
c5b38f3643
bug: second parameter of category_icon() is rvalue reference 2019-04-18 17:12:31 -04:00
Jinhao
5320ead6bd add treebox.horvered method 2019-04-19 04:40:49 +08:00
Jinhao
8b2dc1eddd fix missing fs.weakly_canonical for c++11/14 2019-04-19 04:38:30 +08:00