diff options
| author | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
|---|---|---|
| committer | Zaba999 <zaba.marcin@gmail.com> | 2012-09-18 22:39:10 +0200 |
| commit | 7bce8f073c9212247d104266d417e46e884b72c2 (patch) | |
| tree | 89da914094bf7d0e92c5da1e14e9e4298340c799 /src/ui/list.cpp | |
| parent | 36ae984ac77c5545d3d11dde7e37913a8eff0b0d (diff) | |
| parent | da5d4edeb3a41462ec987cb4994a6897823f3f76 (diff) | |
| download | colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.gz colobot-7bce8f073c9212247d104266d417e46e884b72c2.tar.bz2 colobot-7bce8f073c9212247d104266d417e46e884b72c2.zip | |
Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
src/ui/slider.cpp
Diffstat (limited to 'src/ui/list.cpp')
| -rw-r--r-- | src/ui/list.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/list.cpp b/src/ui/list.cpp index 68a87b8..5ecebf3 100644 --- a/src/ui/list.cpp +++ b/src/ui/list.cpp @@ -43,7 +43,7 @@ CList::CList() : CControl() for (int i = 0; i < 10; i++) { m_tabs[i] = 0.0f; - m_justifs[i] = Gfx::TEXT_ALIGN_RIGHT; + m_justifs[i] = Gfx::TEXT_ALIGN_LEFT; } m_totalLine = 0; @@ -128,7 +128,7 @@ bool CList::MoveAdjust() for (int i = 0; i < m_displayLine; i++) { m_button[i] = new CButton(); m_button[i]->Create(ppos, ddim, -1, EVENT_NULL); - m_button[i]->SetTextAlign(Gfx::TEXT_ALIGN_RIGHT); + m_button[i]->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); m_button[i]->SetState(STATE_SIMPLY); m_button[i]->SetFontType(m_fontType); m_button[i]->SetFontSize(m_fontSize); @@ -414,7 +414,7 @@ void CList::Draw() ppos.y = pos.y + dim.y * 0.5f; ppos.y -= m_engine->GetText()->GetHeight(m_fontType, m_fontSize) / 2.0f; ddim.x = dim.x-dim.y; - DrawCase(m_text[i + m_firstLine], ppos, ddim.x, Gfx::TEXT_ALIGN_RIGHT); + DrawCase(m_text[i + m_firstLine], ppos, ddim.x, Gfx::TEXT_ALIGN_LEFT); } else { ppos.x = pos.x + dim.y * 0.5f; ppos.y = pos.y + dim.y * 0.5f; @@ -504,7 +504,7 @@ void CList::DrawCase(char *text, Math::Point pos, float width, Gfx::TextAlign ju { if (justif == Gfx::TEXT_ALIGN_CENTER) pos.x += width / 2.0f; - else if (justif == Gfx::TEXT_ALIGN_LEFT) + else if (justif == Gfx::TEXT_ALIGN_RIGHT) pos.x += width; m_engine->GetText()->DrawText(std::string(text), m_fontType, m_fontSize, pos, width, justif, 0); } |