From 58f57795081e677e1450844bad1043b72c7c0bea Mon Sep 17 00:00:00 2001 From: oy Date: Sun, 8 Jan 2012 01:14:52 +0100 Subject: - disabled clipping lines in the tile picker - fixed aspect ratio of the image in the tile picker Closes #833 --- src/game/editor/editor.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/game/editor') diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 17b45bf2..c19fc86f 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -1641,6 +1641,12 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar) pT->ShowInfo(); } } + else + { + // fix aspect ratio of the image in the picker + float Max = min(View.w, View.h); + View.w = View.h = Max; + } static void *s_pEditorID = (void *)&s_pEditorID; int Inside = UI()->MouseInside(&View); @@ -1965,7 +1971,7 @@ void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar) } } - if(GetSelectedGroup() && GetSelectedGroup()->m_UseClipping) + if(!m_ShowPicker && GetSelectedGroup() && GetSelectedGroup()->m_UseClipping) { CLayerGroup *g = m_Map.m_pGameGroup; g->MapScreen(); -- cgit 1.4.1