Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Jun 02, 2013
@meeloo meeloo moved to C++11 build on OSX 63b947f
Commits on Jun 03, 2013
@meeloo meeloo fixed nuiTexture::ForceReload not taken in account 85e8c7e
Commits on Jun 05, 2013
@meeloo meeloo fixed debug build flags for 64 bit cocoa
less logs in debug
fixer nuiTreeView::SetElement
fixed shared shaders in between contexts
fixed horizontal mouse wheel w/ cocoa
small bug fixes
3567c5f
Commits on Jun 06, 2013
@meeloo meeloo better nuiTreeView (added attributes) 810115d
Commits on Jun 07, 2013
@meeloo meeloo better scrollview hotrect enable/disable 76b52db
@meeloo meeloo better tree reparenting (find selected node) a4fe7d6
Commits on Jun 08, 2013
@meeloo meeloo added SetCursorPos(line, col) for text views 5b9214d
Commits on Jun 10, 2013
@meeloo meeloo fixed build
better range
a0829fa
Commits on Jun 13, 2013
@meeloo meeloo started to fix build on Xcode 5
added nuiTextLayout::AddStyleChange
0c326cc
Commits on Jun 14, 2013
@meeloo meeloo much better multi color text cf35812
@meeloo meeloo more coloring text fixes cc83545
Commits on Jun 15, 2013
@meeloo meeloo remove logs in text layout
builder now knows how to handle tab views
cbcfbf3
@meeloo meeloo added simple way to give names to nuiTabView tabs from a CSS aea2730
Commits on Jun 19, 2013
@meeloo meeloo fixed Xcode 5 build
fixed parsing unicode text in CSS
101233a
@meeloo meeloo fixed nuiTextStyle operator= 7148992
Commits on Jun 20, 2013
@meeloo meeloo added signal4 ec41e3c
Commits on Jun 27, 2013
@meeloo meeloo fixed Surfaces on desktop d889955
Commits on Jun 30, 2013
@meeloo meeloo ifixed initial nglWindow title wrong on cocoa 7fae2ce
@meeloo meeloo added nuiWidget::Built() callback. The builder calls it right after c…
…reating a widget from a CSS description. It's the right time to initialize contained widgets.
71eac12
@meeloo meeloo much better support for disabling decorations e880dd8
@meeloo meeloo make it easy to define TabWidget from the CSS 9a2db8d
@meeloo meeloo fixed nuiDrawContext::DrawRect to be perfect is all cases
fixed nuiColorDecoration to handle mixed alpha properly
5dc869b
Commits on Jul 01, 2013
@meeloo meeloo better nuiRectRendering yet
changed stroke size type in nuiColorDecoration to float instead of uint32 (...)
b02d7ff
Commits on Jul 03, 2013
@meeloo meeloo application selection is ok now
next step: save the configuration
d150754
Commits on Jul 09, 2013
@meeloo meeloo better defaults 01d4d39
Commits on Jul 11, 2013
@meeloo meeloo fixed decoration and texture introspector layouts
fixed navigation controller layout
9b8b920
Commits on Jul 12, 2013
@meeloo meeloo fixed nuiList selection in some corner case ae157f7
@meeloo meeloo added MakeInRangeVisual to nuiRange: much better policies for MakeInR…
…ange

