Merge branch 'master' into develop

This commit is contained in:
Insality 2025-05-28 23:28:31 +03:00
commit a8aea0adee
4 changed files with 7 additions and 2 deletions

View File

@ -39,7 +39,7 @@ Open your `game.project` file and add the following lines to the dependencies fi
**[Druid](https://github.com/Insality/druid/)** **[Druid](https://github.com/Insality/druid/)**
``` ```
https://github.com/Insality/druid/archive/refs/tags/1.1.3.zip https://github.com/Insality/druid/archive/refs/tags/1.1.4.zip
``` ```
**[Defold Event](https://github.com/Insality/defold-event)** **[Defold Event](https://github.com/Insality/defold-event)**

View File

@ -473,6 +473,9 @@ function M.get_text_metrics_from_node(text_node)
options.tracking = gui.get_tracking(text_node) options.tracking = gui.get_tracking(text_node)
options.line_break = gui.get_line_break(text_node) options.line_break = gui.get_line_break(text_node)
options.width = 0
options.leading = 0
-- Gather other options only if it used in node -- Gather other options only if it used in node
if options.line_break then if options.line_break then
options.width = gui.get_size(text_node).x options.width = gui.get_size(text_node).x

View File

@ -14,7 +14,7 @@ update_frequency = 60
[project] [project]
title = Druid title = Druid
version = 1.1.3 version = 1.1.4
publisher = Insality publisher = Insality
developer = Maksim Tuprikov developer = Maksim Tuprikov
custom_resources = /example/locales custom_resources = /example/locales

View File

@ -713,6 +713,8 @@ Please support me if you like this project! It will help me keep engaged to upda
#### Druid 1.1.3 #### Druid 1.1.3
- Fix for node_id of cloned nodes with `gui.clone_tree` - Fix for node_id of cloned nodes with `gui.clone_tree`
#### Druid 1.1.4
- [#312] Fix for text metrics issue if returned height is 0 sometimes
### Druid 1.2.0 ### Druid 1.2.0
- Fix for blocker internal enabled state depends from GUI node - Fix for blocker internal enabled state depends from GUI node