diff --git a/bin/package_gnome b/bin/package_gnome index b79b467..20cda9e 100755 --- a/bin/package_gnome +++ b/bin/package_gnome @@ -25,6 +25,10 @@ else GNOME_DIR=$ROOT_DIR/gnome/backports/$GNOME_BACKPORT/gnome/ BUILD_FILE_NAME=breezyGNOME-$GNOME_BACKPORT_NAME-$ARCH.tar.gz rm -rf $GNOME_DIR/build + + pushd $GNOME_DIR + git submodule update --init + popd fi GNOME_BUILD_DIR=$GNOME_DIR/build diff --git a/gnome/src/virtualdisplaysactor.js b/gnome/src/virtualdisplaysactor.js index 4cfae27..9099189 100644 --- a/gnome/src/virtualdisplaysactor.js +++ b/gnome/src/virtualdisplaysactor.js @@ -293,15 +293,15 @@ function monitorsToPlacements(fovDetails, monitorDetailsList, monitorSpacing) { // monitors make a flat wall in front of us, no wrapping monitorDetailsList.forEach((monitorDetails, index) => { - const upPixels = -monitorDetails.y + (monitorDetails.y / fovDetails.heightPixels) * monitorSpacingPixels; - const westPixels = -monitorDetails.x + (monitorDetails.x / fovDetails.widthPixels) * monitorSpacingPixels; + const upTopPixels = -monitorDetails.y - (monitorDetails.y / fovDetails.heightPixels) * monitorSpacingPixels; + const westLeftPixels = -monitorDetails.x - (monitorDetails.x / fovDetails.widthPixels) * monitorSpacingPixels; // offsets for aligning this monitor's center with the fov-sized viewport's center - const westCenterOffsetPixels = -(monitorDetails.width - fovDetails.widthPixels) / 2; - const upCenterOffsetPixels = -(monitorDetails.height - fovDetails.heightPixels) / 2; + const westCenterOffsetPixels = (monitorDetails.width - fovDetails.widthPixels) / 2; + const upCenterOffsetPixels = (monitorDetails.height - fovDetails.heightPixels) / 2; - const westCenterPixels = westPixels + westCenterOffsetPixels; - const upCenterPixels = upPixels + upCenterOffsetPixels; + const westCenterPixels = westLeftPixels - westCenterOffsetPixels; + const upCenterPixels = upTopPixels - upCenterOffsetPixels; monitorPlacements.push({ originalIndex: index,