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

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 4 07:27:02 UTC 2019


 vcl/Package_theme_definitions.mk                              |    1 
 vcl/uiconfig/theme_definitions/ios/definition.xml             |   15 ++++++++--
 vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg |    3 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit aa5abc875934990d1ecec17abc6c58d51afd10b1
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Thu Apr 4 10:56:40 2019 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Apr 4 09:26:35 2019 +0200

    ios theme definition: add slider disabled state
    
    Change-Id: Ie4388f00c4a0c11df77782691fe9ea7f706d2b5c
    Reviewed-on: https://gerrit.libreoffice.org/70231
    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 8f551ebaa8ce..dbb0a92fe268 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
 	ios/arrow-up.svg \
 	ios/arrow-down.svg \
 	ios/slider-button.svg \
+	ios/slider-button-disabled.svg \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 0f0823193857..5b4aa12b44ea 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -295,14 +295,20 @@
 
     <slider>
         <part value="Button">
-            <state>
+            <state enabled="true">
                 <image source="slider-button.svg" />
             </state>
+            <state enabled="false">
+                <image source="slider-button-disabled.svg" />
+            </state>
         </part>
         <part value="TrackHorzLeft">
-            <state>
+            <state enabled="true">
                 <line stroke="#007AFF" stroke-width="6" x1="0.0" y1="0.5" x2="1.0" y2="0.5"/>
             </state>
+            <state enabled="false">
+                <line stroke="#8e8e93" stroke-width="6" x1="0.0" y1="0.5" x2="1.0" y2="0.5"/>
+            </state>
         </part>
         <part value="TrackHorzRight">
             <state>
@@ -310,9 +316,12 @@
             </state>
         </part>
         <part value="TrackVertUpper">
-            <state>
+            <state enabled="true">
                 <line stroke="#007AFF" stroke-width="6" x1="0.5" y1="0.0" x2="0.5" y2="1.0"/>
             </state>
+            <state enabled="false">
+                <line stroke="#8e8e93" stroke-width="6" x1="0.5" y1="0.0" x2="0.5" y2="1.0"/>
+            </state>
         </part>
         <part value="TrackVertLower">
             <state>
diff --git a/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
new file mode 100644
index 000000000000..3c3b9fc56c2e
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/slider-button-disabled.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 28 28" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="24" height="24" rx="12" ry="12" fill="#fff" stroke="#ccc" stroke-width=".92308"/>
+</svg>


More information about the Libreoffice-commits mailing list