Commit 74766295 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Исправлен баг с неправильным стартованием селекта с shift+click, если курсор...

Исправлен баг с неправильным стартованием селекта с shift+click, если курсор находился под автофигурой.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@61595 954022d7-b5bf-4e40-9824-e11837661b57
parent a2626dd4
......@@ -10325,31 +10325,10 @@ CDocument.prototype =
if ( null !== CurPara )
{
var MouseEvent = new CMouseEventHandler();
MouseEvent.ClickCount = 1;
MouseEvent.Type = g_mouse_event_type_down;
var OldX = CurPara.CurPos.X;
var OldY = CurPara.CurPos.Y;
var DrawMatrix = CurPara.Get_ParentTextTransform();
if (DrawMatrix)
{
var _OldX = DrawMatrix.TransformPointX(OldX, OldY);
var _OldY = DrawMatrix.TransformPointY(OldX, OldY);
OldX = _OldX;
OldY = _OldY;
}
this.CurPage = CurPara.Get_StartPage_Absolute() + CurPara.CurPos.PagesPos;
this.Selection_SetStart( OldX, OldY, MouseEvent );
this.CurPage = PageIndex;
this.Cursor_MoveLeft(true, false);
this.Selection.Start = false;
this.Selection_SetEnd( X, Y, e );
this.Document_UpdateSelectionState();
return;
}
}
......@@ -14536,6 +14515,7 @@ CDocument.prototype.End_SilentMode = function(bUpdate)
this.TurnOn_RecalculateCurPos(bUpdate);
this.TurnOn_InterfaceEvents(bUpdate);
};
//CDocument.prototype.
//-----------------------------------------------------------------------------------
//
......
......@@ -7283,7 +7283,7 @@ CDocumentContent.prototype =
if ( true === SelectionUse_old && true === MouseEvent.ShiftKey && true === bOldSelectionIsCommon )
{
this.Selection_SetEnd( X, Y, {Type : g_mouse_event_type_up, ClickCount : 1} );
this.Selection_SetEnd( X, Y, this.CurPage + this.StartPage, {Type : g_mouse_event_type_up, ClickCount : 1} );
this.Selection.Use = true;
this.Selection.Start = true;
this.Selection.EndPos = ContentPos;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment