[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svtools/source

Tomaž Vajngerl tomaz.vajngerl at collabora.co.uk
Thu Dec 25 03:40:19 PST 2014


 svtools/source/control/tabbar.cxx |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
commit 1818af4b72d35f26fbfe12acc894f7bbaa984dba
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Thu Dec 25 16:51:58 2014 +0900

    fdo#87596 Draw tab fill color when selected on the tab bottom
    
    Change-Id: I02bcdf88063d272cb9eb9e89cbee61d30f4f01d6
    (cherry picked from commit 2a20bf5105181d51aab40bdd4ce8c09615a0e599)
    Reviewed-on: https://gerrit.libreoffice.org/13648
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 638d875..d6c6c44 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1168,6 +1168,16 @@ public:
         }
     }
 
+    void drawColorLine()
+    {
+        Point p1 = maPoly[1];
+        Point p2 = maPoly[2];
+        p1 += Point(1, 0);
+        p2 += Point(-1, -3);
+
+        mrParent.DrawRect(Rectangle(p1, p2));
+    }
+
     void drawTab()
     {
         mrParent.SetLineColor(mpStyleSettings->GetDarkShadowColor());
@@ -1188,6 +1198,13 @@ public:
         }
 
         drawOuterFrame();
+
+        if (mbCustomColored && mbSelected)
+        {
+            mrParent.SetFillColor(maCustomColor);
+            mrParent.SetLineColor(maCustomColor);
+            drawColorLine();
+        }
     }
 
     void drawPlusImage()


More information about the Libreoffice-commits mailing list