From 46ada3f8e748533398daf687ad5f37c4c0528b83 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Sun, 3 Mar 2019 13:28:55 +0100
Subject: Draw tabs from external svg image, fixes for tabs (colors)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I35db7b8e36c474d2196bfae1ec4dd352e17d2a14
Reviewed-on: https://gerrit.libreoffice.org/68822
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 vcl/Package_theme_definitions.mk                   |  6 +++++
 vcl/uiconfig/theme_definitions/definition.xml      | 28 +++++++++++++++-------
 .../theme_definitions/tabitem-first-selected.svgx  |  3 +++
 vcl/uiconfig/theme_definitions/tabitem-first.svgx  |  3 +++
 .../theme_definitions/tabitem-last-selected.svgx   |  3 +++
 vcl/uiconfig/theme_definitions/tabitem-last.svgx   |  3 +++
 .../theme_definitions/tabitem-middle-selected.svgx |  3 +++
 vcl/uiconfig/theme_definitions/tabitem-middle.svgx |  3 +++
 8 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-first.svgx
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-last.svgx
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
 create mode 100644 vcl/uiconfig/theme_definitions/tabitem-middle.svgx

(limited to 'vcl')

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 41dcf1396e8b..122120c1a3c4 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -28,6 +28,12 @@ $(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th
 	spinbox-entire.svgx \
 	pushbutton-default.svgx \
 	pushbutton-rollover.svgx \
+	tabitem-first.svgx \
+	tabitem-middle.svgx \
+	tabitem-last.svgx \
+	tabitem-first-selected.svgx \
+	tabitem-middle-selected.svgx \
+	tabitem-last-selected.svgx \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 2e6c50e681e7..244f9c259ce4 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -42,8 +42,8 @@
         <highlightTextColor value="#FFFFFF"/>
         <activeTabColor value="#FFFFFF"/>
         <inactiveTabColor value="#C0C0C0"/>
-        <tabTextColor value="#000000"/>
-        <tabRolloverTextColor value="#000000"/>
+        <tabTextColor value="#007AFF"/>
+        <tabRolloverTextColor value="#007AFF"/>
         <tabHighlightTextColor value="#FFFFFF"/>
         <disableColor value="#808080"/>
         <helpColor value="#FFFFE0"/>
@@ -272,11 +272,23 @@
 
     <tabitem>
         <part value="Entire">
-            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="true" button-value="any">
-                <rect stroke="#007AFF" fill="#007AFF" stroke-width="1" rx="1" ry="1"/>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any" extra="first">
+                <external source="tabitem-first.svgx" />
             </state>
-            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any">
-                <rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any" extra="middle">
+                <external source="tabitem-middle.svgx" />
+            </state>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any" extra="last">
+                <external source="tabitem-last.svgx" />
+            </state>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="true" button-value="any" extra="first">
+                <external source="tabitem-first-selected.svgx" />
+            </state>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="true" button-value="any" extra="middle">
+                <external source="tabitem-middle-selected.svgx" />
+            </state>
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="true" button-value="any" extra="last">
+                <external source="tabitem-last-selected.svgx" />
             </state>
         </part>
     </tabitem>
@@ -284,7 +296,7 @@
     <tabheader>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-                <rect stroke="#FF0000" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
+                <rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
             </state>
         </part>
     </tabheader>
@@ -292,7 +304,7 @@
     <tabpane>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-                <rect stroke="#00FF00" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
+                <rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/>
             </state>
         </part>
     </tabpane>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx b/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
new file mode 100644
index 000000000000..771a2df046e0
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="m43.5 0.5007v25h-40.95c-1.239 6.1e-5 -2.048-0.9415-2.048-2.083v-20.83c0-1.212 0.8811-2.083 2.048-2.083 13.65 0.03813 40.95 0 40.95 0z" fill="#007aff" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first.svgx b/vcl/uiconfig/theme_definitions/tabitem-first.svgx
new file mode 100644
index 000000000000..f21ed6818380
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-first.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="m43.5 0.5007v25h-40.95c-1.239 6.1e-5 -2.048-0.9415-2.048-2.083v-20.83c0-1.212 0.8811-2.083 2.048-2.083 13.65 0.03813 40.95 0 40.95 0z" fill="#fff" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx b/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
new file mode 100644
index 000000000000..8b3c7b57cf26
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="m41.29 25.49-40.79-0.002785v-24.99l40.79-0.002781c1.224-8.635e-5 2.208 0.9683 2.208 2.171v20.66c0 1.203-0.9846 2.175-2.208 2.171z" fill="#007aff" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last.svgx b/vcl/uiconfig/theme_definitions/tabitem-last.svgx
new file mode 100644
index 000000000000..494fd20907ad
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-last.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="m41.29 25.49-40.79-0.002785v-24.99l40.79-0.002781c1.224-8.635e-5 2.208 0.9683 2.208 2.171v20.66c0 1.203-0.9846 2.175-2.208 2.171z" fill="none" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx b/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
new file mode 100644
index 000000000000..b1877520eb39
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".5" y=".5" width="43" height="25" fill="#007aff" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle.svgx b/vcl/uiconfig/theme_definitions/tabitem-middle.svgx
new file mode 100644
index 000000000000..309d850eb830
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/tabitem-middle.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <rect x=".5" y=".5" width="43" height="25" fill="#fff" stroke="#007aff"/>
+</svg>
-- 
cgit