Skip to content

Commit

Permalink
Merge upstream fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
cyl0 authored Mar 1, 2022
2 parents b1ff8b5 + 6134c7d commit 4862d2e
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions mordenx.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,14 @@ function render()
end

-- init management
if state.initREQ then
if state.active_element then
-- mouse is held down on some element - keep ticking and igore initReq
-- till it's released, or else the mouse-up (click) will misbehave or
-- get ignored. that's because osc_init() recreates the osc elements,
-- but mouse handling depends on the elements staying unmodified
-- between mouse-down and mouse-up (using the index active_element).
request_tick()
elseif state.initREQ then
osc_init()
state.initREQ = false

Expand Down Expand Up @@ -2016,8 +2023,10 @@ function process_event(source, what)
if element_has_action(elements[n], action) then
elements[n].eventresponder[action](elements[n])
end
request_tick()
end

-- ensure rendering after any (mouse) event - icons could change etc
request_tick()
end

function show_logo()
Expand Down

0 comments on commit 4862d2e

Please sign in to comment.