nuiScrollView now uses MakeInRangeVisual
fd7cf24
Commits on Jul 15, 2013
@meeloo meeloo removed NGL_API completely. I will NEVER support dlls on windows. 92a6bb0
Commits on Jul 17, 2013
@meeloo meeloo editable nuiLayout anchors WIP 236c86b
@meeloo meeloo added support for changing mouse cursors on cocoa 3a16998
Commits on Jul 18, 2013
@meeloo meeloo added properties to enble interactive anchors 293bf55
Commits on Jul 19, 2013
@meeloo meeloo removed NUI_API too... 06e8d29
Commits on Jul 25, 2013
@meeloo meeloo improved tab view can now select tabs by pointer to contents / header
replaced uint tabs by int32 (better error management)
ea0a47d
@meeloo meeloo fixed very special nuiWidget destruction case 197938d
Commits on Jul 28, 2013
@meeloo meeloo fixed list selection rendering 24e2a73
@meeloo meeloo better visual range f5a8a62
@meeloo meeloo better nuiRange::MakeInVisualRange e1f28c9
@meeloo meeloo removed debug logs 744a938
@meeloo meeloo added 5 parameters signals 0d9691a
Commits on Aug 24, 2013
@meeloo meeloo started to fix android tests fc64b67
Commits on Sep 13, 2013
@meeloo meeloo fixed android build & debug f4f317e
Commits on Nov 01, 2013
@meeloo meeloo fixed 64bit build for iOS
preparing cocoa drag and drop implementation (OMG, we urgently need to cleap up the DnD mess in nui...)
25b77c4
Commits on Nov 02, 2013
@meeloo meeloo added basic drag and drop support (files seems to work, text untests …
…yet)
a5ceb68
@meeloo meeloo better drop handling on cocoa 2ee0c8d
Commits on Nov 15, 2013
@meeloo meeloo fixed some Xcode pbms
about to move to 1 target per arch in Xcode (+ release and debug configurations)
523306b
Commits on Nov 16, 2013
@meeloo meeloo removed unsued freetype files
moved xcode projects to 2 targets + 2 configs mode. Fixed many config related pbms
b38cd88
Commits on Nov 18, 2013
@meeloo meeloo faster audio decoding by caching file informations 6480574
Commits on Nov 21, 2013
@meeloo meeloo fixed some warnings f274272
Commits on Nov 25, 2013
@meeloo meeloo added a way to get the state of all touch/mouse downs 4dd7022
@meeloo meeloo better and generic message queue that works for nuiNotifications and …
…nuiTasks
45c3fc9
Commits on Nov 28, 2013
@meeloo meeloo added simple nuiTaskThread class to handle worker threads based on nu…
…iTask
1940e1f
@meeloo meeloo fixed MouseState update when there was no counterpart 1cca198
Commits on Dec 01, 2013
@meeloo meeloo some tests to see why startup was slow. The answer is: THE DEBUGGER M…
…AKES IT SLOW. DAMN IT!
b833bc0
Commits on Dec 05, 2013
@meeloo meeloo first step on the path to much better vector rendering fc4ee53
Commits on Dec 06, 2013
@meeloo meeloo smooth outlines based on shaders & tesselation basically ok. Not sure…
… it I can get rid of the artefacts I get though...
b81229a
@meeloo meeloo in the end, use multisampling instead of trying complex optims for now 8da729f
Commits on Dec 07, 2013
@meeloo meeloo started to fix outlining and tessellation bugs 6e61586
@meeloo meeloo fixed outline and tesselation code. no more known artefacts 8886674
Commits on Dec 18, 2013
@meeloo meeloo disabled multisample for now, too many problems on iOS... 13bf8b5
Commits on Dec 26, 2013
@meeloo meeloo better multitouch handling
started UIViewController and rootViewController convertion
dd4f2fb
@meeloo meeloo fixed main window layout in all orientations acdda41
@meeloo meeloo nuiTopLevel now draws itself fullscreen but layouts its children outs…
…ide the status bar. If you want to draw the background, either overrride nuiMainWindow::Draw or nuiTopLevel::Draw
97a0ce2
@meeloo meeloo reenabled multitouch on iOS
removed debug logs
008a51e
Commits on Dec 28, 2013
@meeloo meeloo removed debug log
better GLKView init
8b5d37c
@meeloo meeloo added some comment 05a5609
Commits on Dec 29, 2013
@meeloo meeloo added a temp buffer in nuiAudioDecoder to compensate startup bugs :( 5b11c1c
@meeloo meeloo added debug logs
nuiTickEvent::GetLap() is now const
f53e9f7
@meeloo meeloo forgot one file in last commit 7ddab6f
@meeloo meeloo fixed animation timer sending nuiEvents instead of nuiTickEvents b680b0e
Commits on Dec 31, 2013
@meeloo meeloo fixed some more animation timer direct calls
beffed up nglRingBuffer for multi channel & DSP operations (overlap & add...)
6eadb81
Commits on Jan 04, 2014
@meeloo meeloo changed nuiRange default values to a unit range instead of 0-100 (mak…
…es more sense)

started to add a way to read samples at another sample rate than what is stored in the file
c4361a3
Commits on Jan 08, 2014
@meeloo meeloo fixed many audio route problems 73f955a
Commits on Jan 09, 2014
@meeloo meeloo wip a36e24f
Commits on Jan 11, 2014
@meeloo meeloo better GLKit? b036c94
Commits on Jan 14, 2014
@meeloo meeloo fixed audio decoder forced sample rate init
better widget debug
8baeac8
Commits on Jan 18, 2014
@meeloo meeloo fixed crashes in nuiTopLevel in some corner cases
better handling of broken wave files loading
e7ebd9a
Commits on Jan 23, 2014
@meeloo meeloo unified _DEBUG_ macro
better Xcode 5 project
replaced calls to finite by std::isfinite
fixed some audio bugs
better redraw when iOS application is re activated (fixes black first frame)
f7d88f2
Commits on Jan 24, 2014
@meeloo meeloo added a property to nuiHBox
fixed nuiScrollView destruction when the scroll bars are fading crash
fixed empty shape rendering
d3e44b8
@meeloo meeloo added an easy way to use child properties to give per cell box attrib…
…utes
8ef72a5
Commits on Jan 25, 2014
@meeloo meeloo added mouse canceled events + nuiButton implem that needs testing
added flatuicolor.com color definitions
cddc0db
@meeloo meeloo fixed color name 86f378f
Commits on Jan 28, 2014
@meeloo meeloo more tolerance for button activation offset on iOS 271f23c
@meeloo meeloo fixed nuiRadioButton::GetGroup
fixed crash when adding an empty cell (a null widget) to an nui*Box
7777f9d
@meeloo meeloo better nuiToggleButton 8a6308b
Commits on Jan 29, 2014
@meeloo meeloo fixed interface shift on iOS eacb383
Commits on Feb 02, 2014
@meeloo meeloo disabled the part that made nuiFont scanning fucking slow (it's still…
… slow, but reasonable...)
4482c92
Commits on Feb 03, 2014
@meeloo meeloo better task thread wait time
more sensible 60FPS nuiAnimation default
9457781
Commits on Feb 05, 2014
@meeloo meeloo many fixes!
memory leaks gone
efe422a
@meeloo meeloo started to add CSS Event Actions 719b64d
Commits on Feb 07, 2014
@meeloo meeloo added CSS Actions! 6549466
Commits on Feb 08, 2014
@meeloo meeloo fixed nuiSignal5 params
added nuiRelayEventSource (nuiEventSource that is easy to setup as a relay for another event source)
fixed nuiNavigationController transition layout
c1a0cb4
Commits on Feb 09, 2014
@meeloo meeloo removed all direct calls to grab and ungrab inside mouse clicked and …
…unclicked events

added auto grab and ungrab to the mouse dispatch code
5b8183f
@meeloo meeloo forgot some auto grab/ungrab 34c0466
@meeloo meeloo nuiScrollView multitouch scrolling can preempt clicks from childrens …
…(they have to honnor MouseCanceled events)

removed logs
2298f42
@meeloo meeloo more logs removed 819fad7
Commits on Feb 10, 2014
@meeloo meeloo fixed multi level AcquireGrab method for stealing grab from children …
…and implement gestures
90aa9d4
Commits on Feb 11, 2014
@meeloo meeloo added some operations to nglVector2
Grab stealing perfected
3ba1e02
@meeloo meeloo renamed AcquireGrab to StealMouseEvent as it better reflects on my it…
…'s actually doing
446b8e4
Commits on Feb 12, 2014
@meeloo meeloo fixed StealMouseEvent on desktop 9bd91b3
Commits on Feb 14, 2014
@meeloo meeloo added nuiDrawerView 2e20306
Commits on Feb 15, 2014
@meeloo meeloo added nglPath::SetBackupPermited
changed the way we prevent nuiFont database to be backuped on iOS, and fixed one of the code path that didn't ask for it.
removed debug logs
fb12bc0
@meeloo meeloo when a widget grabs we need to prevent it's final release & deletion …
…while propagating events. Fixed now
008fd4b
Commits on Feb 17, 2014
@meeloo meeloo started to remove some widgets that are very specific corner cases or…
… easily replaced with CSS constructs
c1e47d9
@meeloo meeloo fixed memory leak (Dave Wallin) 79deab7
@meeloo meeloo removed some more deprecated classes 5967aaf
Commits on Feb 18, 2014
@meeloo meeloo added proper mouse wheel event (by displacement rather than click lik…
…e event)
ae35c0f
Commits on Feb 19, 2014
@meeloo meeloo better scrolling/easing speed 630937f
@meeloo meeloo removed widget elements colors from nuiLabel about to do the same to …
…the whole lib. CSS is a better solution now.

Fixed nuiDrawer behaviour in some corner cases
d2856a8
@meeloo meeloo correct behaviour of the drawer when cliked to close while opened cb3b62b
@meeloo meeloo UI touch and layout adjustments b74d633
Commits on Feb 22, 2014
@mathieugarcia mathieugarcia Fix android build b79454c
@meeloo meeloo Merge pull request #22 from mathieugarcia/nui4android
Fix android build
c49bd9e
@meeloo meeloo cosmetics abf37b2
@mathieugarcia mathieugarcia Fix freetype2 zlib issue on Android 735275d
@mathieugarcia mathieugarcia arm v7 eabi 842fe3c
@meeloo meeloo Merge pull request #24 from mathieugarcia/nui4android
Fix freetype2 zlib issue on Android
f0f7b88
@meeloo meeloo changed the licence text to MPL v2.0. NUI is officially not GPL anymore! 7cc8d9a
Commits on Feb 24, 2014
@meeloo meeloo started to fix android build shit 2ff9753
@meeloo meeloo fixed shit cd3ec2e
@meeloo meeloo started to fix android test startup d3aae0c
@meeloo meeloo fixed opengl context creation for OpenGL ES 2 f5c78ad
Commits on Mar 01, 2014
@meeloo meeloo added many logs
fixed basic android rendering, still lots of work to do but we're on the right path now!
0c28926
Commits on Mar 02, 2014
@meeloo meeloo started to work on orientations e0c6a0b
@meeloo meeloo hidpi ok on android 9f62e76
@meeloo meeloo Android WIP
fixed scalling of touch events
added logo to test resources (it works!)
c829b83
Commits on Mar 03, 2014
@meeloo meeloo android WIP d389137
@meeloo meeloo Android Bridge integrated into nui*
No test yet.
5c42cc8
Commits on Mar 04, 2014
@meeloo meeloo android is almost there a6abe7e
@meeloo meeloo ANDROID IS NOW OK! WOOOHOOO! e1a3c2f
@meeloo meeloo added android test projets (in android folder for now, I'll move them…
… back later)
434adb2
Commits on Mar 05, 2014
@meeloo meeloo commented log decd289
Commits on Mar 10, 2014
rechord user removing direct logs e1212a8
rechord user Merge branch 'master' of github.com:meeloo/nui3
Conflicts:
	src/Base/nuiInit.cpp
9b41580
rechord user added NGL_LOG_NEVER to completely remove logs a0f5b38
Commits on Mar 20, 2014
@meeloo meeloo removed log b4f2060
@meeloo meeloo fixed iOS nuiSurface broken because of GLKit
fixed too many glGetError() calls (disabled, re enable this to debug rendering)
8f6705d
Commits on Mar 22, 2014
@meeloo meeloo attribute Get/Set helper macros
nuiLayout recognises center in addition to left/right/top/bottom anchors
ec26640
Commits on Mar 23, 2014
@meeloo meeloo separate slider drawing in virtual sub methods 835abf1
Commits on Mar 28, 2014
@meeloo meeloo removed log 14caae9
Commits on Apr 02, 2014
@meeloo meeloo fixed nuiTextLayout multifont support, and probably many other bugs :-) 9867069
Commits on Apr 03, 2014
@meeloo meeloo better flow view (yet not great) 759f8fa
Commits on Apr 08, 2014
@meeloo meeloo added a way to ask for the children of a container to be drawn in rev…
…erse order (for clever rendering tricks)
da4799f
Commits on Apr 09, 2014
@meeloo meeloo much better nuiLabel wrapping
added wrapping, justification, left, right and center text layout implementations
e7273ca
@meeloo meeloo fixed layout modes 46ba517
@meeloo meeloo added simple API to ask for a textlayout mode in a label
fixed text layout API
cb63fee
@meeloo meeloo fixed corner cases crashes 9385918
Commits on Apr 11, 2014
@meeloo meeloo new attribute type for text layout
better flow view initial layout
f3d502d
Commits on Apr 12, 2014
@meeloo meeloo fixed MANY warnings a7ed97d
@meeloo meeloo uint -> int. wtf. b6c6ecb
@meeloo meeloo better initial size of nglWindow on iOS 5aaeaab
Commits on Apr 14, 2014
@meeloo meeloo fixed huge memory leaks in widgets, textures and surfaces. Yep, time …
…to update.
ba0bd07
Commits on Apr 15, 2014
@meeloo meeloo fixed surface / texture unlink
fixed shader program collisions
6b1ca2e
@meeloo meeloo fixed CSS updates never applied to widgets 12f9794
@meeloo meeloo widget types defined in CSS are now considered as real types by CSS d…
…ynamic matching
5aa819e
Commits on Apr 18, 2014
@meeloo meeloo fixed square cap line rendering 6348664
Commits on Apr 19, 2014
@meeloo meeloo faster nuiScrollView hot rect updates
better flowview
added API to fully handle custome visible rect (as in scroll view children)
ed4cf92
@meeloo meeloo enabled back partial redraw
some layout/invalidate optimizations
a23f587
@meeloo meeloo removed logs and debug traces 03e9adb
Commits on Apr 21, 2014
@meeloo meeloo better scroll defaults dfc8e82
Commits on Apr 22, 2014
@meeloo meeloo better flow layout
experimenting with opengl es options for iOS
e031ee9
Commits on Apr 23, 2014
@meeloo meeloo nuiDrawerView can now be non interactive 184ebb5
@meeloo meeloo added a way to change nuiDrawerView anim speed 35711e4
Commits on Apr 25, 2014
@meeloo meeloo fixed huge rendering bug with some implementation of OpenGL & CPU speeds
fixed MANY compilation warnings
fixed some errors found by Xcode's code analysis
5dc2742
@meeloo meeloo fixed stupid Xcode project change during clean up
small SetVisible optims
small renderstate copy optims
4886ad0
Commits on Apr 27, 2014
@meeloo meeloo much better handling of auto update layout in nuiWidget 8bfafc8
@meeloo meeloo removed debug flags 0da2073
Commits on Apr 30, 2014
@meeloo meeloo added Vertex buffer Objects (VBOs) + Vertex Array Objects (VAOs) for …
…better perfs

