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

1396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jinhao
59f3554632 fix listbox auto-redraw issue 2015-07-06 22:23:05 +08:00
Jinhao
a6455bcbe0 inline widget for listbox is ready to launch 2015-07-06 03:27:41 +08:00
Jinhao
5f9a98c7bc fix a caret issue when set focus to a invisible textbox(#62) 2015-07-05 23:57:10 +08:00
Jinhao
08deeba096 fix missing edge_nimbus_effect issue 2015-07-05 23:38:24 +08:00
Jinhao
0d14620052 fix caret/keyboard issue(#62) 
pressing space on a button will trigger click event
 2015-07-05 16:21:13 +08:00
Jinhao
37481a2065 fix ghost image(#62) 2015-07-04 22:56:03 +08:00
Jinhao
c245ae8296 fix menu behavioral issues and a menubar delay_restore issue 
don't delay_restore when arrow keys is pressed
 2015-06-29 07:31:51 +08:00
Jinhao
8be566214c fix a caret issue which happens when parent widget is hidden 2015-06-26 23:59:28 +08:00
qPCR4vir
ad57c5519e Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-06-24 22:46:16 +02:00
Jinhao
1dd61ffb24 fix an explicit conversion error from ifstream to bool 2015-06-25 02:00:57 +08:00
Jinhao
e479689946 fix a crash error which is caused by the focus of submenu(#65) 2015-06-25 01:32:54 +08:00
Jinhao
6c554ceab2 inline widget for listbox is ready 2015-06-24 02:14:36 +08:00
Jinhao
76ebf52739 add whether_to_draw to determine draw widget background 2015-06-23 02:25:59 +08:00
Jinhao
d528b5c94d fix an issue that caret doesn't move when moving the parent widget. 2015-06-23 00:11:47 +08:00
Jinhao
bdf928a9e8 fix an infinit loop issue when pressing tab key if all tabstop widgets are 
invisible
 2015-06-22 23:00:48 +08:00
Jinhao
28413b7f25 explicit conversion from point/size to rectangle 2015-06-22 11:30:14 +08:00
Jinhao
1bb9a09a8a develop inline widgets for listbox 2015-06-21 04:44:49 +08:00
Jinhao
c761aced03 fix inline widget position issue 2015-06-18 01:45:45 +08:00
qPCR4vir
7eece66df0 kainjow : "stoped" typo, should be "stopped" 2015-06-17 10:29:11 +02:00
qPCR4vir
066e6b0648 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-06-17 08:24:34 +02:00
Jinhao
e2cf5452d5 fix a charset issue 2015-06-17 00:07:20 +08:00
qPCR4vir
d05f49cc80 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-06-16 13:23:22 +02:00
Jinhao
5982f8c7bf fix a crash error when click on an empty category of listbox 2015-06-16 00:12:09 +08:00
Jinhao
7dae086162 fix caret and tab switch on invisible widgets(#62) 2015-06-15 22:31:03 +08:00
Jinhao
1822fafd79 construct the inline widget for listbox 2015-06-14 21:48:35 +08:00
qPCR4vir
fddb6dd4c1 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-06-10 01:46:31 +02:00
Jinhao
2d1a347116 Merge branch 'qPCR4vir-progressbar_with_stop' into hotfixes-1.0.2 2015-06-10 07:31:28 +08:00
Jinhao
80f71e98e8 Merge branch 'progressbar_with_stop' of https://github.com/qPCR4vir/nana into qPCR4vir-progressbar_with_stop 2015-06-10 07:31:01 +08:00
Jinhao
150b130b3c Merge branch 'qPCR4vir-VC2015_RC' into hotfixes-1.0.2 2015-06-10 07:27:49 +08:00
Jinhao
feed286b53 Merge branch 'VC2015_RC' of https://github.com/qPCR4vir/nana into qPCR4vir-VC2015_RC 
Conflicts:
	include/nana/config.hpp
 2015-06-10 07:26:41 +08:00
Jinhao
62b55740df Merge branch 'qPCR4vir-nana_exp_filesystem' into hotfixes-1.0.2 2015-06-10 07:03:54 +08:00
Jinhao
8ba39c7a75 Merge branch 'nana_exp_filesystem' of https://github.com/qPCR4vir/nana into qPCR4vir-nana_exp_filesystem 2015-06-10 07:03:11 +08:00
Jinhao
e8ae11e208 fix a refreshing issue 
bad refreshing when a lite_widget is destroying if the lite_widget's
parent is also a type of lite_widget
 2015-06-10 06:53:58 +08:00
qPCR4vir
18b9358bb4 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-06-02 10:16:37 +02:00
Jinhao
331f19e679 fix menu image issue 2015-06-02 03:44:35 +08:00
qPCR4vir
0b6facab33 Merge remote-tracking branch 'nana_jinhao/hotfixes-1.0.2' into hotfixes-1.0.2 2015-05-31 23:14:40 +02:00
Jinhao
36b3e6e6cc some minor changes 2015-05-30 22:09:44 +08:00
Jinhao
ee9d102f8d refactor toolbar 2015-05-30 16:55:03 +08:00
qPCR4vir
3157f5f056 progressbar with stop() 2015-05-29 15:39:59 +02:00
qPCR4vir
4a34b87e5b Merge branch 'progressbar_with_stop' into hotfixes-1.0.2 2015-05-29 15:39:21 +02:00
Jinhao
11d65763ce fix a crash when the size of a label is empty and '\t' is contained 2015-05-29 00:09:47 +08:00
qPCR4vir
42819c64c2 eliminate noexept from our filesystem 
because a compiler without filesystem is not C++11 complete anyway
We will go with noexeot when we will have std::filesystem...
 2015-05-28 17:54:33 +02:00
qPCR4vir
b1db4b2e14 project for VS2015 2015-05-28 01:55:46 +02:00
qPCR4vir
80aed9c94b nana filesystem need vc2015 2015-05-28 01:55:24 +02:00
qPCR4vir
b37ecda187 fix more warning 2015-05-28 01:54:07 +02:00
qPCR4vir
ae1d01814a FIX: linker warning which eventually produce errors 2015-05-28 01:52:38 +02:00