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
Show Stats 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);

2
src/osgUI/Dialog.cpp
View File

@ -58,7 +58,7 @@ void Dialog::createGraphicsImplementation()
float titleHeight = 10.0;
osg::BoundingBox titleBarExents(_extents.xMin(), _extents.yMax(), _extents.zMin(), _extents.xMax(), _extents.yMax()+titleHeight, _extents.zMin());
osg::Vec4 dialogBackgroundColor(0.8,0.8,0.8,1.0);
osg::Vec4 dialogBackgroundColor(0.84,0.82,0.82,1.0);
osg::Vec4 dialogTitleBackgroundColor(0.5,0.5,1.0,1.0);
_group->addChild( style->createPanel(_extents, dialogBackgroundColor) );

4
src/osgUI/LineEdit.cpp
View File

@ -81,7 +81,7 @@ void LineEdit::createGraphicsImplementation()
osg::ref_ptr<osg::Group> group = new osg::Group;
osg::BoundingBox extents(_extents);
osg::Vec4 frameColor(0.75f,0.75f,0.75f,1.0f);
osg::Vec4 frameColor(1.0f,1.0f,1.0f,1.0f);
bool requiresFrame = (getFrameSettings() && getFrameSettings()->getShape()!=osgUI::FrameSettings::NO_FRAME);
if (requiresFrame)
@ -93,6 +93,8 @@ void LineEdit::createGraphicsImplementation()
extents.yMax() -= getFrameSettings()->getLineWidth();
}
// clear background of edit region
group->addChild(style->createPanel(extents, frameColor));
osg::ref_ptr<Node> node = style->createText(extents, getAlignmentSettings(), getTextSettings(), _text);
_textDrawable = dynamic_cast<osgText::Text*>(node.get());

8
src/osgUI/PushButton.cpp
View File

@ -77,11 +77,11 @@ void PushButton::createGraphicsImplementation()
_buttonSwitch = new osg::Switch;
float unFocused = 0.7;
float withFocus = 0.8;
float pressed = 0.5;
float unFocused = 0.92;
float withFocus = 0.97;
float pressed = 0.75;
osg::Vec4 frameColor(0.75f,0.75f,0.75f,1.0f);
osg::Vec4 frameColor(unFocused,unFocused,unFocused,1.0f);
osg::BoundingBox extents(_extents);