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

Added preliminary icon to ComboBox.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14391 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-07-29 15:50:55 +00:00
parent a3794f3bd3
commit 46440ad0a8
2 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgUI/ComboBox
View File

@@ -25,8 +25,8 @@ class OSGUI_EXPORT Item : public osg::Object
{
public:
Item() : _color(1.0f,1.0f,1.0f,1.0f) {}
Item(const std::string& str) : _text(str), _color(1.0f,1.0f,1.0f,1.0f) {}
Item() : _color(1.0f,1.0f,1.0f,0.0f) {}
Item(const std::string& str) : _text(str), _color(1.0f,1.0f,1.0f,0.0f) {}
Item(const std::string& str, const osg::Vec4& col) : _text(str), _color(col) {}
Item(const osg::Vec4& col) : _color(col) {}
@@ -87,7 +87,7 @@ protected:
unsigned int _currentItem;
osg::ref_ptr<osg::Switch> _buttonSwitch;
osg::ref_ptr<osg::Switch> _backgroundSwitch;
osg::ref_ptr<osgUI::Popup> _popup;
};