diff options
| author | Piotr Dziwiński <piotrdz@gmail.com> | 2013-11-19 10:08:32 -0800 |
|---|---|---|
| committer | Piotr Dziwiński <piotrdz@gmail.com> | 2013-11-19 10:08:32 -0800 |
| commit | 5514c950b90788a9f030f585777f5779af76f2aa (patch) | |
| tree | 12c96328023033c276e3d36b1be67017681d2aea | |
| parent | 81b940cc25e6892ac752005521b3adba4534177b (diff) | |
| parent | 3bcf80a82aff5652fad3840884c1a762b4d2f296 (diff) | |
| download | colobot-5514c950b90788a9f030f585777f5779af76f2aa.tar.gz colobot-5514c950b90788a9f030f585777f5779af76f2aa.tar.bz2 colobot-5514c950b90788a9f030f585777f5779af76f2aa.zip | |
Merge pull request #252 from OdyX/dev-fix-tooltip-color
Fix tooltip to display as white and not transparent
| -rw-r--r-- | src/object/robotmain.cpp | 4 | ||||
| -rw-r--r-- | src/ui/window.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 6fe85d3..26fa827 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -3138,9 +3138,9 @@ void CRobotMain::CreateTooltip(Math::Point pos, const char* text) start, end); start.x -= 0.010f; - start.y -= 0.002f; + start.y -= 0.006f; end.x += 0.010f; - end.y += 0.004f; // ch'tite (?) margin + end.y += 0.008f; // small'ish margin pos.x = start.x; pos.y = start.y; diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 8005939..6e082e6 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -1191,8 +1191,8 @@ void CWindow::DrawVertex(Math::Point pos, Math::Point dim, int icon) else if ( icon == 1 ) { m_engine->SetTexture("button1.png"); - m_engine->SetState(Gfx::ENG_RSTATE_TTEXTURE_WHITE); - uv1.x = 128.0f/256.0f; // yellow tooltip + m_engine->SetState(Gfx::ENG_RSTATE_NORMAL); + uv1.x = 128.0f/256.0f; // white tooltip uv1.y = 0.0f/256.0f; uv2.x = 224.0f/256.0f; uv2.y = 16.0f/256.0f; |