From 7821c031dda937bc85aba2f33c8962c155006eca Mon Sep 17 00:00:00 2001 From: Insality Date: Sat, 28 Mar 2020 16:46:50 +0300 Subject: [PATCH] Resolve #36: Get default druid text value from node --- druid/base/text.lua | 4 ++-- example/gui/main/main.gui | 6 +++--- example/page/texts.lua | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/druid/base/text.lua b/druid/base/text.lua index 436a4c7..e7701ee 100644 --- a/druid/base/text.lua +++ b/druid/base/text.lua @@ -85,10 +85,10 @@ function M.init(self, node, value, no_adjust) self.color = gui.get_color(self.node) self.on_set_text = Event() - self.on_update_text_scale = Event() self.on_set_pivot = Event() + self.on_update_text_scale = Event() - self:set_to(value or 0) + self:set_to(value or gui.get_text(self.node)) return self end diff --git a/example/gui/main/main.gui b/example/gui/main/main.gui index e321240..be6d0fc 100644 --- a/example/gui/main/main.gui +++ b/example/gui/main/main.gui @@ -3518,7 +3518,7 @@ nodes { } type: TYPE_TEXT blend_mode: BLEND_MODE_ALPHA - text: "Inline:" + text: "Simple inline text" font: "game" id: "text_inline" xanchor: XANCHOR_NONE @@ -3581,7 +3581,7 @@ nodes { } type: TYPE_TEXT blend_mode: BLEND_MODE_ALPHA - text: "Multiline" + text: "Simple multiline text with smth" font: "game" id: "text_multiline" xanchor: XANCHOR_NONE @@ -3699,7 +3699,7 @@ nodes { } type: TYPE_TEXT blend_mode: BLEND_MODE_ALPHA - text: "Anchoring:" + text: "Anchoring" font: "game" id: "text_anchoring" xanchor: XANCHOR_NONE diff --git a/example/page/texts.lua b/example/page/texts.lua index 0a91534..b77da1e 100644 --- a/example/page/texts.lua +++ b/example/page/texts.lua @@ -13,9 +13,9 @@ local pivots = { } local function setup_texts(self) - self.druid:new_text("text_inline", "Simple inline text") - self.druid:new_text("text_multiline", "Simple multiline text with smth") - local anchoring = self.druid:new_text("text_anchoring", "Anchoring") + self.druid:new_text("text_inline") + self.druid:new_text("text_multiline") + local anchoring = self.druid:new_text("text_anchoring") self.druid:new_text("text_no_adjust", "Without adjust size", true) self.druid:new_lang_text("text_locale", "ui_text_example")