diff options
| author | oy <Tom_Adams@web.de> | 2011-01-29 18:48:55 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-29 18:48:55 +0100 |
| commit | be68a4f516d75c62cd7a505f8a5da297c9ff1d41 (patch) | |
| tree | 950159a4515c4eac91079c36fa3931faeb2e55e0 | |
| parent | 55cc93f4af8984c0796aa628b8449b291d48201c (diff) | |
| download | zcatch-be68a4f516d75c62cd7a505f8a5da297c9ff1d41.tar.gz zcatch-be68a4f516d75c62cd7a505f8a5da297c9ff1d41.zip | |
added fix by CarmineZ about missing tool tips in the editor
| -rw-r--r-- | src/engine/client/text.cpp | 14 | ||||
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 20 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/engine/client/text.cpp b/src/engine/client/text.cpp index d24c41ae..e3509143 100644 --- a/src/engine/client/text.cpp +++ b/src/engine/client/text.cpp @@ -178,13 +178,13 @@ class CTextRender : public IEngineTextRender mem_free(pMem); } - int AdjustOutlineThicknessToFontSize(int OutlineThickness, int FontSize) - { - if(FontSize > 36) - OutlineThickness *= 4; - else if(FontSize >= 18) - OutlineThickness *= 2; - return OutlineThickness; + int AdjustOutlineThicknessToFontSize(int OutlineThickness, int FontSize) + { + if(FontSize > 36) + OutlineThickness *= 4; + else if(FontSize >= 18) + OutlineThickness *= 2; + return OutlineThickness; } void IncreaseTextureSize(CFontSizeData *pSizeData) diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 769018bb..ec708f0c 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -417,7 +417,7 @@ int CEditor::DoButton_MenuItem(const void *pID, const char *pText, int Checked, CUIRect t = *pRect; t.VMargin(5.0f, &t); UI()->DoLabel(&t, pText, 10, -1, -1); - return DoButton_Editor_Common(pID, pText, Checked, pRect, 0, 0); + return DoButton_Editor_Common(pID, pText, Checked, pRect, Flags, pToolTip); } int CEditor::DoButton_Tab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Flags, const char *pToolTip) @@ -1026,15 +1026,15 @@ void CEditor::DoQuadPoint(CQuad *q, int QuadIndex, int v) { for(int m = 0; m < 4; m++) if(m_SelectedPoints&(1<<m)) - { - // 0,2;1,3 - line x - // 0,1;2,3 - line y - - q->m_aTexcoords[m].x += f2fx(dx*0.001f); - q->m_aTexcoords[(m+2)%4].x += f2fx(dx*0.001f); - - q->m_aTexcoords[m].y += f2fx(dy*0.001f); - q->m_aTexcoords[m^1].y += f2fx(dy*0.001f); + { + // 0,2;1,3 - line x + // 0,1;2,3 - line y + + q->m_aTexcoords[m].x += f2fx(dx*0.001f); + q->m_aTexcoords[(m+2)%4].x += f2fx(dx*0.001f); + + q->m_aTexcoords[m].y += f2fx(dy*0.001f); + q->m_aTexcoords[m^1].y += f2fx(dy*0.001f); } } } |