strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

calc: switch row / column / grouping data to pixels.

Browse source 
This simplifies lots of logic, making it trivial to get good row/column
header alignment at any zoom. Ultimately TWIPS were highly misleading
'print-twips', and in that state are ~impossible to map to pixels
accurately unless all data is present back to the origin
(which was not provided previously).

This requires the equivalent patch on master.

Change-Id: I110f6f646e2b52bec4584c193c640df6b41100f8
This commit is contained in:
Michael Meeks 2019-11-09 18:17:29 +00:00
parent c8277bb11c
commit d5d157275d
3 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loleaflet/src/control/Control.ColumnHeader.js
View file

@ -410,8 +410,8 @@ L.Control.ColumnHeader = L.Control.Header.extend({
this._groupLevels = parseInt(columns[0].groupLevels);
this._groups = this._groupLevels ? new Array(this._groupLevels) : null;
var startOffsetTw = parseInt(columns[0].size);
this._startOffset = this._twipsToPixels(startOffsetTw);
var startOffsetPx = parseInt(columns[0].size);
this._startOffset = startOffsetPx;
// collect group controls data
if (colGroups !== undefined && this._groups) {

24
loleaflet/src/control/Control.Header.js
View file

@ -631,8 +631,8 @@ L.Control.Header = L.Control.extend({
if (!this._groups[level]) {
this._groups[level] = {};
}
var startPos = this._twipsToPixels(parseInt(groupData.startPos));
var endPos = this._twipsToPixels(parseInt(groupData.endPos));
var startPos = parseInt(groupData.startPos);
var endPos = parseInt(groupData.endPos);
var isHidden = !!parseInt(groupData.hidden);
if (isHidden || startPos === endPos) {
startPos -= this._groupHeadSize / 2;
@ -757,31 +757,27 @@ L.Control.Header.colHeaderHeight = undefined;
* the size of the last known gap.
* - When a new tick position is defined, it resets the size of the last known gap
*
* All the outputs are mapped through a scale function. Inputs are meant
* to be given in twips, outputs are meant to be returned in CSS pixels,
* which is also the internal storage format.
* All inputs received are given in pixels, outputs are meant to be returned
* in CSS pixels, which is also the internal storage format.
*
* **NB.** to ensure that all row heights are the same size even though
* their twip height doesn't map to an integer number of pixels we need to
* convert to pixels early - and work in pixels internally, as the calc
* core does.
* **NB.** twip to pixel mapping is made non-obvious by the need to ensure that
* there are no cumulative rounding errors from TWIP heights to pixels. We have to
* match the core here, so we just use pixels.
*/
L.Control.Header.GapTickMap = L.Class.extend({
initialize: function (ticks, scaleCallback) {
initialize: function (ticks) {
var gapSize;
this._ticks = [];
this.scaleCallback = scaleCallback || function() {return 0;}
// Sanitize input
var knownTicks = [];
for (var i in ticks) {
// The field in the input data struct is called "text" but it's the
// column/row index, as a string.
// Idem for "size": it's the tick position in twips, as a string
knownTicks[ parseInt(ticks[i].text) ] =
this.scaleCallback(parseInt(ticks[i].size));
// Idem for "size": it's the tick position in pixels, as a string
knownTicks[ parseInt(ticks[i].text) ] = parseInt(ticks[i].size);
}
// This *assumes* the input is ordered - i.e. tick indexes only grow

4
loleaflet/src/control/Control.RowHeader.js
View file

@ -399,8 +399,8 @@ L.Control.RowHeader = L.Control.Header.extend({
this._groupLevels = parseInt(rows[0].groupLevels);
this._groups = this._groupLevels ? new Array(this._groupLevels) : null;
var startOffsetTw = parseInt(rows[0].size);
this._startOffset = this._twipsToPixels(startOffsetTw);
var startOffsetPx = parseInt(rows[0].size);
this._startOffset = startOffsetPx;
// collect group controls data
if (rowGroups !== undefined && this._groups) {