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

Merge pull request #1464 from nipsufn/master 

fix SatCom content offset on screens with high resolution / small font size
fix-squashed-planets
Mateusz Przybył 2021-12-04 10:01:53 +01:00 committed by GitHub
parent 1438438937 117c72ba72
commit 96fece4e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -11,6 +11,8 @@ Makefile
/src/libcolobotbase.a
# Ignore the generated documentation
CMakeDoxyfile.in
CMakeDoxygenDefaults.cmake
/doc
/Doxyfile

4
src/ui/controls/edit.cpp
View File

@ -955,7 +955,7 @@ void CEdit::Draw()
if ( i >= m_lineFirst+m_lineVisible ) break;
pos.x = m_pos.x+(7.5f/640.0f)*(m_fontSize/Gfx::FONT_SIZE_SMALL);
pos.x = m_pos.x+(7.5f/640.0f);
if ( m_bAutoIndent )
{
const char *s = "\t"; // line | dotted
@ -1117,7 +1117,7 @@ void CEdit::Draw()
{
if ( i == m_lineTotal-1 || m_cursor1 < m_lineOffset[i+1] )
{
pos.x = m_pos.x+(7.5f/640.0f)*(m_fontSize/Gfx::FONT_SIZE_SMALL);
pos.x = m_pos.x+(7.5f/640.0f);
if ( m_bAutoIndent )
{
pos.x += indentLength*m_lineIndent[i];