Changeset 11071 for code/trunk/src/modules/overlays/OverlayText.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/overlays/OverlayText.cc
r9667 r11071 32 32 #include <OgrePanelOverlayElement.h> 33 33 #include <OgreTextAreaOverlayElement.h> 34 #include <boost/static_assert.hpp>35 34 36 35 #include "util/StringUtils.h" … … 43 42 RegisterClass(OverlayText); 44 43 45 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Left == (int)OverlayText::Left);46 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Center);47 BOOST_STATIC_ASSERT((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText::Right);44 static_assert((int)Ogre::TextAreaOverlayElement::Left == (int)OverlayText::Alignment::Left, "check enum"); 45 static_assert((int)Ogre::TextAreaOverlayElement::Center == (int)OverlayText::Alignment::Center, "check enum"); 46 static_assert((int)Ogre::TextAreaOverlayElement::Right == (int)OverlayText::Alignment::Right, "check enum"); 48 47 49 48 OverlayText::OverlayText(Context* context) … … 86 85 { 87 86 if (alignment == "right") 88 this->setAlignment(OverlayText:: Right);87 this->setAlignment(OverlayText::Alignment::Right); 89 88 else if (alignment == "center") 90 this->setAlignment(OverlayText:: Center);89 this->setAlignment(OverlayText::Alignment::Center); 91 90 else // "left" and default 92 this->setAlignment(OverlayText:: Left);91 this->setAlignment(OverlayText::Alignment::Left); 93 92 } 94 93 … … 112 111 void OverlayText::sizeChanged() 113 112 { 114 if (this->rotState_ == Horizontal)113 if (this->rotState_ == RotationState::Horizontal) 115 114 this->overlay_->setScale(size_.y * sizeCorrection_.y, size_.y * sizeCorrection_.y); 116 else if (this->rotState_ == Vertical)115 else if (this->rotState_ == RotationState::Vertical) 117 116 this->overlay_->setScale(size_.y / (sizeCorrection_.y * sizeCorrection_.y), size_.y * sizeCorrection_.y); 118 117 else
Note: See TracChangeset
for help on using the changeset viewer.