Commit c696d427 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Цвет гиперссылки берется из темы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57229 954022d7-b5bf-4e40-9824-e11837661b57
parent 1f051174
...@@ -3349,21 +3349,25 @@ DrawingObjectsController.prototype = ...@@ -3349,21 +3349,25 @@ DrawingObjectsController.prototype =
else if ( e.keyCode == 37 ) // Left Arrow else if ( e.keyCode == 37 ) // Left Arrow
{ {
this.cursorMoveLeft(e.shiftKey,ctrlKey ); this.cursorMoveLeft(e.shiftKey,ctrlKey );
this.drawingObjects.sendGraphicObjectProps();
bRetValue = true; bRetValue = true;
} }
else if ( e.keyCode == 38 ) // Top Arrow else if ( e.keyCode == 38 ) // Top Arrow
{ {
this.cursorMoveUp(e.shiftKey,ctrlKey ); this.cursorMoveUp(e.shiftKey);
this.drawingObjects.sendGraphicObjectProps();
bRetValue = true; bRetValue = true;
} }
else if ( e.keyCode == 39 ) // Right Arrow else if ( e.keyCode == 39 ) // Right Arrow
{ {
this.cursorMoveRight(e.shiftKey,ctrlKey ); this.cursorMoveRight(e.shiftKey,ctrlKey );
this.drawingObjects.sendGraphicObjectProps();
bRetValue = true; bRetValue = true;
} }
else if ( e.keyCode == 40 ) // Bottom Arrow else if ( e.keyCode == 40 ) // Bottom Arrow
{ {
this.cursorMoveDown(e.shiftKey,ctrlKey ); this.cursorMoveDown(e.shiftKey);
this.drawingObjects.sendGraphicObjectProps();
bRetValue = true; bRetValue = true;
} }
else if ( e.keyCode == 45 ) // Insert else if ( e.keyCode == 45 ) // Insert
...@@ -3378,6 +3382,7 @@ DrawingObjectsController.prototype = ...@@ -3378,6 +3382,7 @@ DrawingObjectsController.prototype =
else if ( e.keyCode == 65 && true === ctrlKey ) // Ctrl + A - выделяем все else if ( e.keyCode == 65 && true === ctrlKey ) // Ctrl + A - выделяем все
{ {
this.selectAll(); this.selectAll();
this.drawingObjects.sendGraphicObjectProps();
bRetValue = true; bRetValue = true;
} }
else if ( e.keyCode == 66 && false === isViewMode && true === ctrlKey ) // Ctrl + B - делаем текст жирным else if ( e.keyCode == 66 && false === isViewMode && true === ctrlKey ) // Ctrl + B - делаем текст жирным
......
...@@ -928,6 +928,7 @@ TextAddState.prototype = ...@@ -928,6 +928,7 @@ TextAddState.prototype =
{ {
this.majorObject.selectionSetEnd(e, x, y, pageIndex); this.majorObject.selectionSetEnd(e, x, y, pageIndex);
this.drawingObjects.updateSelectionState(); this.drawingObjects.updateSelectionState();
this.drawingObjects.drawingObjects.sendGraphicObjectProps();
this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects)); this.drawingObjects.changeCurrentState(new NullState(this.drawingObjects));
} }
......
...@@ -3179,7 +3179,11 @@ ParaRun.prototype = ...@@ -3179,7 +3179,11 @@ ParaRun.prototype =
RGBA = CurTextPr.Unifill.getRGBAColor(); RGBA = CurTextPr.Unifill.getRGBAColor();
if ( true === PDSE.VisitedHyperlink ) if ( true === PDSE.VisitedHyperlink )
pGraphics.b_color1( 128, 0, 151, 255 ); {
G_O_VISITED_HLINK_COLOR.check(PDSE.Theme, PDSE.ColorMap);
RGBA = G_O_VISITED_HLINK_COLOR.getRGBAColor();
pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A );
}
else else
{ {
pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A); pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A);
...@@ -3188,7 +3192,11 @@ ParaRun.prototype = ...@@ -3188,7 +3192,11 @@ ParaRun.prototype =
else else
{ {
if ( true === PDSE.VisitedHyperlink ) if ( true === PDSE.VisitedHyperlink )
pGraphics.b_color1( 128, 0, 151, 255 ); {
G_O_VISITED_HLINK_COLOR.check(PDSE.Theme, PDSE.ColorMap);
RGBA = G_O_VISITED_HLINK_COLOR.getRGBAColor();
pGraphics.b_color1( RGBA.R, RGBA.G, RGBA.B, RGBA.A );
}
else if ( true === CurTextPr.Color.Auto ) else if ( true === CurTextPr.Color.Auto )
pGraphics.b_color1( AutoColor.r, AutoColor.g, AutoColor.b, 255); pGraphics.b_color1( AutoColor.r, AutoColor.g, AutoColor.b, 255);
else else
......
...@@ -2406,7 +2406,8 @@ CStyle.prototype = ...@@ -2406,7 +2406,8 @@ CStyle.prototype =
var TextPr = var TextPr =
{ {
Color : { r : 0x00, g : 0x00, b : 0xFF }, Color : { r : 0x00, g : 0x00, b : 0xFF },
Underline : true Underline : true,
Unifill : CreateUniFillSchemeColorWidthTint(11, 0)
}; };
this.Set_UiPriority( 99 ); this.Set_UiPriority( 99 );
......
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