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

Merge pull request #749 from kevlahnota/master

Browse Source 
small adjustment
This commit is contained in:
Anthony Calosa
2016-07-12 19:27:57 +08:00
committed by GitHub
parent a6cbd10f3b 684cb086cc
commit c6f1784d9d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/src/SimpleMenu.cpp
View File

@@ -175,7 +175,7 @@ void SimpleMenu::Render()
float heightPadding = SimpleMenuConst::kLineHeight/2; // this to reduce the bottom padding of the menu
if(!title.empty())
adjustme += 7.f;
adjustme += 3.f;
//renderer->FillRect(mX, mY, mWidth, height - heightPadding, ARGB(180,0,0,0));

6
projects/mtg/src/TextScroller.cpp
View File

@@ -67,10 +67,10 @@ void TextScroller::Update(float dt)
void TextScroller::Render()
{
WFont * mFont = WResourceManager::Instance()->GetWFont(fontId);
JRenderer::GetInstance()->DrawLine(mX,mY,mX+mWidth,mY, ARGB(100, 255, 255, 255));
JRenderer::GetInstance()->FillRect(mX,mY,mWidth,mFont->GetHeight(), ARGB(225,5,5,5));
//JRenderer::GetInstance()->DrawLine(mX,mY,mX+mWidth,mY, ARGB(100, 255, 255, 255));
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));
JRenderer::GetInstance()->DrawLine(mX,mY+11,mX+mWidth,mY+11, ARGB(100, 255, 255, 255));
//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);
}