[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 4 commits - vcl/Package_theme_definitions.mk vcl/source vcl/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Mar 16 00:54:46 UTC 2019
vcl/Package_theme_definitions.mk | 84 +++++-----
vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 5
vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx | 3
vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx | 3
vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx | 3
vcl/uiconfig/theme_definitions/ios/common-rect.svgx | 3
vcl/uiconfig/theme_definitions/ios/definition.xml | 51 ++++--
vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx | 2
vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx | 2
vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx | 2
vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx | 4
vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx | 4
vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx | 4
vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx | 4
vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx | 5
vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx | 5
vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx | 5
vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx | 2
vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx | 3
vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx | 3
vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx | 3
vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx | 3
vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx | 4
vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx | 4
vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx | 4
vcl/uiconfig/theme_definitions/spinbox-left.svgx | 4
vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx | 7
vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx | 5
vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx | 5
vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx | 3
vcl/uiconfig/theme_definitions/tabitem-first.svgx | 3
vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx | 3
vcl/uiconfig/theme_definitions/tabitem-last.svgx | 3
33 files changed, 143 insertions(+), 105 deletions(-)
New commits:
commit 397200422594f71eec4012ecd625d1467984f485
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Mar 16 00:51:25 2019 +0900
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sat Mar 16 08:33:41 2019 +0900
ios widget theme: make corners of widgets more round (rx,ry = 4px)
Change-Id: I2fe8d6570940e08dcf5cce1b335fe81e9d461e5e
Reviewed-on: https://gerrit.libreoffice.org/69316
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
(cherry picked from commit 8a8c029244e8a27efd92017968313c2116a9776a)
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 991adb9ab6be..4bc54c6f73c7 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -48,6 +48,8 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/scrollbar-vertical.svgx \
ios/combobox.svgx \
ios/combobox-disabled.svgx \
+ ios/combobox-button.svgx \
+ ios/combobox-button-disabled.svgx \
ios/arrow-up.svgx \
ios/arrow-down.svgx \
ios/slider-button.svgx \
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svgx
new file mode 100644
index 000000000000..ccb892d77f90
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/combobox-button-disabled.svgx
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 35 36" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8098e-4 -4e-7v1.2272l-6.8092e-4 33.546v1.2272h33.75c0.68524 0 1.2499-0.55442 1.2499-1.2272v-33.546c0-0.67283-0.56468-1.2272-1.2499-1.2272z" fill="#8e8e93"/>
+ <path d="m17.5 19.091-4.6667-5.0907-1.3333 1.4546 6 6.5454 6-6.5454-1.3333-1.4546z" fill="#f5f5f5"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-button.svgx b/vcl/uiconfig/theme_definitions/ios/combobox-button.svgx
new file mode 100644
index 000000000000..b4a1627f3882
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/combobox-button.svgx
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 35 36" xmlns="http://www.w3.org/2000/svg">
+ <path d="m6.8098e-4 -4e-7v1.2272l-6.8092e-4 33.546v1.2272h33.75c0.68524 0 1.2499-0.55442 1.2499-1.2272v-33.546c0-0.67283-0.56468-1.2272-1.2499-1.2272z" fill="#0273f8"/>
+ <path d="m17.5 19.091-4.6667-5.0907-1.3333 1.4546 6 6.5454 6-6.5454-1.3333-1.4546z" fill="#f5f5f5"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
index ccb892d77f90..e4c1f63599d7 100644
--- a/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
@@ -1,4 +1,3 @@
-<svg version="1.1" viewBox="0 0 35 36" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.8098e-4 -4e-7v1.2272l-6.8092e-4 33.546v1.2272h33.75c0.68524 0 1.2499-0.55442 1.2499-1.2272v-33.546c0-0.67283-0.56468-1.2272-1.2499-1.2272z" fill="#8e8e93"/>
- <path d="m17.5 19.091-4.6667-5.0907-1.3333 1.4546 6 6.5454 6-6.5454-1.3333-1.4546z" fill="#f5f5f5"/>
+<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="#8e8e93"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/combobox.svgx b/vcl/uiconfig/theme_definitions/ios/combobox.svgx
index b4a1627f3882..24a3b12c2d58 100644
--- a/vcl/uiconfig/theme_definitions/ios/combobox.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/combobox.svgx
@@ -1,4 +1,3 @@
-<svg version="1.1" viewBox="0 0 35 36" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.8098e-4 -4e-7v1.2272l-6.8092e-4 33.546v1.2272h33.75c0.68524 0 1.2499-0.55442 1.2499-1.2272v-33.546c0-0.67283-0.56468-1.2272-1.2499-1.2272z" fill="#0273f8"/>
- <path d="m17.5 19.091-4.6667-5.0907-1.3333 1.4546 6 6.5454 6-6.5454-1.3333-1.4546z" fill="#f5f5f5"/>
+<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/ios/common-rect-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
index e4c1f63599d7..ee3300ef2642 100644
--- a/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
@@ -1,3 +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="#8e8e93"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="#fff" stroke="#8e8e93"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
index 8bc97ef330ef..e6414445966a 100644
--- a/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
@@ -1,3 +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="none" stroke="#79b9ff"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="none" stroke="#79b9ff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
index 4eff277fe8f7..ca27ee8557ac 100644
--- a/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
@@ -1,3 +1,3 @@
<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <rect x="1.5" y="1.5" width="41" height="23" rx="2" ry="2" fill="none" stroke="#79b9ff" stroke-width="3"/>
+ <rect x="1.5" y="1.5" width="41" height="23" rx="4" ry="4" fill="none" stroke="#79b9ff" stroke-width="3"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
index 24a3b12c2d58..667b0960f336 100644
--- a/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
@@ -1,3 +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"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="#fff" stroke="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index ffe6a29786ac..9447d7678e0a 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -143,23 +143,22 @@
<combobox>
<part value="Entire">
<state enabled="true">
- <external source="common-rect.svgx" />
+ <external source="combobox.svgx" />
</state>
<state enabled="false">
- <external source="common-rect-disabled.svgx" />
+ <external source="combobox-disabled.svgx" />
</state>
</part>
<part value="SubEdit">
<state>
</state>
</part>
-
<part value="ButtonDown" width="35" height="36">
<state enabled="true">
- <image source="combobox.svgx" />
+ <image source="combobox-button.svgx" />
</state>
<state enabled="false">
- <image source="combobox-disabled.svgx" />
+ <image source="combobox-button-disabled.svgx" />
</state>
</part>
<part value="Focus">
@@ -186,15 +185,10 @@
<listbox>
<part value="Entire">
<state enabled="true">
- <external source="common-rect.svgx" />
+ <external source="combobox.svgx" />
</state>
<state enabled="false">
- <external source="common-rect-disabled.svgx" />
- </state>
- </part>
- <part value="ListboxWindow">
- <state>
- <rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1" />
+ <external source="combobox-disabled.svgx" />
</state>
</part>
<part value="SubEdit">
@@ -203,10 +197,10 @@
</part>
<part value="ButtonDown" width="35" height="36">
<state enabled="true">
- <image source="combobox.svgx" />
+ <image source="combobox-button.svgx" />
</state>
<state enabled="false">
- <image source="combobox-disabled.svgx" />
+ <image source="combobox-button-disabled.svgx" />
</state>
</part>
<part value="Focus">
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
index 24a3b12c2d58..667b0960f336 100644
--- a/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
@@ -1,3 +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"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="#fff" stroke="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
index e4c1f63599d7..ee3300ef2642 100644
--- a/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
@@ -1,3 +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="#8e8e93"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="#fff" stroke="#8e8e93"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
index 6dbaf3278146..dad0069ef725 100644
--- a/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
@@ -1,3 +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"/>
+ <rect x=".5" y=".5" width="43" height="25" rx="4" ry="4" fill="#007aff" stroke="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
index 52c4bcd09433..b239b8e239b9 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
@@ -1,4 +1,4 @@
<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="#8e8e93"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#fff" stroke="#8e8e93" stroke-linecap="round"/>
<rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
index 141f805774eb..1ddc6503b087 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
@@ -1,4 +1,4 @@
<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="#49a0ff" stroke="#007aff"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#49a0ff" stroke="#007aff" stroke-linecap="round"/>
<rect x="17" y="12" width="10" height="2" fill="#fff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
index 72498116188d..ae9634759af3 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
@@ -1,4 +1,4 @@
<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="#dbecff" stroke="#007aff"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#dbecff" stroke="#007aff" stroke-linecap="round"/>
<rect x="17" y="12" width="10" height="2" fill="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
index b928309791c9..25296e8000ce 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
@@ -1,4 +1,4 @@
<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"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
<rect x="17" y="12" width="10" height="2" fill="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
index 9ca695d5ba77..5d7f8de2cff8 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
@@ -1,7 +1,5 @@
<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
- <g>
- <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="#fff" stroke="#8e8e93"/>
- <rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
- <rect x="21" y="8" width="2" height="10" fill="#8e8e93"/>
- </g>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#fff" stroke="#8e8e93" stroke-linecap="round"/>
+ <rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
+ <rect x="21" y="8" width="2" height="10" fill="#8e8e93"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
index 29bb2561e202..0c5ee41db734 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
@@ -1,5 +1,5 @@
<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="#49a0ff" stroke="#007aff"/>
- <rect x="17" y="12" width="10" height="2" fill="#fff"/>
- <rect x="21" y="8" width="2" height="10" fill="#fff"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#49a0ff" stroke="#007aff" stroke-linecap="round"/>
+ <rect x="17" y="12" width="10" height="2" fill="#fff"/>
+ <rect x="21" y="8" width="2" height="10" fill="#fff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
index ab01dc59dd20..7f07d86f3ff4 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
@@ -1,5 +1,5 @@
<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="#dbecff" stroke="#007aff"/>
- <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
- <rect x="21" y="8" width="2" height="10" fill="#007aff"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#dbecff" stroke="#007aff" stroke-linecap="round"/>
+ <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
+ <rect x="21" y="8" width="2" height="10" fill="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
index 9ff29f642f39..dc27b98296a4 100644
--- a/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
@@ -1,5 +1,5 @@
<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="#fff" stroke="#007aff"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
<rect x="17" y="12" width="10" height="2" fill="#007aff"/>
<rect x="21" y="8" width="2" height="10" fill="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
index 771a2df046e0..bb4d98cf1cd7 100644
--- a/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
@@ -1,3 +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"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#007aff" stroke="#007aff" stroke-linecap="round"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
index f21ed6818380..17997e4a5922 100644
--- a/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
@@ -1,3 +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"/>
+ <path d="m4.9103 0.5h38.59v25h-38.59c-2.4433 0-4.4103-1.784-4.4103-4v-17c0-2.216 1.967-4 4.4103-4z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
index 8b3c7b57cf26..6027d35a43c9 100644
--- a/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
@@ -1,3 +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"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#007aff" stroke="#007aff" stroke-linecap="round"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
index 494fd20907ad..398e1cb2b2fb 100644
--- a/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
+++ b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
@@ -1,3 +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"/>
+ <path d="m0.5 0.5h38.59c2.4433 0 4.4103 1.784 4.4103 4v17c0 2.216-1.967 4-4.4103 4h-38.59z" fill="#fff" stroke="#007aff" stroke-linecap="round"/>
</svg>
commit 364aec6958ef22e48aa2b0af076e6610f07a5b81
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Mar 15 22:40:10 2019 +0800
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sat Mar 16 08:33:40 2019 +0900
ios widget theme: draw focus rectangles for widgets
Change-Id: I92d42d100c515cbe744d13050a424b7f584a7adb
Reviewed-on: https://gerrit.libreoffice.org/69315
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
(cherry picked from commit 30ae10c92d52ad7c6cdc569c87228d7f9adaadf5)
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index c68e312e2bca..991adb9ab6be 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_F
ios/spinbox-right-disabled.svgx \
ios/common-rect.svgx \
ios/common-rect-disabled.svgx \
+ ios/common-rect-focus.svgx \
+ ios/common-rect-focus-slim.svgx \
ios/pushbutton-default.svgx \
ios/pushbutton-rollover.svgx \
ios/pushbutton-disabled.svgx \
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.svgx
new file mode 100644
index 000000000000..8bc97ef330ef
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-focus-slim.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="none" stroke="#79b9ff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
new file mode 100644
index 000000000000..4eff277fe8f7
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/ios/common-rect-focus.svgx
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 44 26" xmlns="http://www.w3.org/2000/svg">
+ <rect x="1.5" y="1.5" width="41" height="23" rx="2" ry="2" fill="none" stroke="#79b9ff" stroke-width="3"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 763967d9ede1..ffe6a29786ac 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -77,6 +77,11 @@
<external source="pushbutton-disabled.svgx" />
</state>
</part>
+ <part value="Focus">
+ <state>
+ <external source="common-rect-focus.svgx" />
+ </state>
+ </part>
</pushbutton>
<radiobutton>
@@ -100,6 +105,11 @@
<image source="tick-on-disabled.svgx" />
</state>
</part>
+ <part value="Focus">
+ <state>
+ <external source="common-rect-focus-slim.svgx" />
+ </state>
+ </part>
</radiobutton>
<checkbox>
@@ -123,6 +133,11 @@
<image source="switch-on-disabled.svgx" />
</state>
</part>
+ <part value="Focus">
+ <state>
+ <external source="common-rect-focus-slim.svgx" />
+ </state>
+ </part>
</checkbox>
<combobox>
@@ -147,6 +162,11 @@
<image source="combobox-disabled.svgx" />
</state>
</part>
+ <part value="Focus">
+ <state>
+ <external source="common-rect-focus.svgx" />
+ </state>
+ </part>
</combobox>
<editbox>
@@ -157,6 +177,9 @@
<state enabled="false">
<external source="common-rect-disabled.svgx" />
</state>
+ <state focused="true">
+ <external source="common-rect-focus.svgx" />
+ </state>
</part>
</editbox>
@@ -188,6 +211,7 @@
</part>
<part value="Focus">
<state>
+ <external source="common-rect-focus.svgx" />
</state>
</part>
</listbox>
@@ -227,6 +251,11 @@
<external source="spinbox-right-disabled.svgx" />
</state>
</part>
+ <part value="Focus">
+ <state>
+ <external source="common-rect-focus-slim.svgx" />
+ </state>
+ </part>
</spinbox>
<scrollbar>
commit b9bc87f45387ead81c4ada15d9512df999a7181e
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Mar 15 21:24:01 2019 +0800
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sat Mar 16 08:33:38 2019 +0900
ios widget theme: fix wrong svg filename for the button in editbox
Change-Id: I3c40e62bba3590f547e50bb3eca221112ce92405
Reviewed-on: https://gerrit.libreoffice.org/69314
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
(cherry picked from commit ac12cd5f6813bf740417a4d732f7b0a1761bd3e7)
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 5a4be114ea97..763967d9ede1 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -180,10 +180,10 @@
</part>
<part value="ButtonDown" width="35" height="36">
<state enabled="true">
- <image source="combo.svgx" />
+ <image source="combobox.svgx" />
</state>
<state enabled="false">
- <image source="combo-disabled.svgx" />
+ <image source="combobox-disabled.svgx" />
</state>
</part>
<part value="Focus">
commit fbbd2923b4801a9fec49681faa77b1245ddb3f70
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Mar 15 21:10:03 2019 +0800
Commit: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sat Mar 16 08:32:35 2019 +0900
move the content of theme_definitons to ios subdir
As we want more widget themes added in the future, add the content
of theme_definitions to its own "ios" folder (as it is a theme
mimicking ios look&feel).
Change-Id: Ie435263c3861aaa324e02cfe955b8288211b2888
Reviewed-on: https://gerrit.libreoffice.org/69313
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Tested-by: Tomaž Vajngerl <quikee at gmail.com>
(cherry picked from commit b3c6665de2206a922d1a058bb1f5e9f76f792335)
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index a30ca8179850..c68e312e2bca 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -9,46 +9,46 @@
$(eval $(call gb_Package_Package,vcl_theme_definitions,$(SRCDIR)/vcl/uiconfig/theme_definitions))
-$(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
- definition.xml \
- switch-off.svgx \
- switch-off-disabled.svgx \
- switch-off-pressed.svgx \
- switch-on.svgx \
- switch-on-pressed.svgx \
- switch-on-disabled.svgx \
- tick-off.svgx \
- tick-off-disabled.svgx \
- tick-off-pressed.svgx \
- tick-on.svgx \
- tick-on-pressed.svgx \
- tick-on-disabled.svgx \
- spinbox-left.svgx \
- spinbox-left-pressed.svgx \
- spinbox-left-rollover.svgx \
- spinbox-left-disabled.svgx \
- spinbox-right.svgx \
- spinbox-right-pressed.svgx \
- spinbox-right-rollover.svgx \
- spinbox-right-disabled.svgx \
- common-rect.svgx \
- common-rect-disabled.svgx \
- pushbutton-default.svgx \
- pushbutton-rollover.svgx \
- pushbutton-disabled.svgx \
- tabitem-first.svgx \
- tabitem-middle.svgx \
- tabitem-last.svgx \
- tabitem-first-selected.svgx \
- tabitem-middle-selected.svgx \
- tabitem-last-selected.svgx \
- scrollbar-horizontal.svgx \
- scrollbar-vertical.svgx \
- combobox.svgx \
- combobox-disabled.svgx \
- arrow-up.svgx \
- arrow-down.svgx \
- slider-button.svgx \
+$(eval $(call gb_Package_add_files_with_dir,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/theme_definitions,\
+ ios/definition.xml \
+ ios/switch-off.svgx \
+ ios/switch-off-disabled.svgx \
+ ios/switch-off-pressed.svgx \
+ ios/switch-on.svgx \
+ ios/switch-on-pressed.svgx \
+ ios/switch-on-disabled.svgx \
+ ios/tick-off.svgx \
+ ios/tick-off-disabled.svgx \
+ ios/tick-off-pressed.svgx \
+ ios/tick-on.svgx \
+ ios/tick-on-pressed.svgx \
+ ios/tick-on-disabled.svgx \
+ ios/spinbox-left.svgx \
+ ios/spinbox-left-pressed.svgx \
+ ios/spinbox-left-rollover.svgx \
+ ios/spinbox-left-disabled.svgx \
+ ios/spinbox-right.svgx \
+ ios/spinbox-right-pressed.svgx \
+ ios/spinbox-right-rollover.svgx \
+ ios/spinbox-right-disabled.svgx \
+ ios/common-rect.svgx \
+ ios/common-rect-disabled.svgx \
+ ios/pushbutton-default.svgx \
+ ios/pushbutton-rollover.svgx \
+ ios/pushbutton-disabled.svgx \
+ ios/tabitem-first.svgx \
+ ios/tabitem-middle.svgx \
+ ios/tabitem-last.svgx \
+ ios/tabitem-first-selected.svgx \
+ ios/tabitem-middle-selected.svgx \
+ ios/tabitem-last-selected.svgx \
+ ios/scrollbar-horizontal.svgx \
+ ios/scrollbar-vertical.svgx \
+ ios/combobox.svgx \
+ ios/combobox-disabled.svgx \
+ ios/arrow-up.svgx \
+ ios/arrow-down.svgx \
+ ios/slider-button.svgx \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index d4ee5a1d6dd7..638f7872c50a 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -67,9 +67,10 @@ FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
: m_rGraphics(rGraphics)
{
OUString sDefinitionBasePath = lcl_getThemeDefinitionPath();
+ OUString sThemeName = "ios";
+ OUString sThemeFolder = sDefinitionBasePath + sThemeName + "/";
- m_pWidgetDefinition
- = setWidgetDefinition(sDefinitionBasePath + "definition.xml", sDefinitionBasePath);
+ m_pWidgetDefinition = setWidgetDefinition(sThemeFolder + "definition.xml", sThemeFolder);
ImplSVData* pSVData = ImplGetSVData();
pSVData->maNWFData.mbNoFocusRects = true;
diff --git a/vcl/uiconfig/theme_definitions/arrow-down.svgx b/vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/arrow-down.svgx
rename to vcl/uiconfig/theme_definitions/ios/arrow-down.svgx
diff --git a/vcl/uiconfig/theme_definitions/arrow-up.svgx b/vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/arrow-up.svgx
rename to vcl/uiconfig/theme_definitions/ios/arrow-up.svgx
diff --git a/vcl/uiconfig/theme_definitions/combobox-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/combobox-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/combobox.svgx b/vcl/uiconfig/theme_definitions/ios/combobox.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/combobox.svgx
rename to vcl/uiconfig/theme_definitions/ios/combobox.svgx
diff --git a/vcl/uiconfig/theme_definitions/common-rect-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/common-rect-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/common-rect.svgx b/vcl/uiconfig/theme_definitions/ios/common-rect.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/common-rect.svgx
rename to vcl/uiconfig/theme_definitions/ios/common-rect.svgx
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml
similarity index 100%
rename from vcl/uiconfig/theme_definitions/definition.xml
rename to vcl/uiconfig/theme_definitions/ios/definition.xml
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-default.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-default.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-default.svgx
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/pushbutton-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx b/vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx
rename to vcl/uiconfig/theme_definitions/ios/scrollbar-horizontal.svgx
diff --git a/vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx b/vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx
rename to vcl/uiconfig/theme_definitions/ios/scrollbar-vertical.svgx
diff --git a/vcl/uiconfig/theme_definitions/slider-button.svgx b/vcl/uiconfig/theme_definitions/ios/slider-button.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/slider-button.svgx
rename to vcl/uiconfig/theme_definitions/ios/slider-button.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-left.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-left.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right-rollover.svgx
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right.svgx b/vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/spinbox-right.svgx
rename to vcl/uiconfig/theme_definitions/ios/spinbox-right.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-off.svgx b/vcl/uiconfig/theme_definitions/ios/switch-off.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-off.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-off.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/switch-on.svgx b/vcl/uiconfig/theme_definitions/ios/switch-on.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/switch-on.svgx
rename to vcl/uiconfig/theme_definitions/ios/switch-on.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-first-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-first.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-first.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-first.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-last-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-last.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-last.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-last.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-middle-selected.svgx
diff --git a/vcl/uiconfig/theme_definitions/tabitem-middle.svgx b/vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tabitem-middle.svgx
rename to vcl/uiconfig/theme_definitions/ios/tabitem-middle.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-off.svgx b/vcl/uiconfig/theme_definitions/ios/tick-off.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-off.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-off.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on-disabled.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on-disabled.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on-disabled.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on-pressed.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on-pressed.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on-pressed.svgx
diff --git a/vcl/uiconfig/theme_definitions/tick-on.svgx b/vcl/uiconfig/theme_definitions/ios/tick-on.svgx
similarity index 100%
rename from vcl/uiconfig/theme_definitions/tick-on.svgx
rename to vcl/uiconfig/theme_definitions/ios/tick-on.svgx
More information about the Libreoffice-commits
mailing list