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

Refined the colouring of widget to be more in sync with the defaults used in Qt.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14384 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-07-24 13:25:49 +00:00
parent 3a7942dfb7
commit cbd2d6e434
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgUI/ComboBox.cpp
View File

@@ -171,9 +171,9 @@ void ComboBox::createGraphicsImplementation()
osg::ref_ptr<osg::Group> group = new osg::Group;
bool requiresFrame = (getFrameSettings() && getFrameSettings()->getShape()!=osgUI::FrameSettings::NO_FRAME);
float frameWidth = 0.0;
osg::Vec4 frameColor(0.97f,0.97f,0.97f,1.0f);
if (requiresFrame)
{
osg::Vec4 frameColor(0.75f,0.75f,0.75f,1.0f);
frameWidth = getFrameSettings()->getLineWidth();
group->addChild(style->createFrame(_extents, getFrameSettings(), frameColor));
@@ -234,7 +234,7 @@ void ComboBox::createGraphicsImplementation()
}
else
{
_buttonSwitch->addChild( style->createPanel(_extents, osg::Vec4(1.0f,1.0f,1.0f,1.0f)) );
_buttonSwitch->addChild( style->createPanel(_extents, frameColor) );
}
_buttonSwitch->setSingleChildOn(_currentItem);