immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #252 from OdyX/dev-fix-tooltip-color 

Fix tooltip to display as white and not transparent
dev-ui
Piotr Dziwiński 2013-11-19 10:08:32 -08:00
parent 81b940cc25 3bcf80a82a
commit 5514c950b9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object/robotmain.cpp
View File

@ -3138,9 +3138,9 @@ void CRobotMain::CreateTooltip(Math::Point pos, const char* text)
start, end); start, end);
start.x -= 0.010f; start.x -= 0.010f;
start.y -= 0.002f; start.y -= 0.006f;
end.x += 0.010f; end.x += 0.010f;
end.y += 0.004f; // ch'tite (?) margin end.y += 0.008f; // small'ish margin
pos.x = start.x; pos.x = start.x;
pos.y = start.y; pos.y = start.y;

4
src/ui/window.cpp
View File

@ -1191,8 +1191,8 @@ void CWindow::DrawVertex(Math::Point pos, Math::Point dim, int icon)
else if ( icon == 1 ) else if ( icon == 1 )
{ {
m_engine->SetTexture("button1.png"); m_engine->SetTexture("button1.png");
m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); m_engine->SetState(Gfx::ENG_RSTATE_NORMAL);
uv1.x = 128.0f/256.0f; // yellow tooltip uv1.x = 128.0f/256.0f; // white tooltip
uv1.y = 0.0f/256.0f; uv1.y = 0.0f/256.0f;
uv2.x = 224.0f/256.0f; uv2.x = 224.0f/256.0f;
uv2.y = 16.0f/256.0f; uv2.y = 16.0f/256.0f;