Skip to content

Temporary Drag Region Compatibility #577

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

Closed
konakona418 wants to merge 2 commits into from
Closed

Temporary Drag Region Compatibility #577

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
0a62e9e
Fix: compatibility issue of `-webkit-app-region`.
konakona418 Apr 7, 2025
1fa535f
Merge branch 'webui-dev:main' into webkit-drag-region-compatibility
konakona418 Apr 7, 2025
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
4 changes: 4 additions & 0 deletions bridge/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ export function addRefreshableEventListener<K extends keyof HTMLElementEventMap>
* Async function constructor
*/
export const AsyncFunction = async function () {}.constructor;

export function isWebkitAppRegionCompatible() {
return ('webkitAppRegion' in document.documentElement.style)
}
37 changes: 27 additions & 10 deletions bridge/webui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
*/

//@ts-ignore use *.ts import real extension
import { AsyncFunction, addRefreshableEventListener } from './utils.ts';
import { AsyncFunction, addRefreshableEventListener, isWebkitAppRegionCompatible } from './utils.ts';

type DataTypes = string | number | boolean | Uint8Array;

const isWebKitAppRegionCompatible: boolean = isWebkitAppRegionCompatible();

class WebuiBridge {
// WebUI Settings
#secure: boolean;
Expand Down Expand Up @@ -171,16 +173,31 @@ class WebuiBridge {
}
if (!this.#isDragging) {
let target = e.target;
while (target) {
if (window.getComputedStyle(target).getPropertyValue("-webkit-app-region") === "drag") {
this.#initialMouseX = e.screenX;
this.#initialMouseY = e.screenY;
this.#initialWindowX = this.#currentWindowX;
this.#initialWindowY = this.#currentWindowY;
this.#isDragging = true;
break;
if (isWebKitAppRegionCompatible) {
while (target) {
if (window.getComputedStyle(target).getPropertyValue("-webkit-app-region") === "drag") {
this.#initialMouseX = e.screenX;
this.#initialMouseY = e.screenY;
this.#initialWindowX = this.#currentWindowX;
this.#initialWindowY = this.#currentWindowY;
this.#isDragging = true;
break;
}
target = target.parentElement;
}
} else {
/* To provide compatibility for browsers without `-webkit-app-region: drag;` */
while (target) {
if (target.id === "webui-draggable") {
this.#initialMouseX = e.screenX;
this.#initialMouseY = e.screenY;
this.#initialWindowX = this.#currentWindowX;
this.#initialWindowY = this.#currentWindowY;
this.#isDragging = true;
break;
}
target = target.parentElement;
}
target = target.parentElement;
}
return;
}
Expand Down
Loading