Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add tooltip on textscroller

Browse Source
This commit is contained in:
Anthony Calosa
2016-07-13 13:07:29 +08:00
parent ab75c1d5e2
commit d6d147187d
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameStateMenu.cpp
+1 -2
View File
@@ -781,8 +781,7 @@ void GameStateMenu::Render()
sprintf(text, "%s", _("LOADING...").c_str()); sprintf(text, "%s", _("LOADING...").c_str());
} }
//rectangle //rectangle
renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(225,5,5,5)); renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(225,5,5,5));;
//renderer->FillRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(25,205,0,0));
renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0)); renderer->DrawRect(0, SCREEN_HEIGHT - 50, SCREEN_WIDTH + 1.5f, mFont->GetHeight(),ARGB(200, 204, 153, 0));
//end //end
mFont->SetColor(ARGB(170,0,0,0)); mFont->SetColor(ARGB(170,0,0,0));
projects/mtg/src/TextScroller.cpp
+11 -3
View File
@@ -67,10 +67,18 @@ void TextScroller::Update(float dt)
void TextScroller::Render() void TextScroller::Render()
{ {
WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
//JRenderer::GetInstance()->DrawLine(mX,mY,mX+mWidth,mY, ARGB(100, 255, 255, 255)); //tooltip
JQuadPtr tooltips;
tooltips = WResourceManager::Instance()->RetrieveTempQuad("tooltips.png");//new graphics tooltips
if (tooltips.get())
{
float xscale = (mWidth+(mWidth/18)) / tooltips->mWidth;
float yscale = mFont->GetHeight() / tooltips->mHeight;
JRenderer::GetInstance()->RenderQuad(tooltips.get(), mX-4.5f, mY+0.5f,0,xscale,yscale);
}
else
JRenderer::GetInstance()->FillRoundRect(mX,mY,mWidth,mFont->GetHeight(), 1, ARGB(225,5,5,5)); JRenderer::GetInstance()->FillRoundRect(mX,mY,mWidth,mFont->GetHeight(), 1, ARGB(225,5,5,5));
//JRenderer::GetInstance()->FillRect(mX,mY,mWidth,mFont->GetHeight(), ARGB(25,205,0,0)); //end tooltip
//JRenderer::GetInstance()->DrawLine(mX,mY+11,mX+mWidth,mY+11, ARGB(100, 255, 255, 255));
mFont->DrawString(mText.c_str(), mX, mY, JGETEXT_LEFT, start, mWidth); mFont->DrawString(mText.c_str(), mX, mY, JGETEXT_LEFT, start, mWidth);
} }