pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

use parameter from config

Browse Source
This commit is contained in:
Sergey Luzyanin
2025-03-06 13:38:43 +03:00
parent 8d255b7260
commit 2b8d528d24
5 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
slide/Drawing/DrawingDocument.js
View File

@ -4260,7 +4260,7 @@ function CThumbnailsManager(editorPage)
this.DigitWidths[i] = 10;
}
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.const_offset_x = Math.round(this.lastPixelRatio * 17);
this.const_offset_r = this.const_offset_y;
this.const_offset_b = Math.round(this.lastPixelRatio * 10);
@ -4548,7 +4548,7 @@ function CThumbnailsManager(editorPage)
return res;
}
const isHorizontalThumbnails = oThis.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
if (oThis.m_oWordControl)
oThis.m_oWordControl.m_oApi.checkLastWork();
@ -4750,8 +4750,8 @@ function CThumbnailsManager(editorPage)
return;
const delta = GetWheelDeltaY(e);
const isHorizontalOrientation = oThis.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = oThis.m_oWordControl.isRTL;
const isHorizontalOrientation = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = Asc.editor.thumbnailsRTL;
isHorizontalOrientation
? oThis.m_oWordControl.m_oScrollThumbApi.scrollBy(isRightToLeft ? -delta : delta, 0)
: oThis.m_oWordControl.m_oScrollThumbApi.scrollBy(0, delta, false);
@ -5054,7 +5054,7 @@ function CThumbnailsManager(editorPage)
if (!scrollApi) return;
let startCoord, endCoord, visibleAreaSize, scrollTo, scrollBy;
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
startCoord = this.m_arrPages[pageNum].left - this.const_border_w;
endCoord = this.m_arrPages[pageNum].right + this.const_border_w;
visibleAreaSize = this.m_oWordControl.m_oThumbnails.HtmlElement.width;
@ -5072,8 +5072,8 @@ function CThumbnailsManager(editorPage)
if (startCoord < 0) {
const size = endCoord - startCoord;
const shouldReversePageIndexes = this.m_oWordControl.isRTL &&
this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const shouldReversePageIndexes = Asc.editor.thumbnailsRTL &&
Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const pos = shouldReversePageIndexes
? (size + this.const_border_w) * (this.m_arrPages.length - pageNum - 1)
: (size + this.const_border_w) * pageNum;
@ -5283,15 +5283,15 @@ function CThumbnailsManager(editorPage)
const canvasHeightMm = canvas.height * g_dKoef_pix_to_mm;
let textPosX, textPosY;
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
const textHeightMm = 10 * AscCommon.AscBrowser.retinaPixelRatio * g_dKoef_pix_to_mm;
textPosY = (page.top * g_dKoef_pix_to_mm + textHeightMm) / 2;
textPosX = this.m_oWordControl.isRTL
textPosX = Asc.editor.thumbnailsRTL
? page.right * g_dKoef_pix_to_mm - slideNumberTextWidth - 1 * AscCommon.AscBrowser.retinaPixelRatio
: page.left * g_dKoef_pix_to_mm + 1 * AscCommon.AscBrowser.retinaPixelRatio;
} else {
textPosY = page.top * g_dKoef_pix_to_mm + 3 * AscCommon.AscBrowser.retinaPixelRatio;
textPosX = this.m_oWordControl.isRTL
textPosX = Asc.editor.thumbnailsRTL
? canvasWidthMm - (digitDistance + slideNumberTextWidth) / 2
: (digitDistance - slideNumberTextWidth) / 2;
}
@ -5320,8 +5320,8 @@ function CThumbnailsManager(editorPage)
let nBottomBounds = textBounds.b;
if (logicDocument.isSlideAnimated(slideIndex)) {
let iconX, iconY;
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
iconX = this.m_oWordControl.isRTL
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
iconX = Asc.editor.thumbnailsRTL
? textBounds.x - 3 - AscCommon.AscBrowser.convertToRetinaValue(19, true)
: textBounds.r + 3;
iconY = (textBounds.y + textBounds.b) / 2 - AscCommon.AscBrowser.convertToRetinaValue(9.5, true);
@ -5346,8 +5346,8 @@ function CThumbnailsManager(editorPage)
const pinSizes = AscFormat.fGetOuterRectangle(pinOriginalWidth, pinOriginalHeight, pinAngle);
let pinX, pinY;
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
pinX = this.m_oWordControl.isRTL
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
pinX = Asc.editor.thumbnailsRTL
? textBounds.x - 3 - pinSizes.width
: textBounds.r + 3 + pinSizes.width / 2;
pinY = textBounds.b - pinSizes.height;
@ -5533,8 +5533,8 @@ function CThumbnailsManager(editorPage)
}
};
this.drawThumbnailsInsertionLine = function (context, canvasWidth, canvasHeight) {
const isHorizontalThumbnails = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = this.m_oWordControl.isRTL;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = Asc.editor.thumbnailsRTL;
const nPosition = this.MouseDownTrack.GetPosition();
const oPage = this.m_arrPages[nPosition - 1];
@ -5819,8 +5819,8 @@ function CThumbnailsManager(editorPage)
if (!bIsUpdate || scrollApi == null)
return;
const isHorizontalThumbnails = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = this.m_oWordControl.isRTL;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = Asc.editor.thumbnailsRTL;
let startCoord, endCoord, visibleAreaSize, scrollTo, scrollBy;
if (isHorizontalThumbnails) {
@ -5855,7 +5855,7 @@ function CThumbnailsManager(editorPage)
// position
this.ConvertCoords = function (x, y) {
let posX, posY;
switch (this.m_oWordControl.thumbnailsPosition) {
switch (Asc.editor.thumbnailsPosition) {
case thumbnailsPositionMap.left:
posX = x - this.m_oWordControl.X;
posY = y - this.m_oWordControl.Y;
@ -5893,7 +5893,7 @@ function CThumbnailsManager(editorPage)
return -1;
let posX, posY;
switch (this.m_oWordControl.thumbnailsPosition) {
switch (Asc.editor.thumbnailsPosition) {
case thumbnailsPositionMap.left:
posX = x - this.m_oWordControl.X;
posY = y - this.m_oWordControl.Y;
@ -5924,8 +5924,8 @@ function CThumbnailsManager(editorPage)
if (convertedX < 0 || convertedX > thControlWidth || convertedY < 0 || convertedY > thControlHeight)
return -1;
const isHorizontalThumbnails = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = this.m_oWordControl.isRTL;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isRightToLeft = Asc.editor.thumbnailsRTL;
let minDistance = Infinity;
let minPositionPage = 0;
@ -5978,9 +5978,9 @@ function CThumbnailsManager(editorPage)
const thumbnailsHeightMm = thumbnails.AbsolutePosition.B - thumbnails.AbsolutePosition.T;
const pixelRatio = AscCommon.AscBrowser.retinaPixelRatio * g_dKoef_mm_to_pix;
const isVerticalThumbnails = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.right
|| this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.left;
const isRightToLeft = this.m_oWordControl.isRTL;
const isVerticalThumbnails = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right
|| Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left;
const isRightToLeft = Asc.editor.thumbnailsRTL;
let thSlideWidthPx, thSlideHeightPx;
let startOffset, supplement;
@ -6134,7 +6134,7 @@ function CThumbnailsManager(editorPage)
const oThContainer = editor.WordControl.m_oThumbnailsContainer;
const isHidden = oThContainer.HtmlElement.style.display === "none";
const isHorizontalThumbnails = this.m_oWordControl.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
const offsetX = oThContainer.AbsolutePosition.L * g_dKoef_mm_to_pix;
const offsetY = oThContainer.AbsolutePosition.T * g_dKoef_mm_to_pix;
@ -6188,12 +6188,12 @@ function CThumbnailsManager(editorPage)
}
};
this.OnScrollTrackTop = function () {
oThis.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom
Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? oThis.m_oWordControl.m_oScrollThumbApi.scrollByX(-45)
: oThis.m_oWordControl.m_oScrollThumbApi.scrollByY(-45);
};
this.OnScrollTrackBottom = function () {
oThis.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom
Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? oThis.m_oWordControl.m_oScrollThumbApi.scrollByX(45)
: oThis.m_oWordControl.m_oScrollThumbApi.scrollByY(45);
};
@ -6233,7 +6233,7 @@ function CThumbnailsManager(editorPage)
const wordControl = this.m_oWordControl;
const dKoefToPix = AscCommon.AscBrowser.retinaPixelRatio * g_dKoef_mm_to_pix;
const isHorizontalOrientation = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isHorizontalOrientation = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
const dPosition = this.m_dScrollY_max != 0 ? this.m_dScrollY / this.m_dScrollY_max : 0;
// Width and Height of 'id_panel_thumbnails' in millimeters
@ -6299,7 +6299,7 @@ function CThumbnailsManager(editorPage)
}
wordControl.m_oScrollThumb_.isHorizontalScroll = isHorizontalOrientation;
if (wordControl.isRTL && isHorizontalOrientation && this.m_dScrollY_max === 0) {
if (Asc.editor.thumbnailsRTL && isHorizontalOrientation && this.m_dScrollY_max === 0) {
wordControl.m_oScrollThumbApi.scrollToX(wordControl.m_oScrollThumbApi.maxScrollX);
}
}
@ -6321,7 +6321,7 @@ function CThumbnailsManager(editorPage)
this.m_bIsUpdate = true;
};
this.calculateThumbnailsOffsets = function () {
const isHorizontalOrientation = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isHorizontalOrientation = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
if (isHorizontalOrientation) {
this.const_offset_y = 25 + Math.round(9 * AscCommon.AscBrowser.retinaPixelRatio)
} else {
@ -6338,7 +6338,7 @@ function CThumbnailsManager(editorPage)
const oPresentation = this.m_oWordControl.m_oLogicDocument;
const slidesCount = this.GetSlidesCount();
const isHorizontalOrientation = this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom;
const isHorizontalOrientation = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom;
let thumbnailHeight, thumbnailWidth;
if (isHorizontalOrientation) {
@ -6411,7 +6411,7 @@ function CThumbnailsManager(editorPage)
settings.targetHoverColor = GlobalSkin.ScrollerTargetHoverColor;
settings.targetActiveColor = GlobalSkin.ScrollerTargetActiveColor;
if (this.m_oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
settings.isHorizontalScroll = true;
settings.isVerticalScroll = false;
settings.contentW = totalContentLength;
@ -6494,7 +6494,7 @@ CThumbnailsManager.prototype.isThumbnailsShown = function () {
const width = absolutePosition.R - absolutePosition.L;
const height = absolutePosition.B - absolutePosition.T;
const isHorizontalThumbnails = this.m_oWordControl.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
return isHorizontalThumbnails
? width >= 0 && height >= 1
: width >= 1 && height >= 0;

100
slide/Drawing/HtmlPage.js
View File

@ -300,8 +300,6 @@
this.MouseHandObject = null;
this.m_oApi = api;
this.thumbnailsPosition = thumbnailsPositionMap.left; // left, right, bottom
this.isRTL = false;
oThis = this;
}
@ -311,7 +309,7 @@
if (element) element.style.overflow = "hidden";
}
const thumbnailsSplitter = new Splitter(67.5, 20, 80, this.thumbnailsPosition === thumbnailsPositionMap.bottom);
const thumbnailsSplitter = new Splitter(67.5, 20, 80, Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom);
const notesSplitter = this.m_oApi.isReporterMode
? new Splitter(Math.min(Math.max(window.innerHeight * 0.5 * AscCommon.g_dKoef_pix_to_mm, 10), 200), 10, 200, true)
: new Splitter(this.IsNotesSupported() && !this.m_oApi.isEmbedVersion ? 10 : 0, 10, 100, true);
@ -326,13 +324,13 @@
// Main parent (everything excluding thumbnails)
this.m_oMainParent = CreateControlContainer("id_main_parent");
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oMainParent.Bounds.SetParams(this.splitters[0].position + GlobalSkin.SplitterWidthMM, 0, g_dKoef_pix_to_mm, 1000, true, false, true, false, -1, -1);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oMainParent.Bounds.SetParams(0, 0, this.splitters[0].position + GlobalSkin.SplitterWidthMM, 1000, false, false, true, false, -1, -1);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oMainParent.Bounds.SetParams(0, 0, 1000, this.splitters[0].position + GlobalSkin.SplitterWidthMM, false, false, false, true, -1, -1);
}
this.m_oBody.AddControl(this.m_oMainParent);
@ -884,39 +882,39 @@
// Thumbnails container
this.m_oThumbnailsContainer = CreateControlContainer("id_panel_thumbnails");
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oThumbnailsContainer.Bounds.SetParams(0, 0, this.splitters[0].position, 1000, false, false, true, false, this.splitters[0].position, -1);
this.m_oThumbnailsContainer.Anchor = (g_anchor_left | g_anchor_top | g_anchor_bottom);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oThumbnailsContainer.Bounds.SetParams(0, 0, 1000, 1000, false, false, false, false, this.splitters[0].position, -1);
this.m_oThumbnailsContainer.Anchor = (g_anchor_top | g_anchor_right | g_anchor_bottom);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnailsContainer.Bounds.SetParams(0, 0, 1000, 1000, false, false, false, false, -1, this.splitters[0].position);
this.m_oThumbnailsContainer.Anchor = (g_anchor_left | g_anchor_right | g_anchor_bottom);
}
this.m_oBody.AddControl(this.m_oThumbnailsContainer);
this.m_oThumbnailsBack = CreateControl("id_thumbnails_background");
if (this.thumbnailsPosition === thumbnailsPositionMap.left || this.thumbnailsPosition === thumbnailsPositionMap.right) {
this.isRTL
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left || Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
Asc.editor.thumbnailsRTL
? this.m_oThumbnailsBack.Bounds.SetParams(scrollWidth, 0, 1000, 1000, true, false, false, false, -1, -1)
: this.m_oThumbnailsBack.Bounds.SetParams(0, 0, scrollWidth, 1000, false, false, true, false, -1, -1);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnailsBack.Bounds.SetParams(0, 0, 1000, scrollWidth, false, false, false, true, -1, -1);
}
this.m_oThumbnailsBack.Anchor = (g_anchor_left | g_anchor_top | g_anchor_right | g_anchor_bottom);
this.m_oThumbnailsContainer.AddControl(this.m_oThumbnailsBack);
this.m_oThumbnails = CreateControl("id_thumbnails");
if (this.thumbnailsPosition === thumbnailsPositionMap.left || this.thumbnailsPosition === thumbnailsPositionMap.right) {
this.isRTL
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left || Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
Asc.editor.thumbnailsRTL
? this.m_oThumbnails.Bounds.SetParams(scrollWidth, 0, 1000, 1000, true, false, false, false, -1, -1)
: this.m_oThumbnails.Bounds.SetParams(0, 0, scrollWidth, 1000, false, false, true, false, -1, -1);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnails.Bounds.SetParams(0, 0, 1000, scrollWidth, false, false, false, true, -1, -1);
}
this.m_oThumbnails.Anchor = (g_anchor_left | g_anchor_top | g_anchor_right | g_anchor_bottom);
@ -924,8 +922,8 @@
// НАДО ПЕРЕИМЕНОВАТЬ - ОН НЕ ВСЕГДА ВЕРТИКАЛЬНЫЙ ТЕПЕРЬ
this.m_oThumbnails_scroll = CreateControl("id_vertical_scroll_thmbnl");
if (this.thumbnailsPosition === thumbnailsPositionMap.left || this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (this.isRTL) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left || Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsRTL) {
this.m_oThumbnails_scroll.Bounds.SetParams(0, 0, scrollWidth, 1000, false, false, true, false, scrollWidth, -1);
this.m_oThumbnails_scroll.Anchor = (g_anchor_left | g_anchor_top | g_anchor_bottom);
} else {
@ -933,7 +931,7 @@
this.m_oThumbnails_scroll.Anchor = (g_anchor_top | g_anchor_right | g_anchor_bottom);
}
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnails_scroll.Bounds.SetParams(0, 0, 1000, 1000, false, false, false, false, -1, scrollWidth);
this.m_oThumbnails_scroll.Anchor = (g_anchor_left | g_anchor_right | g_anchor_bottom);
}
@ -941,15 +939,15 @@
// Thumbnails splitter
this.m_oThumbnailsSplit = CreateControlContainer("id_panel_thumbnails_split");
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oThumbnailsSplit.Bounds.SetParams(this.splitters[0].position, 0, 1000, 1000, true, false, false, false, GlobalSkin.SplitterWidthMM, -1);
this.m_oThumbnailsSplit.Anchor = (g_anchor_left | g_anchor_top | g_anchor_bottom);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oThumbnailsSplit.Bounds.SetParams(0, 0, this.splitters[0].position, 1000, false, false, true, false, GlobalSkin.SplitterWidthMM, -1);
this.m_oThumbnailsSplit.Anchor = (g_anchor_top | g_anchor_right | g_anchor_bottom);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnailsSplit.Bounds.SetParams(0, 0, 1000, this.splitters[0].position, false, false, false, true, -1, GlobalSkin.SplitterWidthMM);
this.m_oThumbnailsSplit.Anchor = (g_anchor_left | g_anchor_right | g_anchor_bottom);
}
@ -1222,7 +1220,7 @@
splitterElement.style.zIndex = 1000;
splitterElement.setAttribute('contentEditable', false);
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
const bottom = splitterIndex === 1
? this.Height
: this.Height - Math.round(this.splitters[0].position * g_dKoef_mm_to_pix);
@ -1235,7 +1233,7 @@
} else {
const isThumbnailsSplitter = splitterIndex === 1;
if (isThumbnailsSplitter) {
splitterElement.style.left = this.thumbnailsPosition === thumbnailsPositionMap.left
splitterElement.style.left = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left
? position + 'px'
: this.Width - position - splitterWidth + 'px';
splitterElement.style.top = '0px';
@ -1245,7 +1243,7 @@
} else {
const thumbnailsSplitterPosition = Math.round(this.splitters[0].position * g_dKoef_mm_to_pix);
splitterElement.style.left = this.thumbnailsPosition === thumbnailsPositionMap.left
splitterElement.style.left = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left
? thumbnailsSplitterPosition + splitterWidth + 'px'
: '0px';
splitterElement.style.top = this.Height - position - splitterWidth + 'px';
@ -1271,7 +1269,7 @@
let thumbnailsSplitterPosition, notesSplitterPosition, animPaneSplitterPosition;
let isWithinThumbnailsSplitter, isWithinNotesSplitter, isWithinAnimPaneSplitter;
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
thumbnailsSplitterPosition = oWordControl.splitters[0].position * g_dKoef_mm_to_pix;
notesSplitterPosition = oWordControl.Height - (oWordControl.splitters[1].position * g_dKoef_mm_to_pix + splitterWidth);
animPaneSplitterPosition = oWordControl.Height - (oWordControl.splitters[2].position * g_dKoef_mm_to_pix + splitterWidth);
@ -1279,7 +1277,7 @@
isWithinNotesSplitter = mouseX >= thumbnailsSplitterPosition + splitterWidth && mouseX <= oWordControl.Width && mouseY >= notesSplitterPosition && mouseY <= notesSplitterPosition + splitterWidth;
isWithinAnimPaneSplitter = mouseX >= thumbnailsSplitterPosition + splitterWidth && mouseX <= oWordControl.Width && mouseY >= animPaneSplitterPosition && mouseY <= animPaneSplitterPosition + splitterWidth;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
thumbnailsSplitterPosition = oWordControl.Width - oWordControl.splitters[0].position * g_dKoef_mm_to_pix - splitterWidth;
notesSplitterPosition = oWordControl.Height - (oWordControl.splitters[1].position * g_dKoef_mm_to_pix + splitterWidth);
animPaneSplitterPosition = oWordControl.Height - (oWordControl.splitters[2].position * g_dKoef_mm_to_pix + splitterWidth);
@ -1287,7 +1285,7 @@
isWithinNotesSplitter = mouseX >= 0 && mouseX <= thumbnailsSplitterPosition && mouseY >= notesSplitterPosition && mouseY <= notesSplitterPosition + splitterWidth;
isWithinAnimPaneSplitter = mouseX >= 0 && mouseX <= thumbnailsSplitterPosition && mouseY >= animPaneSplitterPosition && mouseY <= animPaneSplitterPosition + splitterWidth;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
thumbnailsSplitterPosition = oWordControl.Height - (oWordControl.splitters[0].position * g_dKoef_mm_to_pix + splitterWidth);
notesSplitterPosition = thumbnailsSplitterPosition - (oWordControl.splitters[1].position * g_dKoef_mm_to_pix + splitterWidth);
animPaneSplitterPosition = thumbnailsSplitterPosition - (oWordControl.splitters[2].position * g_dKoef_mm_to_pix + splitterWidth);
@ -1350,7 +1348,7 @@
let oWordControl = oThis;
let nSplitter = oThis.hitToSplitter();
if (nSplitter > 0) {
oWordControl.m_oBody.HtmlElement.style.cursor = oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom
oWordControl.m_oBody.HtmlElement.style.cursor = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? "ns-resize"
: nSplitter === 1 ? "ew-resize" : "ns-resize";
@ -1380,7 +1378,7 @@
if (null == oWordControl.SplitterDiv) {
const cursorStyles = {
0: 'default',
1: oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom ? 'ns-resize' : 'ew-resize',
1: Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom ? 'ns-resize' : 'ew-resize',
2: 'ns-resize',
3: 'ns-resize',
};
@ -1395,33 +1393,33 @@
const splitter = oWordControl.splitters[0];
let minPosition, maxPosition;
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
minPosition = splitter.minPosition * g_dKoef_mm_to_pix >> 0;
maxPosition = splitter.maxPosition * g_dKoef_mm_to_pix >> 0;
}
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
minPosition = oWordControl.Width - (splitter.maxPosition * g_dKoef_mm_to_pix >> 0);
maxPosition = oWordControl.Width - (splitter.minPosition * g_dKoef_mm_to_pix >> 0);
}
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
minPosition = oWordControl.Height - (splitter.maxPosition * g_dKoef_mm_to_pix >> 0);
maxPosition = oWordControl.Height - (splitter.minPosition * g_dKoef_mm_to_pix >> 0);
}
let splitterPosition;
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
const shouldHideThumbnails = canHideThumbnails && mouseX < (minPosition / 2);
splitterPosition = shouldHideThumbnails
? 0
: Math.min(Math.max(mouseX, minPosition), maxPosition);
}
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
const shouldHideThumbnails = canHideThumbnails && mouseX > (oWordControl.Width + maxPosition) / 2;
splitterPosition = shouldHideThumbnails
? oWordControl.Width
: Math.min(Math.max(mouseX, minPosition), maxPosition);
}
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
splitterPosition = Math.max(mouseY, minPosition);
if (splitterPosition > maxPosition) {
const center = (oWordControl.Height + maxPosition) / 2;
@ -1429,7 +1427,7 @@
}
}
if (oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
oWordControl.m_oBody.HtmlElement.style.cursor = 'ns-resize';
oWordControl.SplitterDiv.style.top = splitterPosition + 'px';
} else {
@ -1440,7 +1438,7 @@
if (2 == oWordControl.SplitterType || 3 == oWordControl.SplitterType) {
const splitter = oWordControl.splitters[1];
const reservedWordControlHeight = 30 * g_dKoef_mm_to_pix;
const bottom = oWordControl.thumbnailsPosition === thumbnailsPositionMap.bottom
const bottom = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? oWordControl.Height - oWordControl.splitters[0].position * g_dKoef_mm_to_pix
: oWordControl.Height;
const minPosition = Math.max(reservedWordControlHeight, bottom - (splitter.maxPosition * g_dKoef_mm_to_pix >> 0));
@ -1497,13 +1495,13 @@
const significantDelta = 1; // in millimeters
let position;
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
position = splitterLeft * g_dKoef_pix_to_mm;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
position = Math.max(0, (this.Width - splitterLeft) * g_dKoef_pix_to_mm - GlobalSkin.SplitterWidthMM);
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
position = Math.max(0, (this.Height - splitterTop) * g_dKoef_pix_to_mm - GlobalSkin.SplitterWidthMM);
}
@ -1518,7 +1516,7 @@
CEditorPage.prototype.handleNotesSplitter = function () {
const splitterTop = parseInt(this.SplitterDiv.style.top);
const bottom = this.thumbnailsPosition === thumbnailsPositionMap.bottom
const bottom = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? this.Height - this.splitters[0].position * g_dKoef_mm_to_pix
: this.Height;
@ -1538,7 +1536,7 @@
CEditorPage.prototype.handleAnimPaneSplitter = function () {
const splitterTop = parseInt(this.SplitterDiv.style.top);
const bottom = this.thumbnailsPosition === thumbnailsPositionMap.bottom
const bottom = Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom
? this.Height - this.splitters[0].position * g_dKoef_mm_to_pix
: this.Height;
@ -1581,16 +1579,16 @@
}
};
CEditorPage.prototype.onSplitterResize = function (isNoNeedResize) {
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oThumbnailsContainer.Bounds.AbsW = this.splitters[0].position;
this.m_oThumbnailsContainer.Bounds.R = this.splitters[0].position;
this.m_oThumbnailsSplit.Bounds.L = this.splitters[0].position;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oThumbnailsContainer.Bounds.AbsW = this.splitters[0].position;
this.m_oThumbnailsSplit.Bounds.R = this.splitters[0].position;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oThumbnailsContainer.Bounds.AbsH = this.splitters[0].position;
this.m_oThumbnailsSplit.Bounds.B = this.splitters[0].position;
}
@ -1614,13 +1612,13 @@
this.splitters[1].setPosition(notesSplitterPosition, false, true);
if (this.IsUseNullThumbnailsSplitter || (0 != this.splitters[0].position)) {
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oMainParent.Bounds.L = this.splitters[0].position + GlobalSkin.SplitterWidthMM;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oMainParent.Bounds.R = this.splitters[0].position + GlobalSkin.SplitterWidthMM;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oMainParent.Bounds.B = this.splitters[0].position + GlobalSkin.SplitterWidthMM;
}
this.m_oMainContent.Bounds.B = GlobalSkin.SupportNotes ? this.splitters[1].position + GlobalSkin.SplitterWidthMM : 1000;
@ -1633,13 +1631,13 @@
this.m_oThumbnailsSplit.HtmlElement.style.display = "block";
this.m_oMainParent.HtmlElement.style.borderLeft = ("1px solid " + GlobalSkin.BorderSplitterColor);
} else {
if (this.thumbnailsPosition === thumbnailsPositionMap.left) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.left) {
this.m_oMainParent.Bounds.L = 0;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.right) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.right) {
this.m_oMainParent.Bounds.R = 0;
}
if (this.thumbnailsPosition === thumbnailsPositionMap.bottom) {
if (Asc.editor.thumbnailsPosition === thumbnailsPositionMap.bottom) {
this.m_oMainParent.Bounds.B = 0;
}

4
slide/Drawing/mobileTouchManager.js
View File

@ -1130,7 +1130,7 @@
};
CMobileDelegateThumbnails.prototype.GetScrollerSize = function()
{
const isHorizontalThumbnails = this.Thumbnails.m_oWordControl.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
return isHorizontalThumbnails
? { H : 1, W : AscCommon.AscBrowser.convertToRetinaValue(this.Thumbnails.ScrollerWidth) }
: { W : 1, H : AscCommon.AscBrowser.convertToRetinaValue(this.Thumbnails.ScrollerHeight) };
@ -1138,7 +1138,7 @@
CMobileDelegateThumbnails.prototype.ScrollTo = function(_scroll)
{
if (this.HtmlPage.m_oScrollThumbApi) {
const isHorizontalThumbnails = this.Thumbnails.m_oWordControl.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
const isHorizontalThumbnails = Asc.editor.thumbnailsPosition === AscCommonSlide.thumbnailsPositionMap.bottom;
isHorizontalThumbnails
? this.HtmlPage.m_oScrollThumbApi.scrollToX(-_scroll.x * AscCommon.AscBrowser.retinaPixelRatio)
: this.HtmlPage.m_oScrollThumbApi.scrollToY(-_scroll.y * AscCommon.AscBrowser.retinaPixelRatio);

14
slide/api.js
View File

@ -689,6 +689,20 @@
this.disableReporterEvents = false;
this.TableStylesPreviewGenerator = null;
this.thumbnailsPosition = AscCommonSlide.thumbnailsPositionMap.bottom;
this.thumbnailsRTL = false;
if(config["thumbnails-position"] === "bottom") {
this.thumbnailsPosition = AscCommonSlide.thumbnailsPositionMap.bottom;
}
else if(config["thumbnails-position"] === "right") {
this.thumbnailsPosition = AscCommonSlide.thumbnailsPositionMap.right;
}
if(config['thumbnails-rtl'] === true) {
this.thumbnailsRTL = true;
}
if (this.isReporterMode)
{
var _windowOnResize = function() {

3
tests/slide/common/editor.js
View File

@ -94,7 +94,8 @@
editor.WordControl.m_oApi = editor;
editor.textArtPreviewManager = drawingDocument;
editor.thumbnailsPosition = AscCommonSlide.thumbnailsPositionMap.left
editor.thumbnailsRTL = false;
editor.asc_hideComments = function () {};
editor.isSlideShow = function () {return false};
editor.sync_HideComment = function () {};