Fix static poses calculation

2025-09-28 02:22:18 +02:00 · 2020-11-09 01:11:22 +03:00
parent e038d70039
commit 834d0714e0
4 changed files with 358 additions and 105 deletions
--- a/example/page/grid_page.lua
+++ b/example/page/grid_page.lua
@@ -1,3 +1,5 @@
+local const = require("druid.const")
+
 local M = {}


@@ -6,12 +8,12 @@ local function simple_animate(node, pos)
 end


-local function remove_node(self, button, is_shift)
+local function remove_node(self, button, no_shift)
 	gui.delete_node(button.node)

 	self.druid:remove(button)
 	local index = self.grid_static_grid:get_index_by_node(button.node)
-	self.grid_static_grid:remove(index, is_shift)
+	self.grid_static_grid:remove(index, no_shift and const.SHIFT.NO_SHIFT or const.SHIFT.RIGHT)
 	for i = 1, #self.grid_node_buttons do
 		if self.grid_node_buttons[i] == button then
 			table.remove(self.grid_node_buttons, i)
@@ -27,10 +29,10 @@ local function add_node(self, index)
 	gui.set_enabled(cloned["grid_nodes_prefab"], true)

 	local button = self.druid:new_button(cloned["grid_nodes_prefab"], function(_, params, button)
-		remove_node(self, button, true)
+		remove_node(self, button)
 	end)
 	button.on_long_click:subscribe(function()
-		remove_node(self, button)
+		remove_node(self, button, true)
 	end)
 	button:set_click_zone(self.grid_static_scroll.view_node)

@@ -72,12 +74,12 @@ local function init_static_grid(self)
 end


-local function remove_dynamic_node(self, button, is_shift_left)
+local function remove_dynamic_node(self, button, shift_policy)
 	gui.delete_node(button.node)

 	self.druid:remove(button)
 	local index = self.grid_dynamic_grid:get_index_by_node(button.node)
-	self.grid_dynamic_grid:remove(index, is_shift_left)
+	self.grid_dynamic_grid:remove(index, shift_policy)
 	for i = 1, #self.dynamic_node_buttons do
 		if self.dynamic_node_buttons[i] == button then
 			table.remove(self.dynamic_node_buttons, i)
@@ -97,7 +99,7 @@ local function add_node_dynamic(self, index, is_shift_left)
 		remove_dynamic_node(self, button)
 	end)
 	button.on_long_click:subscribe(function()
-		remove_dynamic_node(self, button, true)
+		remove_dynamic_node(self, button, const.SHIFT.lEFT)
 	end)
 	button:set_click_zone(self.grid_dynamic_scroll.view_node)
 	table.insert(self.dynamic_node_buttons, button)
--- a/example/page/infinity_page.lua
+++ b/example/page/infinity_page.lua
@@ -4,7 +4,7 @@
 local function create_infinity_instance(self, record, index)
    local instance = gui.clone_tree(self.infinity_prefab)
    gui.set_enabled(instance["infinity_prefab"], true)
-    gui.set_text(instance["infinity_text"], "Infinity record " .. index)
+    gui.set_text(instance["infinity_text"], "Record " .. index)

    local button = self.druid:new_button(instance["infinity_prefab"], function()
        print("Infinity click on", index)
@@ -27,13 +27,26 @@ local function create_infinity_instance_small(self, record, index)
 end


-
 local function create_infinity_instance_dynamic(self, record, index)
    local instance = gui.clone_tree(self.infinity_prefab_dynamic)
    gui.set_enabled(instance["infinity_prefab_dynamic"], true)
-    gui.set_text(instance["infinity_text_dynamic"], "Dynamic record " .. index)
+    gui.set_text(instance["infinity_text_dynamic"], "Record " .. index)

-    gui.set_size(instance["infinity_prefab_dynamic"], vmath.vector3(300, 60 + index * 5, 0))
+    gui.set_size(instance["infinity_prefab_dynamic"], vmath.vector3(200, 60 + index * 3, 0))
+    local button = self.druid:new_button(instance["infinity_prefab_dynamic"], function()
+        print("Dynamic click on", index)
+    end)
+
+    return instance["infinity_prefab_dynamic"], button
+end
+
+
+local function create_infinity_instance_dynamic_hor(self, record, index)
+    local instance = gui.clone_tree(self.infinity_prefab_dynamic)
+    gui.set_enabled(instance["infinity_prefab_dynamic"], true)
+    gui.set_text(instance["infinity_text_dynamic"], "Record " .. index)
+
+    gui.set_size(instance["infinity_prefab_dynamic"], vmath.vector3(150 + 2 * index, 60, 0))
    local button = self.druid:new_button(instance["infinity_prefab_dynamic"], function()
        print("Dynamic click on", index)
    end)
@@ -53,9 +66,17 @@ local function setup_infinity_list(self)
        return create_infinity_instance(self, record, index)
    end)

