From 0fc52a7952932010b60ae00d71e3b7c534b0d556 Mon Sep 17 00:00:00 2001 From: twanvl Date: Mon, 2 Aug 2010 21:42:55 +0000 Subject: [PATCH] alignment for choice fields rendered as text (#16) git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1463 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/render/value/choice.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/render/value/choice.cpp b/src/render/value/choice.cpp index c7ae47b0..9cbadb46 100644 --- a/src/render/value/choice.cpp +++ b/src/render/value/choice.cpp @@ -96,8 +96,13 @@ void draw_choice_viewer(RotatedDC& dc, ValueViewer& viewer, ChoiceStyle& style, } if (style.render_style & RENDER_TEXT) { String text = tr(viewer.getStylePackage(), value, capitalize_sentence); + Alignment text_align = style.alignment; + if (style.render_style & RENDER_IMAGE) { + text_align = ALIGN_MIDDLE_LEFT; // can't align both text and image in the same way + } dc.SetFont(style.font, 1.0); - RealPoint pos = align_in_rect(ALIGN_MIDDLE_LEFT, RealSize(0, dc.GetCharHeight()), dc.getInternalRect()) + RealSize(margin, 0); + RealSize size = dc.GetTextExtent(text); + RealPoint pos = align_in_rect(text_align, size, dc.getInternalRect()) + RealSize(margin, 0); dc.DrawTextWithShadow(text, style.font, pos); } }