Skip to content

Fix Bugs While Dragging Modals #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lightning11wins wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Bugs While Dragging Modals #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99dbd92
Fix bugs caused by the assumption that a modal is never draggable.
Lightning11wins Jun 22, 2026
5618e3a
Fix edge cases from the previous bug fix.
Lightning11wins Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions centrallix-os/sys/js/htdrv_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,7 +2752,8 @@ function pg_mousemove(e)
pg_tipinfo.x = e.pageX;
pg_tipinfo.y = e.pageY;
}
if (pg_checkmodal(ly)) return EVENT_HALT | EVENT_PREVENT_DEFAULT_ACTION;
// A window drag must keep tracking the cursor when it moves off the modal.
if (pg_checkmodal(ly) && !window.wn_current) return EVENT_HALT | EVENT_PREVENT_DEFAULT_ACTION;
/*if (pg_modallayer)
{
if (!pg_isinlayer(pg_modallayer, ly)) return EVENT_HALT | EVENT_PREVENT_DEFAULT_ACTION;
Expand Down Expand Up @@ -2880,7 +2881,8 @@ function pg_mouseup(e)
{
var ly = e.layer;
if (ly.mainlayer) ly = ly.mainlayer;
if (pg_checkmodal(ly)) return EVENT_HALT | EVENT_PREVENT_DEFAULT_ACTION;
// A window drag must be able to terminate when released off the modal.
if (pg_checkmodal(ly) && !window.wn_current) return EVENT_HALT | EVENT_PREVENT_DEFAULT_ACTION;
/*if (pg_modallayer)
{
if (!pg_isinlayer(pg_modallayer, ly)) return EVENT_HALT | EVENT_ALLOW_DEFAULT_ACTION;
Expand Down
4 changes: 2 additions & 2 deletions centrallix-os/sys/js/htdrv_window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,8 @@ function wn_mousedown(e)
{
if (e.target.name == 'close')
pg_set(e.target,'src','/sys/images/02bigclose.gif');
else if ((e.mainlayer.has_titlebar && cx__capabilities.Dom0NS && e.pageY < e.mainlayer.pageY + 24) ||
(cx__capabilities.Dom1HTML && e.layer.subkind == 'titlebar' ))
else if (e.which == 1 && ((e.mainlayer.has_titlebar && cx__capabilities.Dom0NS && e.pageY < e.mainlayer.pageY + 24) ||
(cx__capabilities.Dom1HTML && e.layer.subkind == 'titlebar' )))
{
wn_current = e.mainlayer;
wn_msx = e.pageX;
Expand Down