This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch upstream/latest in repository colobot.
commit d23170aaf1e35381410cf3b564be56b75c68f38d Author: krzys-h <krzy...@interia.pl> Date: Thu Apr 23 21:01:04 2015 +0200 Fixed monospace CBot editor font (closes #464) --- src/ui/edit.cpp | 6 +++--- src/ui/studio.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index 3ebc281..8c5853e 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -1483,7 +1483,7 @@ bool CEdit::ReadText(std::string filename, int addSize) m_format.reserve(m_maxChar+1); for (i = 0; i <= m_maxChar+1; i++) { - m_format.push_back(0); + m_format.push_back(m_fontType); } stream.close(); @@ -1924,7 +1924,7 @@ void CEdit::SetMaxChar(int max) m_format.reserve(m_maxChar+1); for (int i = 0; i <= m_maxChar+1; i++) { - m_format.push_back(0); + m_format.push_back(m_fontType); } m_len = 0; @@ -2120,7 +2120,7 @@ void CEdit::SetMultiFont(bool bMulti) m_format.reserve(m_maxChar+1); for (int i = 0; i <= m_maxChar+1; i++) { - m_format.push_back(0); + m_format.push_back(m_fontType); } } } diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 659d0c3..f4d131b 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -595,7 +595,7 @@ void CStudio::StartEditScript(CScript *script, std::string name, Program* progra //? if ( m_bRunning ) edit->SetEdit(false); edit->SetMaxChar(EDITSTUDIOMAX); edit->SetFontType(Gfx::FONT_COURIER); - edit->SetFontStretch(0.7f); + edit->SetFontStretch(1.0f); edit->SetDisplaySpec(true); edit->SetAutoIndent(m_engine->GetEditIndentMode()); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits