FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduced Widget::WidgetStateSet to help localize the StateSet set up by Widget implementations from being serialized or

Browse Source 
affecting what end users apply via the standard Node::s/getStateSet().

Further work on TabWidget.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14440 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-09 13:37:33 +00:00
parent 0db0bcdd5e
commit e93e7ca1f2
13 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgUI/Popup.cpp
View File

@@ -77,11 +77,11 @@ void Popup::createGraphicsImplementation()
bool requiresFrame = (getFrameSettings() && getFrameSettings()->getShape()!=osgUI::FrameSettings::NO_FRAME);
if (requiresFrame) { _transform->addChild(style->createFrame(_extents, getFrameSettings(), dialogBackgroundColor)); }
#if 1
style->setupDialogStateSet(getOrCreateStateSet(),6);
style->setupDialogStateSet(getOrCreateWidgetStateSet(),6);
#else
style->setupPopupStateSet(getOrCreateStateSet(),6);
style->setupPopupStateSet(getOrCreateWidgetStateSet(),6);
#endif
style->setupClipStateSet(_extents, getOrCreateStateSet());
style->setupClipStateSet(_extents, getOrCreateWidgetStateSet());
// render before the subgraph