From 5990347ed14131a69eed3c79ac382a4d9b979703 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Sat, 1 Oct 2016 14:01:43 -0500 Subject: [PATCH 1/3] Fix the content of a message getting squished --- data/gui/window/wml_message.cfg | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/data/gui/window/wml_message.cfg b/data/gui/window/wml_message.cfg index 84ee11985b2..64b0504b070 100644 --- a/data/gui/window/wml_message.cfg +++ b/data/gui/window/wml_message.cfg @@ -753,19 +753,6 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH} {_GUI_WML_MESSAGE_CONTENT} - [column] - - [spacer] - width = "( -if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH} -, gamemap_width - (10 + ({__GUI_IMAGE_WIDTH}) + {MAX_TEXT_WIDTH}) -, 0 -))" - height = 75 - [/spacer] - - [/column] - [column] [spacer] From 05cf2ba6cf8e60fe28a9d85d4a46d7743c36176c Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Sat, 1 Oct 2016 14:28:12 -0500 Subject: [PATCH 2/3] Add ability to display two portraits at once Adds the keys: mirror, second_image, second_mirror. These allow a portrait to be displayed on the right and left of a message simultaneously as well as to mirror them. --- data/lua/wml/message.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/lua/wml/message.lua b/data/lua/wml/message.lua index e724e36549c..bc71b03100e 100644 --- a/data/lua/wml/message.lua +++ b/data/lua/wml/message.lua @@ -200,6 +200,9 @@ local function message_user_choice(cfg, speaker, options, text_input) title = caption, message = cfg.message, portrait = image, + mirror = cfg.message, + second_portrait = cfg.second_image, + second_mirror = cfg.second_mirror, } if speaker ~= nil then From 9df77488e31eb3ed8796c7353108efadba8e8494 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Sat, 1 Oct 2016 14:28:50 -0500 Subject: [PATCH 3/3] Update message.lua --- data/lua/wml/message.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/lua/wml/message.lua b/data/lua/wml/message.lua index bc71b03100e..4d4cf0fa447 100644 --- a/data/lua/wml/message.lua +++ b/data/lua/wml/message.lua @@ -200,7 +200,7 @@ local function message_user_choice(cfg, speaker, options, text_input) title = caption, message = cfg.message, portrait = image, - mirror = cfg.message, + mirror = cfg.mirror, second_portrait = cfg.second_image, second_mirror = cfg.second_mirror, }