From dbb883b1b80bb3bf9398dbd1ee43965747d07549 Mon Sep 17 00:00:00 2001 From: Insality Date: Sat, 20 Nov 2021 11:10:29 +0200 Subject: [PATCH] #149 Call button style functions after actual callback --- druid/base/button.lua | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) mode change 100644 => 100755 druid/base/button.lua diff --git a/druid/base/button.lua b/druid/base/button.lua old mode 100644 new mode 100755 index 2e3f486..0686c5b --- a/druid/base/button.lua +++ b/druid/base/button.lua @@ -88,10 +88,9 @@ end local function on_button_click(self) - self.style.on_click(self, self.anim_node) - self.click_in_row = 1 self.on_click:trigger(self:get_context(), self.params, self) + self.style.on_click(self, self.anim_node) end @@ -101,28 +100,24 @@ local function on_button_repeated_click(self) self.is_repeated_started = true end - self.style.on_click(self, self.anim_node) - self.click_in_row = self.click_in_row + 1 - self.on_repeated_click:trigger(self:get_context(), self.params, self, self.click_in_row) + self.style.on_click(self, self.anim_node) end local function on_button_long_click(self) - self.style.on_click(self, self.anim_node) - self.click_in_row = 1 local time = socket.gettime() - self.last_pressed_time self.on_long_click:trigger(self:get_context(), self.params, self, time) + self.style.on_click(self, self.anim_node) end local function on_button_double_click(self) - self.style.on_click(self, self.anim_node) - self.click_in_row = self.click_in_row + 1 self.on_double_click:trigger(self:get_context(), self.params, self, self.click_in_row) + self.style.on_click(self, self.anim_node) end