removed some unneedded nuiRenderState copies
Optimized the OpenGL renderer
048e805
Commits on May 02, 2014
@meeloo meeloo better support for debug options in nuiMainWindow
better nuiImage
4e3bf92
Commits on May 04, 2014
@meeloo meeloo simple progress bar rendering code 2b1cde7
Commits on May 06, 2014
@meeloo meeloo removed duplicate define ad61235
Commits on May 07, 2014
Sebastien Metrot wip 5db8421
Commits on May 09, 2014
Sebastien Metrot better log for touch debugins dcb59aa
Commits on May 14, 2014
Sebastien Metrot added a way to copy template parameters in nuiTask1 even if the type …
…if a const reference

will add it to all nuiTasks asap
545b2ec
@meeloo meeloo generalized nuiTask const ref parameter storage to all specialized im…
…plementations
5248401
@meeloo meeloo started to fix touch scrolling 65d51fe
Commits on May 18, 2014
Sebastien Metrot scroll view fixed behaviour
change introspector code visibility
1ca804e
Sebastien Metrot better repaint handling
introspector fixes
ea3c10c
Commits on May 21, 2014
Sebastien Metrot more setter/getter helper macros 47370e5
Commits on May 22, 2014
Sebastien Metrot fixed crash when CFStringRef is null cd74b5f
Commits on May 27, 2014
Sebastien Metrot Steal Mouse adaptations WIP 0c0de74
@meeloo meeloo StealMouse protocol WIP 80528a8
Sebastien Metrot a widgets can now refuse mouse stealing 482b44c
Sebastien Metrot better drawer behaviour when mouse steal is refused (bis) acdb3cb
Commits on May 28, 2014
@meeloo meeloo added logs 5028410
Sebastien Metrot better mouse stealing behaviour for nuiSlider 8bdd163
Sebastien Metrot much better touch scrolling 52b222b
Sebastien Metrot better nuiScrollView with multi touch 1adfd20
Commits on May 30, 2014
Sebastien Metrot wip ed8d552
Sebastien Metrot better range inits dc62b0d
Commits on May 31, 2014
Sebastien Metrot runtime optimisations
started to fix nuiScrollView broken behaviour
a6e2e7a
Commits on Jun 05, 2014
Sebastien Metrot fixed crash 20982b9
Commits on Jun 10, 2014
Sebastien Metrot added basic support for remote notifications on iOS 95d0098
Commits on Jun 11, 2014
Sebastien Metrot added a simple way to nuiObjects life cycles
better sprite anims
better remote notifications
251b1ed
Sebastien Metrot destroy linked objects :-) a553f75
@meeloo meeloo better OSX audio devices 4cecbaf
@meeloo meeloo better handling of network pbms in nuiHTTP 6b5f1b0
@meeloo meeloo http crash when no network fixes
better scrollview behaviour
e107063
Commits on Jun 17, 2014
Sebastien Metrot better nuiLabel wrapping behaviour on layout change 59722ee
Commits on Jul 06, 2014
Sebastien Metrot safer 20365d8
Commits on Jul 21, 2014
Sebastien Metrot simple optim cf6a54b
Commits on Aug 04, 2014
@meeloo meeloo slightly better nuiGlPainter::DestroyTexture implementation 05176a3
@meeloo meeloo better close/toogle/open interactions 7e5ded1
Commits on Aug 06, 2014
@meeloo meeloo added a way to dump mouse grabs list in nuiTopLevel
Better mouse handling in nuiLayout
09171ba
@meeloo meeloo fixed nuiScrollView::MouseCanceled behaviour! 2fb6fc7
Commits on Aug 13, 2014
@meeloo meeloo added a way to get the scalling factor from any widget
fixed typos
added GL_GLEXT_PROTOTYPES define for linux users
fec53e2
Commits on Sep 21, 2014
Sebastien Metrot better path backup handling (iOS)
fixed nuiScrollView behaviour on mouse steal/cancel
76695cc
Sebastien Metrot Merge branch 'master' of github.com:meeloo/nui3
Conflicts:
	src/Layout/nuiScrollView.cpp
6fee468
Sebastien Metrot better scroll view mouse cancel fix e802b9d
Commits on Sep 22, 2014
Sebastien Metrot better scroll view a256d21
Sebastien Metrot bleh 01a0ae3
Commits on Nov 10, 2014
Sebastien Metrot Merge branch 'master' of github.com:libnui/nui3 into merge 5e1ec41