ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-15 05:38:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Layout] Ensure minimum frame size

Browse Source 
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
This commit is contained in:
Victor Woeltjen
2015-08-03 12:18:49 -07:00
parent 0b3170d2ef
commit a4c704a5a2
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
platform/features/layout/src/LayoutController.js
View File

@ -27,7 +27,8 @@ define(
"use strict";
var DEFAULT_DIMENSIONS = [ 12, 8 ],
DEFAULT_GRID_SIZE = [32, 32];
DEFAULT_GRID_SIZE = [32, 32],
MINIMUM_FRAME_SIZE = [ 320, 180 ];
/**
* The LayoutController is responsible for supporting the
@ -67,12 +68,22 @@ define(
};
}
// Generate default positions for a new panel
function defaultDimensions() {
return MINIMUM_FRAME_SIZE.map(function (min, i) {
return Math.max(
Math.ceil(min / gridSize[i]),
DEFAULT_DIMENSIONS[i]
);
});
}
// Generate a default position (in its raw format) for a frame.
// Use an index to ensure that default positions are unique.
function defaultPosition(index) {
return {
position: [index, index],
dimensions: DEFAULT_DIMENSIONS
dimensions: defaultDimensions()
};
}
@ -107,6 +118,18 @@ define(
ids.forEach(populatePosition);
}
// Update grid size when it changed
function updateGridSize(layoutGrid) {
var oldSize = gridSize;
gridSize = layoutGrid || DEFAULT_GRID_SIZE;
// Only update panel positions if this actually changed things
if (gridSize[0] !== oldSize[0] || gridSize[1] !== oldSize[1]) {
lookupPanels(Object.keys(positions));
}
}
// Position a panel after a drop event
function handleDrop(e, id, position) {
if (e.defaultPrevented) {
@ -138,6 +161,9 @@ define(
e.preventDefault();
}
// Watch for changes to the grid size in the model
$scope.$watch("model.layoutGrid", updateGridSize);
// Position panes when the model field changes
$scope.$watch("model.composition", lookupPanels);