[Libreoffice-commits] core.git: vcl/Package_theme_definitions.mk vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/Package_theme_definitions.mk                        |    2 ++
 vcl/uiconfig/theme_definitions/definition.xml           |    4 ++--
 vcl/uiconfig/theme_definitions/pushbutton-default.svgx  |    3 +++
 vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx |    3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 81a504e3919dbcf801859fb28fea0a1d2269c1e2
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Mar 3 13:25:40 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Mar 6 21:00:21 2019 +0100

    Draw pushbutton from external svg image
    
    Change-Id: I45d668636d607e09852ee0ff3144500ac03fb8cf
    Reviewed-on: https://gerrit.libreoffice.org/68819
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 282a07a47df4..41dcf1396e8b 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -26,6 +26,8 @@ $(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th
 	spinbox-left.svgx \
 	spinbox-right.svgx \
 	spinbox-entire.svgx \
+	pushbutton-default.svgx \
+	pushbutton-rollover.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 a44ab10134e7..2e6c50e681e7 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -57,10 +57,10 @@
     <pushbutton>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-                <rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" rx="7" ry="7" />
+                <external source="pushbutton-default.svgx" />
             </state>
             <state enabled="true" focused="any" pressed="any" rollover="true" default="any" selected="any" button-value="any">
-                <rect stroke="#007AFF" fill="#007AFF" stroke-width="1" rx="7" ry="7" />
+                <external source="pushbutton-rollover.svgx" />
             </state>
         </part>
     </pushbutton>
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-default.svgx b/vcl/uiconfig/theme_definitions/pushbutton-default.svgx
new file mode 100644
index 000000000000..24a3b12c2d58
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/pushbutton-default.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" rx="2" ry="2" fill="#fff" stroke="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx b/vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx
new file mode 100644
index 000000000000..6dbaf3278146
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/pushbutton-rollover.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" rx="2" ry="2" fill="#007aff" stroke="#007aff"/>
+</svg>