GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed ocr selection in firefox

Browse Source
This commit is contained in:
Maxim Devaev 2022-02-24 12:33:41 +03:00
parent 13afa9f4d3
commit a8af9b6290
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/share/js/kvm/ocr.js
View File

@ -54,8 +54,10 @@ export function Ocr(__getGeometry) {
$("stream-ocr-window").onkeyup = function(event) { $("stream-ocr-window").onkeyup = function(event) {
event.preventDefault(); event.preventDefault();
if (event.code === "Enter") { if (event.code === "Enter") {
if (__selection) {
__recognizeSelection(); __recognizeSelection();
wm.closeWindow($("stream-ocr-window")); wm.closeWindow($("stream-ocr-window"));
}
} else if (event.code === "Escape") { } else if (event.code === "Escape") {
wm.closeWindow($("stream-ocr-window")); wm.closeWindow($("stream-ocr-window"));
} }
@ -116,8 +118,9 @@ export function Ocr(__getGeometry) {
let rect = $("stream-box").getBoundingClientRect(); let rect = $("stream-box").getBoundingClientRect();
let rel_left = Math.min(__start_pos.x, __end_pos.x) - rect.left; let rel_left = Math.min(__start_pos.x, __end_pos.x) - rect.left;
let rel_right = Math.max(__start_pos.x, __end_pos.x) - rect.left; let rel_right = Math.max(__start_pos.x, __end_pos.x) - rect.left;
let rel_top = Math.min(__start_pos.y, __end_pos.y) - rect.top; let offset = __getNavbarOffset();
let rel_bottom = Math.max(__start_pos.y, __end_pos.y) - rect.top; let rel_top = Math.min(__start_pos.y, __end_pos.y) - rect.top + offset;
let rel_bottom = Math.max(__start_pos.y, __end_pos.y) - rect.top + offset;
let geo = __getGeometry(); let geo = __getGeometry();
__selection = { __selection = {
left: tools.remap(rel_left, geo.x, geo.width, 0, geo.real_width), left: tools.remap(rel_left, geo.x, geo.width, 0, geo.real_width),
@ -135,12 +138,21 @@ export function Ocr(__getGeometry) {
var __getGlobalPosition = function(event) { var __getGlobalPosition = function(event) {
let rect = $("stream-box").getBoundingClientRect(); let rect = $("stream-box").getBoundingClientRect();
let geo = __getGeometry(); let geo = __getGeometry();
let offset = __getNavbarOffset();
return { return {
x: Math.min(Math.max(event.clientX, rect.left + geo.x), rect.right - geo.x), x: Math.min(Math.max(event.clientX, rect.left + geo.x), rect.right - geo.x),
y: Math.min(Math.max(event.clientY, rect.top + geo.y), rect.bottom - geo.y), y: Math.min(Math.max(event.clientY - offset, rect.top + geo.y - offset), rect.bottom - geo.y - offset),
}; };
}; };
var __getNavbarOffset = function() {
if (tools.browser.is_firefox) {
// На лисе наблюдается оффсет из-за навбара, хз почему
return wm.getViewGeometry().top;
}
return 0;
};
var __resetSelection = function() { var __resetSelection = function() {
tools.hidden.setVisible($("stream-ocr-selection"), false); tools.hidden.setVisible($("stream-ocr-selection"), false);
__start_pos = null; __start_pos = null;
@ -163,8 +175,8 @@ export function Ocr(__getGeometry) {
if (http.status === 200) { if (http.status === 200) {
navigator.clipboard.writeText(http.responseText).then(function() { navigator.clipboard.writeText(http.responseText).then(function() {
wm.info("The text is copied to the clipboard"); wm.info("The text is copied to the clipboard");
}, function() { }, function(err) {
wm.error("Can't copy text to the clipboard"); wm.error("Can't copy text to the clipboard:<br>", err);
}); });
} else { } else {
wm.error("OCR error:<br>", http.responseText); wm.error("OCR error:<br>", http.responseText);