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

1277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jinhao
c859b86a3f fix an issue of dock place 2015-08-15 06:57:36 +08:00
Jinhao
2a53467b24 add missing header for docker-place 2015-08-14 04:13:16 +08:00
Jinhao
658ab3fb7f new docker-place branch 2015-08-14 04:09:35 +08:00
Jinhao
42dd27b68f add a new tabbar_lite widget 2015-08-14 01:38:23 +08:00
Jinhao
3bf9a60563 fix an issue of bitmap 4-byte alignment format(#71) 
contributed by beru
 2015-08-10 23:09:16 +08:00
Jinhao
e7fc08fd0e fix no implementation of image_png::open interface 2015-08-09 07:37:53 +08:00
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