git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55719 954022d7-b5bf-4e40-9824-e11837661b57

Common/scroll.js

@@ -77,6 +77,8 @@ function CArrowDrawer() {
     this.ImageRight = null;
     this.ImageBottom = null;
 
+    this.IsNeedInvertOnActive = false;
+
     this.InitSize = function ( size, is_retina ) {
         if ( size == this.Size && is_retina == this.IsRetina && null != this.ImageLeft )
             return;
@@ -234,7 +236,47 @@ function CArrowDrawer() {
                 ctx.fillStyle = this.ColorBackActive;
                 ctx.rect( x + 0.5, y + 0.5, strokeW, strokeH );
                 ctx.fill();
-                ctx.drawImage( img, x, y, this.Size, this.Size );
+
+                if (!this.IsNeedInvertOnActive)
+                {
+                    ctx.drawImage( img, x, y, this.Size, this.Size );
+                }
+                else
+                {
+                    // slow method
+                    var _ctx = img.getContext("2d");
+
+                    var _data = _ctx.getImageData(0, 0, this.Size, this.Size);
+                    var _data2 = _ctx.getImageData(0, 0, this.Size, this.Size);
+
+                    var _len = 4 * this.Size * this.Size;
+                    for (var i = 0; i < _len; i += 4)
+                    {
+                        if (_data.data[i + 3] == 255)
+                        {
+                            _data.data[i]       = 255;// - _data.data[i];
+                            _data.data[i + 1]   = 255;// - _data.data[i + 1];
+                            _data.data[i + 2]   = 255;// - _data.data[i + 2];
+                        }
+                    }
+
+                    _ctx.putImageData(_data, 0, 0);
+                    ctx.drawImage( img, x, y, this.Size, this.Size );
+
+                    for (var i = 0; i < _len; i += 4)
+                    {
+                        if (_data.data[i + 3] == 255)
+                        {
+                            _data.data[i]       = 255 - _data.data[i];
+                            _data.data[i + 1]   = 255 - _data.data[i + 1];
+                            _data.data[i + 2]   = 255 - _data.data[i + 2];
+                        }
+                    }
+                    _ctx.putImageData(_data2, 0, 0);
+
+                    _data = null;
+                    _data2 = null;
+                }
                 ctx.strokeStyle = this.ColorBorder;
                 ctx.rect( x + 0.5, y + 0.5, strokeW, strokeH );
                 ctx.stroke();

Word/Drawing/HtmlPage.js

@@ -45,6 +45,8 @@ if (AscBrowser.isIE || window.opera)
 }
 
 var GlobalSkinTeamlab = {
+    Name : "classic",
+    RulersButton : true,
     BackgroundColor : "#B0B0B0",
     RulerDark : "#B0B0B0",
     RulerLight : "EDEDED",
@@ -56,6 +58,8 @@ var GlobalSkinTeamlab = {
     STYLE_THUMBNAIL_HEIGHT : 40
 };
 var GlobalSkinFlat = {
+    Name : "flat",
+    RulersButton : false,
     BackgroundColor : "#F4F4F4",
     RulerDark : "#D8DADC",
     RulerLight : "#FFFFFF",
@@ -293,6 +297,11 @@ function CEditorPage(api)
         this.m_oPanelRight_buttonRulers.Anchor = (g_anchor_left | g_anchor_top | g_anchor_right);
         this.m_oPanelRight.AddControl(this.m_oPanelRight_buttonRulers);
 
+        if (GlobalSkin.RulersButton === false)
+        {
+            this.m_oPanelRight_buttonRulers.HtmlElement.style.display = "none";
+        }
+
         this.m_oPanelRight_buttonNextPage = CreateControl("id_buttonNextPage");
         this.m_oPanelRight_buttonNextPage.Bounds.SetParams(0,0,1000,1000,false,false,false,false,-1,scrollWidthMm);
         this.m_oPanelRight_buttonNextPage.Anchor = (g_anchor_left | g_anchor_bottom | g_anchor_right);
@@ -304,7 +313,10 @@ function CEditorPage(api)
         this.m_oPanelRight.AddControl(this.m_oPanelRight_buttonPrevPage);
 
         this.m_oPanelRight_vertScroll = CreateControl("id_vertical_scroll");
-        this.m_oPanelRight_vertScroll.Bounds.SetParams(0,scrollWidthMm,1000,2*scrollWidthMm,false,true,false,true,-1,-1);
+        if (GlobalSkin.RulersButton === false)
+            this.m_oPanelRight_vertScroll.Bounds.SetParams(0,0,1000,2*scrollWidthMm,false,true,false,true,-1,-1);
+        else
+            this.m_oPanelRight_vertScroll.Bounds.SetParams(0,scrollWidthMm,1000,2*scrollWidthMm,false,true,false,true,-1,-1);
         this.m_oPanelRight_vertScroll.Anchor = (g_anchor_left | g_anchor_top | g_anchor_right | g_anchor_bottom);
         this.m_oPanelRight.AddControl(this.m_oPanelRight_vertScroll);
         // --------------------------------------------------------------------------
@@ -2540,7 +2552,11 @@ function CEditorPage(api)
             if (this.m_oScrollHor_)
                 this.m_oScrollHor_.Repos(settings, this.m_bIsHorScrollVisible);
             else {
-                this.m_oScrollHor_ = new ScrollObject( "id_horizontal_scroll",settings);
+                this.m_oScrollHor_ = new ScrollObject( "id_horizontal_scroll", settings );
+
+                if (GlobalSkin.Name == "flat")
+                    this.m_oScrollHor_.ArrowDrawer.IsNeedInvertOnActive = true;
+
 				this.m_oScrollHor_.onLockMouse = function(evt){
 					check_MouseDownEvent(evt, true);
 					global_mouseEvent.LockMouse();
@@ -2558,9 +2574,11 @@ function CEditorPage(api)
                 this.m_oScrollVer_.Repos(settings, undefined, true);
             }
             else {
-                this.m_oScrollVer_ = new ScrollObject( "id_vertical_scroll",
-                                    settings
-                                   );
+                this.m_oScrollVer_ = new ScrollObject( "id_vertical_scroll", settings );
+
+                if (GlobalSkin.Name == "flat")
+                    this.m_oScrollVer_.ArrowDrawer.IsNeedInvertOnActive = true;
+
 				this.m_oScrollVer_.onLockMouse = function(evt){
 					check_MouseDownEvent(evt, true);
 					global_mouseEvent.LockMouse();

Word/api.js

@@ -1104,7 +1104,7 @@ asc_docs_api.prototype.CreateCSS = function()
     var style1 = document.createElement('style');
     style1.type = 'text/css';
     style1.innerHTML = ".buttonTabs {\
-background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAA5CAYAAADUZxCcAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAABp0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjUuMTAw9HKhAAABM0lEQVRYR+2Wu4qAMBBF/TIbBQXFylclPtBGf2KrLfdX/DFb21musOLikJ0MwW0sDoab5EgmOOit6+oMNtTChlrOwcfnF2lhZdu2eba8Mn6DCbFsnmdalsX4ErGsbVvqus6NrCxLqqrKjSxJEsqyzI0sDEOKougQ1nVNfd/faiiW+b5PEKZpSjgyaohLua4RyyQ8I9Nyk7mADbWwoZZzwNVCCivjbusvXhm/wYRaho98mqZf69QyiJqmcSODKM9zN7KiKAjd95qJZajROI7H0SBCkwyCQCf7qRGOBhG6LrrvdY1YJuEZmZabzAVsqIUNtbChlnPAFVYKK9v33bPllfEbTFjL0IoAN/e/Mvx+DsPgRoYuC7g5kQw/xhxxHB9PKxnaswkrmZRnZFpuMhewoY7V+wa2hli8QmxDtwAAAABJRU5ErkJggg==);\
+background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAA5CAMAAADjueCuAAAABGdBTUEAALGPC/xhBQAAAEhQTFRFAAAAWFhYZWVlSEhIY2NjV1dXQ0NDYWFhYmJiTk5OVlZWYGBgVFRUS0tLbGxsRERETExMZmZmVVVVXl5eR0dHa2trPj4+u77CpAZQrwAAAAF0Uk5TAEDm2GYAAABwSURBVDjL1dHHDoAgEEVR7NLr4P//qQm6EMaFxtje8oTF5ELIpU35Fstf3GegsPEBG+uwSYpNB1qNKreoDeNw/r6dLr/tnFpbbNZj8wKbk8W/1d6ZPjfrhdHx9c4fbA9wzMYWm3OFhbQmbC2ue6z9DCH/Exf/mU3YAAAAAElFTkSuQmCC);\
 background-position: 0px 0px;\
 background-repeat: no-repeat;\
 }";
@@ -6542,6 +6542,33 @@ asc_docs_api.prototype.asc_setAutoSaveGap = function (autoSaveGap) {
 	}
 };
 
+asc_docs_api.prototype.asc_SetViewRulers = function(bRulers)
+{
+    if (false === this.bInit_word_control || true === this.isViewMode)
+        return;
+
+    if (this.WordControl.m_bIsRuler != bRulers)
+    {
+        this.WordControl.m_bIsRuler = bRulers;
+        this.WordControl.checkNeedRules();
+        this.WordControl.OnResize(true);
+    }
+}
+asc_docs_api.prototype.asc_SetViewRulersChange = function()
+{
+    if (false === this.bInit_word_control || true === this.isViewMode)
+        return;
+
+    this.WordControl.m_bIsRuler = !this.WordControl.m_bIsRuler;
+    this.WordControl.checkNeedRules();
+    this.WordControl.OnResize(true);
+    return this.WordControl.m_bIsRuler;
+}
+asc_docs_api.prototype.asc_GetViewRulers = function()
+{
+    return this.WordControl.m_bIsRuler;
+}
+
 asc_docs_api.prototype.SetMobileVersion = function(val)
 {
     this.isMobileVersion = val;