README.md

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

druid/component.lua

@@ -117,17 +117,7 @@ function M:set_nodes(nodes)
 		nodes = gui.clone_tree(nodes) --[[@as table<hash, node>]]
 	end
 
-	-- When we use gui.clone_tree in inner template (template inside other template)
-	-- this nodes have no id. We have table: hash(correct_id) : hash("") or hash("_nodeX"
-	-- It's wrong and we use this hack to fix this
-	if nodes then
-		for id, node in pairs(nodes) do
-			gui.set_id(node, id)
-		end
-	end
-
 	self._meta.nodes = nodes
-
 	return self
 end
 

druid/extended/data_list.lua

@@ -267,17 +267,10 @@ function M:_refresh()
 	local start_index = self.grid:get_index(start_pos)
 	start_index = math.max(1, start_index)
 
-	local offset_x = self.scroll.view_size.x
+	local pivot = helper.get_pivot_offset(gui.get_pivot(self.scroll.view_node))
-	local offset_y = self.scroll.view_size.y
+	local offset_x = self.scroll.view_size.x * (0.5 - pivot.x)
+	local offset_y = self.scroll.view_size.y * (0.5 + pivot.y)
 	local end_pos = vmath.vector3(start_pos.x + offset_x, start_pos.y - offset_y, 0)
-
-	local max_offset_x = (self.grid.in_row - 1) * self.grid.node_size.x
-	end_pos.x = math.min(end_pos.x, start_pos.x + max_offset_x)
-
-	if #self._data <= self.grid.in_row then
-		end_pos.y = start_pos.y
-	end
-
 	local end_index = self.grid:get_index(end_pos)
 	end_index = math.min(#self._data, end_index)
 

druid/helper.lua

@@ -473,9 +473,6 @@ function M.get_text_metrics_from_node(text_node)
 	options.tracking = gui.get_tracking(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
 	if options.line_break then
 		options.width = gui.get_size(text_node).x

example/druid.gui

@@ -2863,49 +2863,6 @@ nodes {
   parent: "data_list_cache_with_component/button_component/root"
   template_node_child: true
 }
-nodes {
-  type: TYPE_TEMPLATE
-  id: "data_list_matrix_basic"
-  parent: "data_list"
-  inherit_alpha: true
-  template: "/example/examples/data_list/basic/data_list_matrix_basic.gui"
-}
-nodes {
-  type: TYPE_BOX
-  id: "data_list_matrix_basic/root"
-  parent: "data_list_matrix_basic"
-  template_node_child: true
-}
-nodes {
-  type: TYPE_BOX
-  id: "data_list_matrix_basic/view"
-  parent: "data_list_matrix_basic/root"
-  template_node_child: true
-}
-nodes {
-  type: TYPE_BOX
-  id: "data_list_matrix_basic/content"
-  parent: "data_list_matrix_basic/view"
-  template_node_child: true
-}
-nodes {
-  type: TYPE_BOX
-  id: "data_list_matrix_basic/prefab"
-  parent: "data_list_matrix_basic/content"
-  template_node_child: true
-}
-nodes {
-  type: TYPE_BOX
-  id: "data_list_matrix_basic/panel"
-  parent: "data_list_matrix_basic/prefab"
-  template_node_child: true
-}
-nodes {
-  type: TYPE_TEXT
-  id: "data_list_matrix_basic/text"
-  parent: "data_list_matrix_basic/prefab"
-  template_node_child: true
-}
 nodes {
   type: TYPE_BOX
   texture: "druid_example/empty"

example/examples/container/container_resize/container_resize.lua

@@ -1,4 +1,4 @@
----@class widget.container_resize: druid.widget
+---@class widget.container_anchors: druid.widget
 local M = {}
 
 

example/examples/data_list/basic/data_list_matrix_basic.gui

@@ -1,117 +0,0 @@
-fonts {
-  name: "text_bold"
-  font: "/example/assets/fonts/text_bold.font"
-}
-textures {
-  name: "druid_example"
-  texture: "/example/assets/druid_example.atlas"
-}
-nodes {
-  type: TYPE_BOX
-  texture: "druid_example/empty"
-  id: "root"
-  inherit_alpha: true
-  size_mode: SIZE_MODE_AUTO
-  visible: false
-}
-nodes {
-  position {
-    y: 350.0
-  }
-  size {
-    x: 400.0
-    y: 700.0
-  }
-  color {
-    x: 0.173
-    y: 0.184
-    z: 0.204
-  }
-  type: TYPE_BOX
-  texture: "druid_example/pixel"
-  id: "view"
-  pivot: PIVOT_N
-  parent: "root"
-  inherit_alpha: true
-  clipping_mode: CLIPPING_MODE_STENCIL
-}
-nodes {
-  size {
-    x: 400.0
-    y: 700.0
-  }
-  type: TYPE_BOX
-  texture: "druid_example/empty"
-  id: "content"
-  pivot: PIVOT_N
-  parent: "view"
-  inherit_alpha: true
-  visible: false
-}
-nodes {
-  position {
-    y: -350.0
-  }
-  size {
-    x: 100.0
-    y: 100.0
-  }
-  type: TYPE_BOX
-  id: "prefab"
-  parent: "content"
-  inherit_alpha: true
-  visible: false
-}
-nodes {
-  size {
-    x: 90.0
-    y: 90.0
-  }
-  color {
-    x: 0.631
-    y: 0.843
-    z: 0.961
-  }
-  type: TYPE_BOX
-  texture: "druid_example/ui_circle_32"
-  id: "panel"
-  parent: "prefab"
-  inherit_alpha: true
-  slice9 {
-    x: 16.0
-    y: 16.0
-    z: 16.0
-    w: 16.0
-  }
-}
-nodes {
-  size {
-    x: 50.0
-    y: 50.0
-  }
-  color {
-    x: 0.31
-    y: 0.318
-    z: 0.322
-  }
-  type: TYPE_TEXT
-  text: "1"
-  font: "text_bold"
-  id: "text"
-  outline {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-  }
-  shadow {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-  }
-  parent: "prefab"
-  inherit_alpha: true
-  outline_alpha: 0.0
-  shadow_alpha: 0.0
-}
-material: "/builtins/materials/gui.material"
-adjust_reference: ADJUST_REFERENCE_PARENT

example/examples/data_list/basic/data_list_matrix_basic.lua

@@ -1,95 +0,0 @@
-local event = require("event.event")
-
----@class examples.data_list_matrix_basic: druid.widget
----@field prefab node
----@field scroll druid.scroll
----@field grid druid.grid
----@field data_list druid.data_list
----@field on_item_click event
-local M = {}
-
-
-function M:init()
-	self.prefab = self:get_node("prefab")
-	gui.set_enabled(self.prefab, false)
-
-	self.scroll = self.druid:new_scroll("view", "content")
-	self.grid = self.druid:new_grid("content", self.prefab, 4)
-	self.data_list = self.druid:new_data_list(self.scroll, self.grid, self.create_item_callback) --[[@as druid.data_list]]
-
-	local data = {}
-	for index = 1, 1000 do
-		table.insert(data, {})
-	end
-	self.data_list:set_data(data)
-
-	self.on_item_click = event.create()
-end
-
-
----@param item_data table
----@param index number
----@return node, druid.component
-function M:create_item_callback(item_data, index)
-	local nodes = gui.clone_tree(self.prefab)
-
-	local root = nodes[self:get_template() .. "/prefab"]
-	local text = nodes[self:get_template() .. "/text"]
-	gui.set_enabled(root, true)
-	gui.set_text(text, tostring(index))
-
-	local button = self.druid:new_button(root, self.on_button_click, index)
-	return root, button
-end
-
-
-function M:on_button_click(index)
-	self.on_item_click:trigger(index)
-end
-
-
----@param output_list output_list
-function M:on_example_created(output_list)
-	self.on_item_click:subscribe(function(index)
-		output_list:add_log_text("Item clicked: " .. index)
-	end)
-end
-
-
----@param properties_panel properties_panel
-function M:properties_control(properties_panel)
-	local view_node = self.scroll.view_node
-	local is_stencil = gui.get_clipping_mode(view_node) == gui.CLIPPING_MODE_STENCIL
-
-	properties_panel:add_checkbox("ui_clipping", is_stencil, function(value)
-		gui.set_clipping_mode(view_node, value and gui.CLIPPING_MODE_STENCIL or gui.CLIPPING_MODE_NONE)
-	end)
-
-	properties_panel:add_slider("ui_scroll", 0, function(value)
-		self.scroll:scroll_to_percent(vmath.vector3(0, 1 - value, 0), true)
-	end)
-end
-
-
----@return string
-function M:get_debug_info()
-	local data_list = self.data_list
-
-	local data = data_list:get_data()
-	local info = ""
-	info = info .. "Data length: " .. #data .. "\n"
-	info = info .. "First Visual Index: " .. data_list.top_index .. "\n"
-	info = info .. "Last Visual Index: " .. data_list.last_index .. "\n"
-
-	local s = self.scroll
-	info = info .. "\n"
-	info = info .. "View Size Y: " .. gui.get(s.view_node, "size.y") .. "\n"
-	info = info .. "Content Size Y: " .. gui.get(s.content_node, "size.y") .. "\n"
-	info = info .. "Content position Y: " .. math.ceil(s.position.y) .. "\n"
-	info = info .. "Content Range Y: " .. s.available_pos.y .. " - " .. s.available_pos.w .. "\n"
-
-	return info
-end
-
-
-return M

example/examples/data_list/examples_list.lua

@@ -21,15 +21,6 @@ function M.get_examples()
 			widget_class = require("example.examples.data_list.basic.data_list_horizontal_basic"),
 		},
 
-		{
-			name_id = "ui_example_data_list_matrix_basic",
-			information_text_id = "ui_example_data_list_matrix_basic_description",
-			template = "data_list_matrix_basic",
-			root = "data_list_matrix_basic/root",
-			code_url = "example/examples/data_list/basic/data_list_matrix_basic.lua",
-			widget_class = require("example.examples.data_list.basic.data_list_matrix_basic"),
-		},
-
 		{
 			name_id = "ui_example_data_list_add_remove_clear",
 			information_text_id = "ui_example_data_list_add_remove_clear_description",

example/locales/en.json

@@ -147,9 +147,6 @@
 	"ui_example_data_list_horizontal_basic": "Data List Horizontal Basic",
 	"ui_example_data_list_horizontal_basic_description": "How to make a horizontal data list",
 
-	"ui_example_data_list_matrix_basic": "Data List Matrix Basic",
-	"ui_example_data_list_matrix_basic_description": "How to make a matrix data list",
-
 	"ui_example_data_list_add_remove_clear": "Data List Add Remove Clear",
 	"ui_example_data_list_add_remove_clear_description": "How the add, remove and clear functions work in the data list",
 

game.project

@@ -14,16 +14,16 @@ update_frequency = 60
 
 [project]
 title = Druid
-version = 1.1.4
+version = 1.1.1
 publisher = Insality
 developer = Maksim Tuprikov
 custom_resources = /example/locales
 dependencies#0 = https://github.com/britzl/deftest/archive/refs/tags/2.8.0.zip
-dependencies#1 = https://github.com/Insality/defold-saver/archive/refs/tags/5.zip
+dependencies#1 = https://github.com/Insality/defold-saver/archive/refs/heads/develop.zip
 dependencies#2 = https://github.com/Insality/defold-tweener/archive/refs/tags/3.zip
-dependencies#3 = https://github.com/Insality/panthera/archive/refs/tags/runtime.4.zip
+dependencies#3 = https://github.com/Insality/panthera/archive/refs/heads/develop.zip
 dependencies#4 = https://github.com/Insality/defold-lang/archive/refs/tags/3.zip
-dependencies#5 = https://github.com/Insality/defold-event/archive/refs/tags/11.zip
+dependencies#5 = https://github.com/Insality/defold-event/archive/refs/heads/develop.zip
 dependencies#6 = https://github.com/subsoap/defos/archive/refs/tags/v2.8.0.zip
 
 [library]
@@ -58,7 +58,7 @@ cssfile = /builtins/manifests/web/dark_theme.css
 show_console_banner = 0
 
 [native_extension]
-app_manifest =
+app_manifest = 
 
 [graphics]
 texture_profiles = /builtins/graphics/default.texture_profiles

wiki/changelog.md

@@ -705,13 +705,3 @@ Please support me if you like this project! It will help me keep engaged to upda
 
 #### Druid 1.1.1
 - [#309] Added max_size_x and max_size_y to container (by [astrochili](https://github.com/astrochili))
-
-#### Druid 1.1.2
-- [#310] Add data list matrix example (Grid 4 in row)
-- [Data List] Fix for data list element amounts issue
-
-#### Druid 1.1.3
-- 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