summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-03-07 13:52:10 +0100
committerTomaž Vajngerl <quikee@gmail.com>2019-03-07 21:17:30 +0100
commit767dd751b8856419d33937e6444660c1d5218590 (patch)
treeac46f52f219abf70f29bd53a5637c26a0458138a
parent322dd37c5297b89cc9a1874dc650d79491a938b0 (diff)
widget theme - update spinbox with more states
Change-Id: I398293c30e015eeb53b8403f1e6fc628227de9ac Reviewed-on: https://gerrit.libreoffice.org/68863 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/Package_theme_definitions.mk6
-rw-r--r--vcl/uiconfig/theme_definitions/definition.xml27
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx4
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx4
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx4
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-left.svgx2
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx7
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx5
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx5
-rw-r--r--vcl/uiconfig/theme_definitions/spinbox-right.svgx2
10 files changed, 61 insertions, 5 deletions
diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 122120c1a3c4..4dc31caf9b5a 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -24,7 +24,13 @@ $(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th
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 \
spinbox-entire.svgx \
pushbutton-default.svgx \
pushbutton-rollover.svgx \
diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 0e902fb27318..90ffbc32ca06 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -188,18 +188,39 @@
<spinbox>
<part value="Entire">
<state>
- <external source="spinbox-entire.svgx" />
</state>
</part>
- <part value="ButtonDown" width="44" height="26">
+ <part value="SubEdit">
<state>
+ </state>
+ </part>
+ <part value="ButtonDown" width="44" height="26">
+ <state enabled="true">
<external source="spinbox-left.svgx" />
</state>
+ <state enabled="true" pressed="true">
+ <external source="spinbox-left-pressed.svgx" />
+ </state>
+ <state enabled="true" rollover="true">
+ <external source="spinbox-left-rollover.svgx" />
+ </state>
+ <state enabled="false">
+ <external source="spinbox-left-disabled.svgx" />
+ </state>
</part>
<part value="ButtonUp" width="44" height="26">
- <state>
+ <state enabled="true">
<external source="spinbox-right.svgx" />
</state>
+ <state enabled="true" pressed="true">
+ <external source="spinbox-right-pressed.svgx" />
+ </state>
+ <state enabled="true" rollover="true">
+ <external source="spinbox-right-rollover.svgx" />
+ </state>
+ <state enabled="false">
+ <external source="spinbox-right-disabled.svgx" />
+ </state>
</part>
</spinbox>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx b/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx
new file mode 100644
index 000000000000..52c4bcd09433
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx
@@ -0,0 +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"/>
+ <rect x="17" y="12" width="10" height="2" fill="#8e8e93"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx b/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx
new file mode 100644
index 000000000000..141f805774eb
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx
@@ -0,0 +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"/>
+ <rect x="17" y="12" width="10" height="2" fill="#fff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx b/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx
new file mode 100644
index 000000000000..72498116188d
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx
@@ -0,0 +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"/>
+ <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-left.svgx b/vcl/uiconfig/theme_definitions/spinbox-left.svgx
index aff42a99fbc0..b928309791c9 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-left.svgx
+++ b/vcl/uiconfig/theme_definitions/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"/>
- <rect x="17" y="12" width="10" height="2" color="#bebebe" fill="#007aff"/>
+ <rect x="17" y="12" width="10" height="2" fill="#007aff"/>
</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx b/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx
new file mode 100644
index 000000000000..9ca695d5ba77
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx
@@ -0,0 +1,7 @@
+<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>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx b/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx
new file mode 100644
index 000000000000..29bb2561e202
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx
@@ -0,0 +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"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx b/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx
new file mode 100644
index 000000000000..ab01dc59dd20
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx
@@ -0,0 +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"/>
+</svg>
diff --git a/vcl/uiconfig/theme_definitions/spinbox-right.svgx b/vcl/uiconfig/theme_definitions/spinbox-right.svgx
index dec02f432aaf..9ff29f642f39 100644
--- a/vcl/uiconfig/theme_definitions/spinbox-right.svgx
+++ b/vcl/uiconfig/theme_definitions/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="none" stroke="#007aff"/>
+ <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"/>
<rect x="17" y="12" width="10" height="2" fill="#007aff"/>
<rect x="21" y="8" width="2" height="10" fill="#007aff"/>
</svg>