diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/editor/editor.cpp | 3 | ||||
| -rw-r--r-- | src/game/editor/popups.cpp | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 40948d82..84308ab6 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -2417,6 +2417,9 @@ void CEditor::RenderImages(CUIRect ToolBox, CUIRect ToolBar, CUIRect View) r.w = r.h; else r.h = r.w; + float Max = (float)(max(m_Map.m_lImages[i]->m_Width, m_Map.m_lImages[i]->m_Height)); + r.w *= m_Map.m_lImages[i]->m_Width/Max; + r.h *= m_Map.m_lImages[i]->m_Height/Max; Graphics()->TextureSet(m_Map.m_lImages[i]->m_TexID); Graphics()->BlendNormal(); Graphics()->QuadsBegin(); diff --git a/src/game/editor/popups.cpp b/src/game/editor/popups.cpp index f29ae7e2..59f731fa 100644 --- a/src/game/editor/popups.cpp +++ b/src/game/editor/popups.cpp @@ -703,7 +703,16 @@ int CEditor::PopupSelectImage(CEditor *pEditor, CUIRect View) } if(ShowImage >= 0 && ShowImage < pEditor->m_Map.m_lImages.size()) + { + if(ImageView.h < ImageView.w) + ImageView.w = ImageView.h; + else + ImageView.h = ImageView.w; + float Max = (float)(max(pEditor->m_Map.m_lImages[ShowImage]->m_Width, pEditor->m_Map.m_lImages[ShowImage]->m_Height)); + ImageView.w *= pEditor->m_Map.m_lImages[ShowImage]->m_Width/Max; + ImageView.h *= pEditor->m_Map.m_lImages[ShowImage]->m_Height/Max; pEditor->Graphics()->TextureSet(pEditor->m_Map.m_lImages[ShowImage]->m_TexID); + } else pEditor->Graphics()->TextureSet(-1); pEditor->Graphics()->QuadsBegin(); |