Kaydet (Commit) ccaaabd8 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

Draw tabs from external svg image, fixes for tabs (colors)

Change-Id: I35db7b8e36c474d2196bfae1ec4dd352e17d2a14
Reviewed-on: https://gerrit.libreoffice.org/68822
Tested-by: Jenkins
Reviewed-by: 's avatarTomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 46ada3f8)
üst 338f2ef5
...@@ -28,6 +28,12 @@ $(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th ...@@ -28,6 +28,12 @@ $(eval $(call gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th
spinbox-entire.svgx \ spinbox-entire.svgx \
pushbutton-default.svgx \ pushbutton-default.svgx \
pushbutton-rollover.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: # vim: set noet sw=4 ts=4:
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
<highlightTextColor value="#FFFFFF"/> <highlightTextColor value="#FFFFFF"/>
<activeTabColor value="#FFFFFF"/> <activeTabColor value="#FFFFFF"/>
<inactiveTabColor value="#C0C0C0"/> <inactiveTabColor value="#C0C0C0"/>
<tabTextColor value="#000000"/> <tabTextColor value="#007AFF"/>
<tabRolloverTextColor value="#000000"/> <tabRolloverTextColor value="#007AFF"/>
<tabHighlightTextColor value="#FFFFFF"/> <tabHighlightTextColor value="#FFFFFF"/>
<disableColor value="#808080"/> <disableColor value="#808080"/>
<helpColor value="#FFFFE0"/> <helpColor value="#FFFFE0"/>
...@@ -272,11 +272,23 @@ ...@@ -272,11 +272,23 @@
<tabitem> <tabitem>
<part value="Entire"> <part value="Entire">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="true" button-value="any"> <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any" extra="first">
<rect stroke="#007AFF" fill="#007AFF" stroke-width="1" rx="1" ry="1"/> <external source="tabitem-first.svgx" />
</state> </state>
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any"> <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="false" button-value="any" extra="middle">
<rect stroke="#007AFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1"/> <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> </state>
</part> </part>
</tabitem> </tabitem>
...@@ -284,7 +296,7 @@ ...@@ -284,7 +296,7 @@
<tabheader> <tabheader>
<part value="Entire"> <part value="Entire">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any"> <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> </state>
</part> </part>
</tabheader> </tabheader>
...@@ -292,7 +304,7 @@ ...@@ -292,7 +304,7 @@
<tabpane> <tabpane>
<part value="Entire"> <part value="Entire">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any"> <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> </state>
</part> </part>
</tabpane> </tabpane>
......
<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>
<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>
<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>
<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>
<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>
<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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment