mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
492 Commits 1 Branch 0 Tags
Commit Graph

492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jinhao
0691583de0 Merge branch 'develop' 2015-08-08 10:17:37 +08:00
Jinhao
ff7a1f9510 fix a crash 
a crash caused by a splitbar would be created by place when the window is
destorying; add some checks whether the parent is destorying in create
widget functions
 2015-08-08 08:25:55 +08:00
Jinhao
1600d73856 Merge branch 'master' into develop 2015-08-08 07:07:44 +08:00
Jinhao
d99e80dbcd Merge branch 'qPCR4vir-label_bool' 2015-08-08 07:06:23 +08:00
qPCR4vir
d7aa311fab FIX: ? impossible to construct a picture widget 2015-08-06 19:58:08 +02:00
qPCR4vir
ae3c9f6357 Fix: Workaround label constructor selecting bool instead nana::string when called with nana::char_t* which silently brake a lot of code 
Maybe there are more elegant solutions... The second constructor was eliminated in:

Commit: f4924ef2f8600fafa82d3fc0d1c4d5f9eea0c738 [f4924ef]
Parents: e0ee42d184
Author: Jinhao <cnjinhao@hotmail.com>
Date: Sonntag, 2. August 2015 19:37:36
Labels: develop
add throw() for some functions
 2015-08-06 16:44:21 +02:00
Jinhao
c059bd256a Merge branch 'develop' 2015-08-06 02:35:09 +08:00
Jinhao
71f7a9f8ac update transparent background when the widget is moving 2015-08-06 02:05:15 +08:00
Jinhao
8d87b0f063 add group for codeblocks project 2015-08-05 00:47:14 +08:00
Jinhao
aef37436b0 add a method to return textbox caret position 2015-08-05 00:33:16 +08:00
Jinhao
f4924ef2f8 add throw() for some functions 2015-08-03 01:37:36 +08:00
Jinhao
e0ee42d184 merge beru's changes 2015-08-02 03:33:43 +08:00
Jinhao
66c1e1ad98 Merge branch 'beru-develop' into develop 2015-08-01 22:09:08 +08:00
Jinhao
7d868f2377 Merge branch 'develop' of https://github.com/beru/nana into beru-develop 
Conflicts:
	source/gui/widgets/skeletons/text_editor.cpp
	source/gui/widgets/textbox.cpp
	source/paint/detail/image_bmp.hpp
	source/paint/detail/image_ico.hpp
 2015-08-01 22:08:06 +08:00
Jinhao
abdf93a862 add a missing file 2015-08-01 21:48:36 +08:00
Jinhao
fff5926be5 some modifications 2015-08-01 21:45:22 +08:00
Jinhao
8bf35968ef fix an audio_stream issue 
occurs when pcmwaveformat's cksize is larger than sizeof pcmwaveformat
 2015-07-30 23:26:56 +08:00
Jinhao
8490e05497 fix an issue that key_char may be missed 2015-07-30 01:13:14 +08:00
Jinhao
9cbaaf375b fix mouse button issues 2015-07-29 00:55:53 +08:00
Jinhao
3f23aba3d1 a compiling error 2015-07-28 01:55:04 +08:00
Jinhao
894e7e61c8 fix compiling errors by using GCC/Clang 2015-07-28 01:53:41 +08:00
Jinhao
396163c1b7 fix mouse left button issues due to breaking changes 2015-07-28 00:00:15 +08:00
Jinhao
5dd5d110d7 fix a compiling error due to VC2015 issue 2015-07-26 11:00:23 +08:00
Jinhao
024bfeef20 improve group widget 2015-07-26 04:47:28 +08:00
Jinhao
ac9137c1b3 improve group widget 2015-07-26 00:26:07 +08:00
Jinhao
51f9e87979 add checkbox function for group 2015-07-25 20:26:44 +08:00
Jinhao
9940e2883e declear color(std::string) as an explicit constructor 2015-07-24 23:06:01 +08:00
Jinhao
0e5c88f121 code review 2015-07-24 00:44:35 +08:00
Jinhao
6a93295bcf refactor some functions of button 2015-07-22 01:17:02 +08:00
Jinhao
e47d8504ea fix an issue of button(#67) 2015-07-22 01:05:52 +08:00
Jinhao
5bc1568f3e change parameter type of click event from arg_mouse to arg_click 2015-07-21 01:14:23 +08:00
Jinhao
d8a964d8f0 remove deprecated code 2015-07-20 22:57:22 +08:00
Jinhao
628266adb4 fix arg_mouse issue(#67) 2015-07-19 20:07:27 +08:00
Jinhao
358c0f662e image::paste may make a graphics if the graphics object is empty 2015-07-19 14:29:59 +08:00
Jinhao
13674fdc48 Merge branch 'qPCRvir-develop' into develop 2015-07-19 13:18:05 +08:00
qPCR4vir
b92e391b62 FIX: eliminate a default group label "panel widget" --> "" 2015-07-19 02:45:09 +02:00
qPCR4vir
7bd336dc43 FIX: a background artifact 2015-07-19 02:43:43 +02:00
qPCR4vir
ec4a510878 The construction that creates the widget and set the title or caption 2015-07-19 02:42:22 +02:00
qPCR4vir
cfcec75b54 Merge remote-tracking branch 'nana_jinhao/develop' into develop 2015-07-17 08:52:45 +02:00
Jinhao
be031e9b7f modify group methods, fix a compiling-error 2015-07-17 01:41:03 +08:00
qPCR4vir
323a5cce4c Merge remote-tracking branch 'nana_jinhao/develop' into develop 2015-07-16 15:12:53 +02:00
Jinhao
19a44b772b develop group 2015-07-14 02:03:42 +08:00
Jinhao
e788c57512 add some missing files, refactor group 2015-07-13 04:57:01 +08:00
Jinhao
1eb76307e4 image::paste throws exception if graphics or image is empty 2015-07-13 00:23:54 +08:00
Jinhao
17556cae99 Merge branch 'feature-group' into develop 
Conflicts:
	build/vc2013/nana.vcxproj
	build/vc2013/nana.vcxproj.filters
 2015-07-12 11:31:06 +08:00
Jinhao
f762589975 fix newline issue of text_editor 2015-07-12 10:56:51 +08:00
qPCR4vir
5711ce96f5 Merge branch 'hotfixes-1.0.2' into develop 2015-07-11 21:56:48 +02:00
Jinhao
b1ed1f0452 Merge branch 'hotfixes-1.0.2' into develop 
Conflicts:
	include/nana/gui/detail/basic_window.hpp
	include/nana/gui/widgets/listbox.hpp
	source/gui/detail/linux_X11/bedrock.cpp
	source/gui/detail/win32/bedrock.cpp
	source/gui/detail/window_layout.cpp
	source/gui/detail/window_manager.cpp
	source/gui/widgets/listbox.cpp
	source/gui/widgets/toolbar.cpp
 2015-07-11 13:35:22 +08:00
qPCR4vir
6f101f73b4 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-07-10 12:57:08 +02:00
Jinhao
0f70769816 Merge branch 'feature-listbox' into develop 2015-07-09 00:17:16 +08:00