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

Improved the handling of the dialog title text

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14442 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-09 16:12:59 +00:00
parent 57a42aac39
commit 6b82d4099f
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgUI/Dialog.cpp
View File

@@ -112,18 +112,8 @@ void Dialog::createGraphicsImplementation()
titleLabel->setFrameSettings(getFrameSettings());
titleLabel->getOrCreateUserDataContainer()->addUserObject(new osgUI::DragCallback);
#if 1
#if 0
_group->addChild(closeButton.get());
_group->addChild(titleLabel.get());
#else
setGraphicsSubgraph(-3, closeButton.get());
setGraphicsSubgraph(-2, titleLabel.get());
#endif
#else
addChild(closeButton.get());
addChild(titleLabel.get());
#endif
_group->addChild(closeButton.get());
_group->addChild(titleLabel.get());
style->setupDialogStateSet(getOrCreateWidgetStateSet(), 5);
style->setupClipStateSet(dialogWithTitleExtents, getOrCreateWidgetStateSet());

20
src/osgUI/TabWidget.cpp
View File

@@ -95,7 +95,7 @@ void TabWidget::createGraphicsImplementation()
float unselected = 0.92f;
float selected = 0.97f;
float titleHeight = 10.0f;
float characterWidth = titleHeight*0.5f;
float characterWidth = titleHeight*0.7f;
float margin = titleHeight*0.1f;
float xPos = _extents.xMin();
float yMin = _extents.yMax()-titleHeight;
@@ -117,12 +117,20 @@ void TabWidget::createGraphicsImplementation()
<<headerExtents.xMin()<<", "<<headerExtents.yMin()<<", "<<headerExtents.zMin()<<", "
<<headerExtents.xMax()<<", "<<headerExtents.yMax()<<", "<<headerExtents.zMax()<<std::endl;
osg::ref_ptr<Node> text = style->createText(headerExtents, getAlignmentSettings(), getTextSettings(), tab->getText());
osg::ref_ptr<Node> selected_panel = style->createPanel(headerExtents, osg::Vec4(unselected, unselected, unselected, 1.0f));
osg::ref_ptr<Node> unselected_panel = style->createPanel(headerExtents, osg::Vec4(selected, selected, selected, 1.0f));
osg::ref_ptr<osg::Node> text = style->createText(headerExtents, getAlignmentSettings(), getTextSettings(), tab->getText());
osg::ref_ptr<osg::Node> unselected_panel = style->createPanel(headerExtents, osg::Vec4(unselected, unselected, unselected, 1.0f));
osg::ref_ptr<osg::Node> selected_panel = style->createPanel(headerExtents, osg::Vec4(selected, selected, selected, 1.0f));
_selectedHeaderSwitch->addChild(selected_panel.get());
_selectedHeaderSwitch->addChild(unselected_panel.get());
osg::ref_ptr<osg::Group> selected_group = new osg::Group;
selected_group->addChild(selected_panel.get());
selected_group->addChild(text.get());
osg::ref_ptr<osg::Group> unselected_group = new osg::Group;
unselected_group->addChild(unselected_panel.get());
unselected_group->addChild(text.get());
_unselectedHeaderSwitch->addChild(unselected_group.get());
_selectedHeaderSwitch->addChild(selected_group.get());
_tabWidgetSwitch->addChild(tab->getWidget());
xPos += width+margin;