Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2dd9a376bc 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' of  https://github.com/ErrorFlynn/nana  into ErrorFlynn-hotfix-1.7  
						
						
						
						
					 
					
						2019-08-11 02:27:30 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1b0ac10475 
							
						 
					 
					
						
						
							
							fixes for the listbox bugs described in issue  #472  
						
						
						
						
					 
					
						2019-08-05 14:11:02 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							9e653eec0a 
							
						 
					 
					
						
						
							
							Merge branch 'patch-2' of  https://github.com/qPCR4vir/nana  into qPCR4vir-patch-2  
						
						
						
						
					 
					
						2019-08-05 04:02:04 +08:00 
						 
				 
			
				
					
						
							
							
								이지한 
							
						 
					 
					
						
						
						
						
							
						
						
							129b83e68f 
							
						 
					 
					
						
						
							
							fix the strange behavior of Korean ime composition window.  
						
						... 
						
						
						
						Because Hangul is a combination character, WM_IME_STARTCOMPOSITION is only called once when the IME input is started, so the position of the composition window is strange.
Therefore, I solved the problem by controlling the state of characters combined using WM_IME_COMPOSITION and WM_IME_CHAR.
We have also improved to support other IME languages such as Chinese and Japanese. 
						
						
					 
					
						2019-08-01 15:24:46 +09:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							96c7a962c9 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into patch-2  
						
						
						
						
					 
					
						2019-07-31 16:59:20 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							7a1c299ff7 
							
						 
					 
					
						
						
							
							explicit conversion  
						
						
						
						
					 
					
						2019-07-31 16:56:23 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							de9043e223 
							
						 
					 
					
						
						
							
							fix bug where listbox::item_proxy::empty behaves incorrectly  
						
						
						
						
					 
					
						2019-07-23 04:37:14 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5acbbf548e 
							
						 
					 
					
						
						
							
							refactoring and fix  
						
						... 
						
						
						
						fix a potential dead-lock caused by timer 
						
						
					 
					
						2019-07-10 04:25:00 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							50d2c61b9e 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7.1' into develop  
						
						
						
						
					 
					
						2019-07-08 07:12:07 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							1ceb6fd711 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' of  https://github.com/ErrorFlynn/nana  into ErrorFlynn-hotfix-1.7  
						
						
						
						
					 
					
						2019-07-08 06:34:56 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d845a82dc4 
							
						 
					 
					
						
						
							
							fixed another listbox selection bug  
						
						... 
						
						
						
						a display position was searched for in a set of absolute positions 
						
						
					 
					
						2019-07-06 14:18:24 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8a0475c98c 
							
						 
					 
					
						
						
							
							refactor text_renderer  
						
						
						
						
					 
					
						2019-06-20 04:35:29 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7d27f152f4 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7.1' into develop  
						
						
						
						
					 
					
						2019-06-12 23:10:12 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							1f23a78a0a 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' of  https://github.com/ErrorFlynn/nana  into ErrorFlynn-hotfix-1.7  
						
						
						
						
					 
					
						2019-06-11 01:15:52 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							417071e4b5 
							
						 
					 
					
						
						
							
							fix for selection bug described in issue  #448  
						
						
						
						
					 
					
						2019-06-03 17:51:21 -04: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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							9e60ae87ba 
							
						 
					 
					
						
						
							
							better text error  
						
						
						
						
					 
					
						2019-05-05 23:47:44 +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 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e3641ed88 
							
						 
					 
					
						
						
							
							fix for issue  #428  
						
						
						
						
					 
					
						2019-05-05 11:13:08 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a08e274088 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' into develop  
						
						
						
						
					 
					
						2019-04-22 01:08:49 +08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec8ab4e9d 
							
						 
					 
					
						
						
							
							add contributor information  
						
						
						
						
					 
					
						2019-04-17 05:36:19 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							f274ff4c4c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/beru/nana  into beru-develop  
						
						
						
						
					 
					
						2019-04-16 23:39:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							fd120c6425 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' into develop  
						
						
						
						
					 
					
						2019-04-16 04:01:44 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							f697f4c338 
							
						 
					 
					
						
						
							
							uses std::chrono  
						
						
						
						
					 
					
						2019-04-16 03:54:16 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b7ddcd7d3a 
							
						 
					 
					
						
						
							
							fix for issue  #420  
						
						
						
						
					 
					
						2019-04-15 13:00:04 -04:00 
						 
				 
			
				
					
						
							
							
								beru 
							
						 
					 
					
						
						
						
						
							
						
						
							a596c7f64e 
							
						 
					 
					
						
						
							
							fix typos  
						
						
						
						
					 
					
						2019-04-14 14:49:01 +09:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							d931ebb61c 
							
						 
					 
					
						
						
							
							filter out the middle and right button for item selection( #413 )  
						
						
						
						
					 
					
						2019-04-10 00:41:04 +08:00 
						 
				 
			
				
					
						
							
							
								beru 
							
						 
					 
					
						
						
						
						
							
						
						
							3160b8a204 
							
						 
					 
					
						
						
							
							fix misspellings  
						
						
						
						
					 
					
						2019-03-23 18:18:52 +09:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba93f2164 
							
						 
					 
					
						
						
							
							add contribution description  
						
						
						
						
					 
					
						2019-03-14 06:31:52 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							68d01ffe70 
							
						 
					 
					
						
						
							
							fix: tooltip window doesn't have tree scheme & typeface (issue  #405 )  
						
						... 
						
						
						
						The treebox tooltip window is not initialized with the treebox scheme, which causes a crash in color_proxy::operator color(). Additionally, the tooltip window also uses a default font. 
						
						
					 
					
						2019-03-12 15:58:01 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2470848fba 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.6.2' into develop-1.7  
						
						
						
						
					 
					
						2019-03-09 21:54:57 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							2abae1dd68 
							
						 
					 
					
						
						
							
							refactoring  
						
						
						
						
					 
					
						2019-03-08 06:11:21 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fd8261c6a2 
							
						 
					 
					
						
						
							
							fix for issue  #399  
						
						
						
						
					 
					
						2019-03-07 04:36:27 -05:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							0a3fb34e09 
							
						 
					 
					
						
						
							
							use std::filesystem::path instead of std::string  
						
						
						
						
					 
					
						2019-03-07 01:10:02 +08:00 
						 
				 
			
				
					
						
							
							
								beru 
							
						 
					 
					
						
						
						
						
							
						
						
							b286ced6ba 
							
						 
					 
					
						
						
							
							fix compile error  
						
						
						
						
					 
					
						2019-02-24 10:29:34 +09:00 
						 
				 
			
				
					
						
							
							
								beru 
							
						 
					 
					
						
						
						
						
							
						
						
							46ad9fd9f3 
							
						 
					 
					
						
						
							
							Fix ctrl + end key handling, pos.y member should be calculated with _m_coordinate_to_caret method.  
						
						
						
						
					 
					
						2019-02-24 09:53:36 +09:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							e89ee5d18b 
							
						 
					 
					
						
						
							
							some improvements  
						
						... 
						
						
						
						improved resizing performance
removed frame widget
refactoring 
						
						
					 
					
						2019-02-16 00:55:02 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							bbc39906c0 
							
						 
					 
					
						
						
							
							remove deprecated code and debug code  
						
						
						
						
					 
					
						2019-02-15 06:27:17 +08:00 
						 
				 
			
				
					
						
							
							
								besh81 
							
						 
					 
					
						
						
						
						
							
						
						
							56065bb2b8 
							
						 
					 
					
						
						
							
							fixed listbox scheme.header_padding_top use  
						
						
						
						
					 
					
						2019-02-06 11:35:33 +01:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							85c2bdbd75 
							
						 
					 
					
						
						
							
							small changes  
						
						
						
						
					 
					
						2019-02-02 00:31:56 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7f12b76e08 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.6.2' into develop-1.7  
						
						
						
						
					 
					
						2019-02-02 00:26:52 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8ade6557 
							
						 
					 
					
						
						
							
							some modifications to  #357  and  #383  
						
						
						
						
					 
					
						2019-01-31 07:08:45 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8a020dbc88 
							
						 
					 
					
						
						
							
							Merge branch 'develop-1.7' of  https://github.com/besh81/nana  into besh81-develop-1.7  
						
						
						
						
					 
					
						2019-01-29 04:30:13 +08:00