Allow for disabling flashing of menu, icons and buttons (#3339)

pull/3341/head
poire-z 7 years ago committed by Frans de Jonge
parent 430b61ba76
commit f90973f73a

@ -111,6 +111,7 @@ common_settings.screen = {
require("ui/elements/screen_eink_opt_menu_table"), require("ui/elements/screen_eink_opt_menu_table"),
require("ui/elements/menu_activate"), require("ui/elements/menu_activate"),
require("ui/elements/screen_disable_double_tap_table"), require("ui/elements/screen_disable_double_tap_table"),
require("ui/elements/flash_ui"),
require("ui/elements/flash_keyboard"), require("ui/elements/flash_keyboard"),
}, },
} }

@ -0,0 +1,11 @@
local _ = require("gettext")
return {
text = _("Flash buttons and menu items"),
checked_func = function()
return G_reader_settings:nilOrTrue("flash_ui")
end,
callback = function()
G_reader_settings:flipNilOrTrue("flash_ui")
end,
}

@ -188,6 +188,9 @@ end
function Button:onTapSelectButton() function Button:onTapSelectButton()
if self.enabled and self.callback then if self.enabled and self.callback then
if G_reader_settings:isFalse("flash_ui") then
self.callback()
else
UIManager:scheduleIn(0.0, function() UIManager:scheduleIn(0.0, function()
self[1].invert = true self[1].invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
@ -201,6 +204,7 @@ function Button:onTapSelectButton()
return "ui", self[1].dimen return "ui", self[1].dimen
end) end)
end) end)
end
elseif self.tap_input then elseif self.tap_input then
self:onInput(self.tap_input) self:onInput(self.tap_input)
elseif type(self.tap_input_func) == "function" then elseif type(self.tap_input_func) == "function" then

@ -88,6 +88,9 @@ end
function CheckButton:onTapCheckButton() function CheckButton:onTapCheckButton()
if self.enabled and self.callback then if self.enabled and self.callback then
if G_reader_settings:isFalse("flash_ui") then
self.callback()
else
UIManager:scheduleIn(0.0, function() UIManager:scheduleIn(0.0, function()
self.invert = true self.invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
@ -101,6 +104,7 @@ function CheckButton:onTapCheckButton()
return "ui", self.dimen return "ui", self.dimen
end) end)
end) end)
end
elseif self.tap_input then elseif self.tap_input then
self:onInput(self.tap_input) self:onInput(self.tap_input)
elseif type(self.tap_input_func) == "function" then elseif type(self.tap_input_func) == "function" then

@ -92,6 +92,9 @@ function IconButton:initGesListener()
end end
function IconButton:onTapIconButton() function IconButton:onTapIconButton()
if G_reader_settings:isFalse("flash_ui") then
self.callback()
else
UIManager:scheduleIn(0.0, function() UIManager:scheduleIn(0.0, function()
self.image.invert = true self.image.invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
@ -106,6 +109,7 @@ function IconButton:onTapIconButton()
return "ui", self[1].dimen return "ui", self[1].dimen
end) end)
end) end)
end
return true return true
end end

@ -211,6 +211,9 @@ end
function KeyValueItem:onTap() function KeyValueItem:onTap()
if self.callback then if self.callback then
if G_reader_settings:isFalse("flash_ui") then
self.callback()
else
self[1].invert = true self[1].invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
return "ui", self[1].dimen return "ui", self[1].dimen
@ -223,6 +226,7 @@ function KeyValueItem:onTap()
end) end)
end) end)
end end
end
return true return true
end end

@ -295,6 +295,13 @@ end
function MenuItem:onTapSelect(arg, ges) function MenuItem:onTapSelect(arg, ges)
local pos = self:getGesPosition(ges) local pos = self:getGesPosition(ges)
if G_reader_settings:isFalse("flash_ui") then
logger.dbg("creating coroutine for menu select")
local co = coroutine.create(function()
self.menu:onMenuSelect(self.table, pos)
end)
coroutine.resume(co)
else
self[1].invert = true self[1].invert = true
local refreshfunc = function() local refreshfunc = function()
return "ui", self[1].dimen return "ui", self[1].dimen
@ -309,11 +316,15 @@ function MenuItem:onTapSelect(arg, ges)
end) end)
coroutine.resume(co) coroutine.resume(co)
end) end)
end
return true return true
end end
function MenuItem:onHoldSelect(arg, ges) function MenuItem:onHoldSelect(arg, ges)
local pos = self:getGesPosition(ges) local pos = self:getGesPosition(ges)
if G_reader_settings:isFalse("flash_ui") then
self.menu:onMenuHold(self.table, pos)
else
self[1].invert = true self[1].invert = true
local refreshfunc = function() local refreshfunc = function()
return "ui", self[1].dimen return "ui", self[1].dimen
@ -324,6 +335,7 @@ function MenuItem:onHoldSelect(arg, ges)
UIManager:setDirty(self.show_parent, refreshfunc) UIManager:setDirty(self.show_parent, refreshfunc)
self.menu:onMenuHold(self.table, pos) self.menu:onMenuHold(self.table, pos)
end) end)
end
return true return true
end end

@ -107,6 +107,9 @@ function TouchMenuItem:onTapSelect(arg, ges)
end end
if enabled == false then return end if enabled == false then return end
if G_reader_settings:isFalse("flash_ui") then
self.menu:onMenuSelect(self.item)
else
self.item_frame.invert = true self.item_frame.invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
return "ui", self.dimen return "ui", self.dimen
@ -119,6 +122,7 @@ function TouchMenuItem:onTapSelect(arg, ges)
return "ui", self.dimen return "ui", self.dimen
end) end)
end) end)
end
return true return true
end end
@ -129,6 +133,9 @@ function TouchMenuItem:onHoldSelect(arg, ges)
end end
if enabled == false then return end if enabled == false then return end
if G_reader_settings:isFalse("flash_ui") then
self.menu:onMenuHold(self.item)
else
UIManager:scheduleIn(0.0, function() UIManager:scheduleIn(0.0, function()
self.item_frame.invert = true self.item_frame.invert = true
UIManager:setDirty(self.show_parent, function() UIManager:setDirty(self.show_parent, function()
@ -144,6 +151,7 @@ function TouchMenuItem:onHoldSelect(arg, ges)
return "ui", self.dimen return "ui", self.dimen
end) end)
end) end)
end
return true return true
end end

Loading…
Cancel
Save