+    self.infinity_list_hor = self.druid:new_infinity_list(data, self.infinity_scroll_hor, self.infinity_grid_hor, function(record, index)
+        -- function should return gui_node, [druid_component]
+        return create_infinity_instance(self, record, index)
+    end)
+
    -- scroll to some index
    -- local pos = self.infinity_grid:get_pos(25)
    -- self.infinity_scroll:scroll_to(pos, true)
+    -- timer.delay(1, false, function()
+    --     self.infinity_list:scroll_to_index(1)
+    -- end)


    self.infinity_list_small = self.druid:new_infinity_list(data, self.infinity_scroll_3, self.infinity_grid_3, function(record, index)
@@ -67,29 +88,44 @@ local function setup_infinity_list(self)
        -- function should return gui_node, [druid_component]
        return create_infinity_instance_dynamic(self, record, index)
    end)
+
+    self.infinity_list_dynamic_hor = self.druid:new_infinity_list(data, self.infinity_scroll_dynamic_hor, self.infinity_grid_dynamic_hor, function(record, index)
+        -- function should return gui_node, [druid_component]
+        return create_infinity_instance_dynamic_hor(self, record, index)
+    end)
 end


 function M.setup_page(self)
    self.druid:new_scroll("infinity_page", "infinity_page_content")

+    self.infinity_prefab = gui.get_node("infinity_prefab")
+    self.infinity_prefab_small = gui.get_node("infinity_prefab_small")
+    self.infinity_prefab_dynamic = gui.get_node("infinity_prefab_dynamic")
+    gui.set_enabled(self.infinity_prefab, false)
+    gui.set_enabled(self.infinity_prefab_small, false)
+    gui.set_enabled(self.infinity_prefab_dynamic, false)
+
    self.infinity_scroll = self.druid:new_scroll("infinity_scroll_stencil", "infinity_scroll_content")
        :set_horizontal_scroll(false)
    self.infinity_grid = self.druid:new_static_grid("infinity_scroll_content", "infinity_prefab", 1)
-    self.infinity_prefab = gui.get_node("infinity_prefab")
-    gui.set_enabled(self.infinity_prefab, false)
+
+    self.infinity_scroll_hor = self.druid:new_scroll("infinity_scroll_stencil_hor", "infinity_scroll_content_hor")
+        :set_vertical_scroll(false)
+    self.infinity_grid_hor = self.druid:new_static_grid("infinity_scroll_content_hor", "infinity_prefab", 999)

    self.infinity_scroll_3 = self.druid:new_scroll("infinity_scroll_3_stencil", "infinity_scroll_3_content")
        :set_horizontal_scroll(false)
    self.infinity_grid_3 = self.druid:new_static_grid("infinity_scroll_3_content", "infinity_prefab_small", 3)
-    self.infinity_prefab_small = gui.get_node("infinity_prefab_small")
-    gui.set_enabled(self.infinity_prefab_small, false)

    self.infinity_scroll_dynamic = self.druid:new_scroll("infinity_scroll_stencil_dynamic", "infinity_scroll_content_dynamic")
        :set_horizontal_scroll(false)
-    self.infinity_grid_dynamic = self.druid:new_dynamic_grid("infinity_scroll_content_dynamic", "infinity_prefab", 1)
-    self.infinity_prefab_dynamic = gui.get_node("infinity_prefab_dynamic")
-    gui.set_enabled(self.infinity_prefab_dynamic, false)
+    self.infinity_grid_dynamic = self.druid:new_dynamic_grid("infinity_scroll_content_dynamic")
+
+    self.infinity_scroll_dynamic_hor = self.druid:new_scroll("infinity_scroll_stencil_dynamic_hor", "infinity_scroll_content_dynamic_hor")
+        :set_vertical_scroll(false)
+    self.infinity_grid_dynamic_hor = self.druid:new_dynamic_grid("infinity_scroll_content_dynamic_hor")
+

    setup_infinity_list(self)
 end