Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 00:35:20 +03:00
Code Wiki Activity

Merge pull request #479 from iNavFlight/agh_fix_osd_items_outside_viewport

Browse source 
Improve handling of OSD elements outside the viewport
This commit is contained in:
Alberto García Hierro 2018-06-21 21:02:43 +01:00 • committed by GitHub
commit 18817b2f21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tabs/osd.js
View file

@ -1433,6 +1433,12 @@ OSD.GUI.updateFields = function() {
itemData.isVisible = !itemData.isVisible;
if (itemData.isVisible) {
// Ensure the element is inside the viewport, at least partially.
// In that case move it to the very first row/col, otherwise there's
// no way to reposition items that are outside the viewport.
if (itemData.position >= OSD.data.preview.length) {
itemData.position = 0;
}
$position.show();
} else {
$position.hide();
@ -1533,12 +1539,18 @@ OSD.GUI.updatePreviews = function() {
y++;
continue;
}
var previewPos = j + x + (y * OSD.data.display_size.x);
if (previewPos >= OSD.data.preview.length) {
// Character is outside the viewport
x++;
continue;
}
// test if this position already has a character placed
if (OSD.data.preview[j+x+(y*OSD.data.display_size.x)][0] !== null) {
if (OSD.data.preview[previewPos][0] !== null) {
// if so set background color to red to show user double usage of position
OSD.data.preview[j+x+(y*OSD.data.display_size.x)] = [item, charCode, 'red'];
OSD.data.preview[previewPos] = [item, charCode, 'red'];
} else {
OSD.data.preview[j+x+(y*OSD.data.display_size.x)] = [item, charCode];
OSD.data.preview[previewPos] = [item, charCode];
}
// draw the preview
var img = new Image();