Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 10:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

#107 Better scale text adjust by height for multiline text nodes

Browse Source
This commit is contained in:
Insality 2021-10-23 16:18:43 +03:00
parent ab3f5f8e31
commit ba312742d2
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs_md/changelog.md
View File

@ -246,4 +246,5 @@ Have a good day.
- `Button:set_enabled` has more priority than this to check button availability - `Button:set_enabled` has more priority than this to check button availability
- The `check_function` should return _true_ of _false_. If true - button can be clicked - The `check_function` should return _true_ of _false_. If true - button can be clicked
- The `failure_callback`will be called if `check_function` will return false. It's callback for you if button is not available - The `failure_callback`will be called if `check_function` will return false. It's callback for you if button is not available
- Example with `set_check_function` exists in general:buttons example collection - Example with `set_check_function` exists in general:buttons example collection
- **#107** Better scale text adjust by height for multiline text nodes (but still not perfect)

10
druid/base/text.lua
View File

@ -78,19 +78,21 @@ local function update_text_area_size(self)
local max_height = self.text_area.y local max_height = self.text_area.y
local metrics = gui.get_text_metrics_from_node(self.node) local metrics = gui.get_text_metrics_from_node(self.node)
local cur_scale = gui.get_scale(self.node)
local scale_modifier = max_width / metrics.width local scale_modifier = max_width / metrics.width
scale_modifier = math.min(scale_modifier, self.start_scale.x) scale_modifier = math.min(scale_modifier, self.start_scale.x)
local scale_modifier_height = max_height / metrics.height if self:is_multiline() then
scale_modifier = math.min(scale_modifier, scale_modifier_height) local max_text_area_square = max_width * max_height
local cur_text_area_square = metrics.height * metrics.width * self.start_scale.x
scale_modifier = self.start_scale.x * math.sqrt(max_text_area_square / cur_text_area_square)
end
if self._minimal_scale then if self._minimal_scale then
scale_modifier = math.max(scale_modifier, self._minimal_scale) scale_modifier = math.max(scale_modifier, self._minimal_scale)
end end
local new_scale = vmath.vector3(scale_modifier, scale_modifier, cur_scale.z) local new_scale = vmath.vector3(scale_modifier, scale_modifier, self.start_scale.z)
gui.set_scale(self.node, new_scale) gui.set_scale(self.node, new_scale)
self.scale = new_scale self.scale = new_scale

8
example/examples/texts/texts_general/texts_general.gui_script
View File

@ -29,18 +29,18 @@ local function setup_texts(self)
timer.delay(0.3, true, function() timer.delay(0.3, true, function()
anchoring:set_pivot(pivots[pivot_index]) anchoring:set_pivot(pivots[pivot_index])
pivot_index = pivot_index + 1 pivot_index = pivot_index + 1
if pivot_index > #pivots then if pivot_index > #pivots then
pivot_index = 1 pivot_index = 1
end end
end) end)
timer.delay(0.2, true, function() timer.delay(0.3, true, function()
big_text = big_text .. " max" big_text = big_text .. " m a x"
width:set_to(big_text) width:set_to(big_text)
height:set_to(big_text) height:set_to(big_text)
if #big_text > 50 then if #big_text > 120 then
big_text = "Check max size" big_text = "Check max size"
end end
end) end)