Jinhao
|
3e4455fb18
|
Merge branch 'htzh-master' into hotfix-1.1.3
|
2015-09-27 16:46:42 +08:00 |
|
Jinhao
|
75ee238f34
|
Merge branch 'master' of https://github.com/htzh/nana into htzh-master
|
2015-09-27 16:46:07 +08:00 |
|
Haitao Zhang
|
7e49315511
|
Add autogenerated files by CMake and ninja to .gitignore.
|
2015-09-26 18:43:01 -07:00 |
|
Haitao Zhang
|
4337222549
|
Fix return char * when path is expected by explicit cast to
nana::string first.
|
2015-09-26 18:33:54 -07:00 |
|
Haitao Zhang
|
3c13cec4b7
|
Change cmake MinGW build default to include thread support.
|
2015-09-26 18:32:53 -07:00 |
|
Jinhao
|
2f47e89af1
|
use lambda instead of std::bind
|
2015-09-27 05:31:42 +08:00 |
|
Jinhao
|
90533b3a83
|
update solutions
|
2015-09-27 04:56:08 +08:00 |
|
Jinhao
|
171509f0d6
|
Merge branch 'feature-docker-place' into develop
|
2015-09-27 04:17:21 +08:00 |
|
Jinhao
|
4228421a4e
|
Merge branch 'roberthauck-patch-2' into hotfix-1.1.3
|
2015-09-26 11:25:46 +08:00 |
|
Jinhao
|
f2036123a9
|
Merge branch 'patch-2' of https://github.com/roberthauck/nana into roberthauck-patch-2
|
2015-09-26 11:25:24 +08:00 |
|
Jinhao
|
5a8a4946aa
|
Merge branch 'Pr0curo-hotfix-1.1.3' into hotfix-1.1.3
|
2015-09-26 11:23:27 +08:00 |
|
Jinhao
|
b6dd03e2d5
|
some small place fixes
|
2015-09-23 23:59:31 +08:00 |
|
Jinhao
|
8d4ffa068d
|
improve re-div of a dock place
|
2015-09-22 23:41:55 +08:00 |
|
Jinhao
|
ccb334a907
|
fix an crash that caused by accessing an non-existing tabbar
|
2015-09-22 21:05:50 +08:00 |
|
Jinhao
|
8dcd730715
|
improve dockpane caption
|
2015-09-21 23:43:00 +08:00 |
|
Jinhao
|
c04751ac1a
|
remove some compiler warning
|
2015-09-20 23:34:57 +08:00 |
|
Jinhao
|
460490040e
|
improve dockable place
add a new API::at_safe_place()
|
2015-09-20 23:21:44 +08:00 |
|
Jinhao
|
5d2127e613
|
improve dockpane factory
|
2015-09-19 05:18:15 +08:00 |
|
Pr0curo
|
1d7781e1a6
|
fix for gcc/mingw
|
2015-09-18 17:20:45 +02:00 |
|
Jinhao
|
44a067fd51
|
implement dockpane titlebar
|
2015-09-18 08:19:25 +08:00 |
|
Robert
|
f21ceb0fac
|
Add VS2015 Linker fix also for Cmake
|
2015-09-14 12:37:28 +02:00 |
|
Jinhao
|
de96ff2cab
|
Merge branch 'hotfix-1.1.3' into feature-docker-place
|
2015-09-14 01:53:07 +08:00 |
|
Jinhao
|
fc307d5b99
|
Merge branch 'roberthauck-patch-1' into hotfix-1.1.3
|
2015-09-14 01:51:06 +08:00 |
|
Jinhao
|
7ce97727d1
|
Merge branch 'patch-1' of https://github.com/roberthauck/nana into roberthauck-patch-1
|
2015-09-14 01:50:50 +08:00 |
|
Jinhao
|
e97d2cb20f
|
fix color issues
|
2015-09-14 01:48:30 +08:00 |
|
Robert
|
ec098640fd
|
Fix Visual Studio 2015 codecvt linker errors
Add missing defines
|
2015-09-13 19:27:55 +02:00 |
|
Jinhao
|
706ff76b98
|
Merge branch 'hotfix-1.1.3' into feature-docker-place
|
2015-09-11 00:41:50 +08:00 |
|
Jinhao
|
edd7de4e8b
|
fix a color issue
|
2015-09-10 23:36:16 +08:00 |
|
Jinhao
|
65a876cc74
|
the dockpane splitbar is done
|
2015-09-07 09:12:51 +08:00 |
|
Jinhao
|
b453529366
|
add process of dockpane's splitbar
|
2015-09-07 08:55:49 +08:00 |
|
Jinhao
|
651d0f72dd
|
add process of dockpane splitbar
|
2015-09-07 00:24:44 +08:00 |
|
Jinhao
|
66d531c520
|
add splitbars between dockable panes
|
2015-09-06 22:33:39 +08:00 |
|
Jinhao
|
33006ddc4d
|
re-collocate when drag the float dockpane over indicato indicatorr
|
2015-09-01 23:37:08 +08:00 |
|
Jinhao
|
ebd8da13f0
|
adjust dockpanes when a dockpane is floating/docking
|
2015-09-01 03:49:38 +08:00 |
|
Jinhao
|
c4af5dafce
|
Merge branch 'hotfix-1.1.2' into feature-docker-place
|
2015-08-28 07:39:36 +08:00 |
|
Jinhao
|
faa74047db
|
Merge branch 'develop'
|
2015-08-28 07:36:35 +08:00 |
|
Jinhao
|
5c6c0ddcd1
|
Merge branch 'hotfix-1.1.2' into develop
|
2015-08-28 07:35:31 +08:00 |
|
Jinhao
|
549acf5aef
|
fix a bug that missed refresh in event handling
|
2015-08-27 23:06:03 +08:00 |
|
Jinhao
|
9384baace4
|
fix a crash caused by calling inner_widget_notifier's destroy twice
|
2015-08-27 01:40:18 +08:00 |
|
Jinhao
|
29ab6be21b
|
add contribution information
|
2015-08-23 17:51:52 +08:00 |
|
Jinhao
|
dfec7316b2
|
Merge pull request #72 from dareg/hotfix-1.1.2
Thank you for fixing this issue
|
2015-08-23 17:04:49 +08:00 |
|
dareg
|
03faa0a7ee
|
Fix missing array declaration in unique_ptr
Which was causing a wrong deletion of the array
|
2015-08-22 23:20:32 +02:00 |
|
Jinhao
|
16c93537c9
|
code review
|
2015-08-23 03:42:11 +08:00 |
|
Jinhao
|
19e6cab0b0
|
Merge branch 'hotfix-1.1.2' into feature-docker-place
|
2015-08-20 22:52:34 +08:00 |
|
Jinhao
|
b0c99fa780
|
fix an PNG palette color type issue
|
2015-08-20 22:34:48 +08:00 |
|
Jinhao
|
42443dcafd
|
remove paint::gadget
|
2015-08-20 01:09:29 +08:00 |
|
Jinhao
|
4323977908
|
change the implementation of pat::cloneable
|
2015-08-17 01:37:56 +08:00 |
|
Jinhao
|
c1e9ea3daf
|
Merge branch 'hotfixes-1.1.1' into feature-docker-place
|
2015-08-16 09:17:23 +08:00 |
|
Jinhao
|
9f2d830cc5
|
Merge branch 'hotfixes-1.1.1' into develop
|
2015-08-16 09:16:42 +08:00 |
|
Jinhao
|
75bd84fb0e
|
Merge branch 'hotfixes-1.1.1'
|
2015-08-16 09:15:21 +08:00 |
|