Changeset 11211 for code/branches/ogre1.9/src/libraries/core

Timestamp:

Jul 5, 2016, 11:46:10 PM (9 years ago)

Author:

bknecht

Message:

Merging cegui0.8 branch into ogre1.9 branch

Location:

code/branches/ogre1.9

Files:

• . (modified) (1 prop)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)

code/branches/ogre1.9/src/libraries/core/GUIManager.cc

@@ -664 +664 @@
             this->setBackgroundImage("");
         else
-            this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
+            this->setBackgroundImage(imageSet + "/" + imageName);
     }
 
@@ -907 +907 @@
 #if CEGUI_VERSION >= 0x000800
         this->guiRenderer_->setDisplaySize(CEGUI::Sizef((float)newWidth, (float)newHeight));
-        this->rootWindow_->setSize(CEGUI::USize(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
+        this->rootWindow_->setSize(CEGUI::Size<CEGUI::UDim>(CEGUI::UDim(1, (float)newWidth), CEGUI::UDim(1, (float)newHeight)));
 #else
         this->guiRenderer_->setDisplaySize(CEGUI::Size((float)newWidth, (float)newHeight));