Browse Source

Fixed tooltip text that was showing up incorrectly

Tim Newell 12 years ago
parent
commit
9cfb4b7467

+ 1 - 1
engine/source/gui/guiControl.cc

@@ -458,7 +458,7 @@ void GuiControl::onRender(Point2I offset, const RectI &updateRect)
 
 
 bool GuiControl::renderTooltip(Point2I cursorPos, const char* tipText )
 bool GuiControl::renderTooltip(Point2I cursorPos, const char* tipText )
 {
 {
-#if defined(TORQUE_OS_IOS) || defined(TORQUE_OS_ANDROID)
+#if !defined(TORQUE_OS_IOS) && !defined(TORQUE_OS_ANDROID)
     // Short Circuit.
     // Short Circuit.
     if (!mAwake) 
     if (!mAwake) 
         return false;
         return false;

+ 2 - 2
engine/source/platformAndroid/AndroidFont.cpp

@@ -75,7 +75,7 @@ bool AndroidFont::create( const char* name, U32 size, U32 charset )
     scaledSize = mRound(scaledSize);
     scaledSize = mRound(scaledSize);
     
     
 
 
-    //TODO: generating font cache on android does not work.  Need to generate cache on desktop first.
+    //todo: generating font cache on android does not work.  Need to generate cache on desktop first.
     //freetype2 would need to be added to generate on device.
     //freetype2 would need to be added to generate on device.
     // Create the font reference.
     // Create the font reference.
     //mFontRef = CTFontCreateWithName( fontName, scaledSize, NULL );
     //mFontRef = CTFontCreateWithName( fontName, scaledSize, NULL );
@@ -147,7 +147,7 @@ PlatformFont::CharInfo& AndroidFont::getCharInfo(const UTF16 character) const
     characterInfo.xOffset = 0;
     characterInfo.xOffset = 0;
     characterInfo.yOffset = 0;
     characterInfo.yOffset = 0;
     
     
-    //TODO: getcharinfo if freetype2 font creation on device is added
+    //todo: getcharinfo if freetype2 font creation on device is added
     /*
     /*
     CGGlyph characterGlyph;
     CGGlyph characterGlyph;
     CGRect characterBounds;
     CGRect characterBounds;

+ 0 - 5
engine/source/platformAndroid/AndroidFont.h

@@ -25,11 +25,6 @@
 class AndroidFont : public PlatformFont
 class AndroidFont : public PlatformFont
 {
 {
 private:
 private:
-    
-    // Font reference.
-	//TODO: font code
-    //CTFontRef       mFontRef;
-    
     // Distance from drawing point to typographic baseline.
     // Distance from drawing point to typographic baseline.
     // Think of the drawing point as the upper left corner of a text box.
     // Think of the drawing point as the upper left corner of a text box.
     // NOTE: 'baseline' is synonymous with 'ascent' in Torque.
     // NOTE: 'baseline' is synonymous with 'ascent' in Torque.