Skip to content

S
sdkjs
Commit 375d0a18 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov
Browse files
Options

track line 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57779 954022d7-b5bf-4e40-9824-e11837661b57
parent 94828f47
Show whitespace changes
Inline Side-by-side
Showing with 993 additions and 977 deletions
Excel/model/DrawingObjects/Overlay.js
View file @ 375d0a18
...@@ -977,6 +977,8 @@ CAutoshapeTrack.prototype = ...@@ -977,6 +977,8 @@ CAutoshapeTrack.prototype =
ctx.strokeStyle = _style_blue; ctx.strokeStyle = _style_blue;
if (!isLine)
{
if (nIsCleverWithTransform) if (nIsCleverWithTransform)
{ {
ctx.rect(_x1 + 0.5, _y2 + 0.5, _x4 - _x1, _y4 - _y1); ctx.rect(_x1 + 0.5, _y2 + 0.5, _x4 - _x1, _y4 - _y1);
...@@ -984,8 +986,6 @@ CAutoshapeTrack.prototype = ...@@ -984,8 +986,6 @@ CAutoshapeTrack.prototype =
ctx.beginPath(); ctx.beginPath();
} }
else else
{
if (!isLine)
{ {
ctx.moveTo(x1, y1); ctx.moveTo(x1, y1);
ctx.lineTo(x2, y2); ctx.lineTo(x2, y2);
...@@ -1142,19 +1142,26 @@ CAutoshapeTrack.prototype = ...@@ -1142,19 +1142,26 @@ CAutoshapeTrack.prototype =
} }
else else
{ {
overlay.AddRect2(_x1 + 0.5, _y1 + 0.5, TRACK_RECT_SIZE);
if (!isLine) if (!isLine)
{ {
overlay.AddRect2(_x1 + 0.5, _y1 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(_x2 + 0.5, _y2 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x2 + 0.5, _y2 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(_x3 + 0.5, _y3 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x3 + 0.5, _y3 + 0.5, TRACK_RECT_SIZE);
}
overlay.AddRect2(_x4 + 0.5, _y4 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x4 + 0.5, _y4 + 0.5, TRACK_RECT_SIZE);
} }
else
{
overlay.AddRect2(x1 + 0.5, y1 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(x4 + 0.5, y4 + 0.5, TRACK_RECT_SIZE);
}
}
} }
if (!isLine)
{
if (!nIsCleverWithTransform) if (!nIsCleverWithTransform)
{ {
if (bIsRectsTrack && !isLine) if (bIsRectsTrack)
{ {
if (bIsRectsTrackX) if (bIsRectsTrackX)
{ {
...@@ -1185,6 +1192,7 @@ CAutoshapeTrack.prototype = ...@@ -1185,6 +1192,7 @@ CAutoshapeTrack.prototype =
overlay.AddRect2(_x1+0.5, _yC, TRACK_RECT_SIZE); overlay.AddRect2(_x1+0.5, _yC, TRACK_RECT_SIZE);
} }
} }
}
ctx.fill(); ctx.fill();
ctx.stroke(); ctx.stroke();
......
Word/Drawing/Overlay.js
View file @ 375d0a18
...@@ -1093,6 +1093,8 @@ CAutoshapeTrack.prototype = ...@@ -1093,6 +1093,8 @@ CAutoshapeTrack.prototype =
ctx.strokeStyle = _style_blue; ctx.strokeStyle = _style_blue;
if (!isLine)
{
if (nIsCleverWithTransform) if (nIsCleverWithTransform)
{ {
ctx.rect(_x1 + 0.5, _y2 + 0.5, _x4 - _x1, _y4 - _y1); ctx.rect(_x1 + 0.5, _y2 + 0.5, _x4 - _x1, _y4 - _y1);
...@@ -1100,8 +1102,6 @@ CAutoshapeTrack.prototype = ...@@ -1100,8 +1102,6 @@ CAutoshapeTrack.prototype =
ctx.beginPath(); ctx.beginPath();
} }
else else
{
if (!isLine)
{ {
ctx.moveTo(x1, y1); ctx.moveTo(x1, y1);
ctx.lineTo(x2, y2); ctx.lineTo(x2, y2);
...@@ -1258,19 +1258,26 @@ CAutoshapeTrack.prototype = ...@@ -1258,19 +1258,26 @@ CAutoshapeTrack.prototype =
} }
else else
{ {
overlay.AddRect2(_x1 + 0.5, _y1 + 0.5, TRACK_RECT_SIZE);
if (!isLine) if (!isLine)
{ {
overlay.AddRect2(_x1 + 0.5, _y1 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(_x2 + 0.5, _y2 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x2 + 0.5, _y2 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(_x3 + 0.5, _y3 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x3 + 0.5, _y3 + 0.5, TRACK_RECT_SIZE);
}
overlay.AddRect2(_x4 + 0.5, _y4 + 0.5, TRACK_RECT_SIZE); overlay.AddRect2(_x4 + 0.5, _y4 + 0.5, TRACK_RECT_SIZE);
} }
else
{
overlay.AddRect2(x1 + 0.5, y1 + 0.5, TRACK_RECT_SIZE);
overlay.AddRect2(x4 + 0.5, y4 + 0.5, TRACK_RECT_SIZE);
}
}
} }
if (!isLine)
{
if (!nIsCleverWithTransform) if (!nIsCleverWithTransform)
{ {
if (bIsRectsTrack && !isLine) if (bIsRectsTrack)
{ {
if (bIsRectsTrackX) if (bIsRectsTrackX)
{ {
...@@ -1301,6 +1308,7 @@ CAutoshapeTrack.prototype = ...@@ -1301,6 +1308,7 @@ CAutoshapeTrack.prototype =
overlay.AddRect2(_x1+0.5, _yC, TRACK_RECT_SIZE); overlay.AddRect2(_x1+0.5, _yC, TRACK_RECT_SIZE);
} }
} }
}
ctx.fill(); ctx.fill();
ctx.stroke(); ctx.stroke();
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7