On Mon, 2008-08-18 at 11:47 +0100, Robert Osfield wrote: > Hi Sergey and Jeremy, > > Jeremy hasn't yet merged your change into his > OpenSceneGraph-osgWidget-dev branch, and since I'm about to tag 2.7.0 > I wanted to get fully up to date, so I've gone head and merged your > changes into svn/trunk. > > Jeremy, could you merge this changes into your branch, along with > others made the svn/trunk to make sure things are in sync. Another > change I made to osgWidget was to convert all tabs to four spaces, to > be in keeping with how the rest of the OSG is formatted. four spaces > are used in place of tabs to make sure that formatting is the same in > all editors, as tab width can vary from editor to editor.
I've got a lot of stuff in my local tree in a state of flux, but I'll go ahead and commit it at the end of the day. > Cheers, > Robert. > > On Fri, Aug 15, 2008 at 3:46 PM, Leontyev, Sergey <[EMAIL PROTECTED]> wrote: > > I submitted a fix for osgWidget 2 days ago, but I did not see it on the > > submission list. > > > > Maybe it got lost, so here it is again. > > > > > > > > Thanks > > > > Sergey > > > > > > > > From: Leontyev, Sergey > > Sent: Tuesday, August 12, 2008 5:38 PM > > To: '[email protected]' > > Subject: minor fixes for osgWidget > > > > > > > > Some minor bug fixes for osgWidget: > > > > Jeremy Moles seemed to approve these fixes > > > > > > > > 1. In StyleManager > > > > > > > > when applying styles to a Label element the code below runs in a infinite > > loop. > > > > The reason for this is that nothing increments the Reader "r" in the case > > when applying a style to label, > > > > so I advance the reader when no match was found. > > > > ( To replicate the error apply style to any label) > > > > > > > > replaced this: > > > > while(!r.eof()) if(_styles[style]->applyStyle(t, r)) inc = > > true; > > > > > > > > with this: > > > > while(!r.eof()) > > > > { > > > > if(_styles[style]->applyStyle(t, r)) > > > > inc = true; > > > > else > > > > r.advanceOverCurrentFieldOrBlock(); > > > > } > > > > > > > > > > > > I tested it and it works well for me, I did not find any problems with it. > > > > > > > > > > > > 2. Added style support for Canvas element, event though there is no styles > > to apply yet. > > > > It is usefull for someone who inherits from Canvas class to develop another > > element. > > > > If applyStyle(Canvas) does not exist > > > > there is no way to apply style to the element that inherited from Canvas > > element. > > > > > > > > Added virtual > > > > bool applyStyle(Canvas). > > > > > > > > and in added call to apply style if the Object is of type Canvas: > > > > StyleManager::_applyStyleToObject(osg::Object* obj, const std::string& > > style) { > > > > ... > > > > > > > > else if(!std::string("Canvas").compare(c)) > > > > return _coerceAndApply<Canvas>(obj,style,c); > > > > > > > > Works as expected. > > > > > > > > Sergey Leontyev > > > > _______________________________________________ > > osg-submissions mailing list > > [email protected] > > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
