summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordivyesh purohit <div.purohit@samsung.com>2016-01-26 13:00:22 -0800
committerCedric BAIL <cedric@osg.samsung.com>2016-01-26 13:04:55 -0800
commit186aeb42eb7e97c07a58a30aafbca5d05c4e2302 (patch)
tree54a1dbc729a93cb7a489d891b259ca87366bc9a9
parent8bd8aa8f6764fe4552fd38db0e599d94f108dcad (diff)
combobox: fix disabled state
Summary: Apply gray-scale to vertical_separated_bar_glow image and increase the opacity of the button, so that the text on the entry is visible. @fix T3075 Signed-off-by: divyesh purohit <div.purohit@samsung.com> Test Plan: please run combobox example from elementary_test Reviewers: shilpasingh, cedric, raster Maniphest Tasks: T3075 Differential Revision: https://phab.enlightenment.org/D3605 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--data/themes/edc/elm/button.edc9
-rw-r--r--data/themes/img/vertical_separated_bar_disabled.pngbin0 -> 492 bytes
2 files changed, 8 insertions, 1 deletions
diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index 9dd9f6186..0dfb4d2cf 100644
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -1720,6 +1720,7 @@ group { name: "elm/button/base/combobox_vertical/default";
1720 images.image: "button_normal.png" COMP; 1720 images.image: "button_normal.png" COMP;
1721 images.image: "button_clicked.png" COMP; 1721 images.image: "button_clicked.png" COMP;
1722 images.image: "vertical_separated_bar_glow.png" COMP; 1722 images.image: "vertical_separated_bar_glow.png" COMP;
1723 images.image: "vertical_separated_bar_disabled.png" COMP;
1723 parts { 1724 parts {
1724 image { "base"; nomouse; 1725 image { "base"; nomouse;
1725 desc { "default"; 1726 desc { "default";
@@ -1741,7 +1742,7 @@ group { name: "elm/button/base/combobox_vertical/default";
1741 } 1742 }
1742 desc { "disabled"; 1743 desc { "disabled";
1743 inherit: "default"; 1744 inherit: "default";
1744 color: 255 255 255 64; 1745 color: 255 255 255 180;
1745 } 1746 }
1746 } 1747 }
1747 rect { "event"; 1748 rect { "event";
@@ -1785,6 +1786,10 @@ group { name: "elm/button/base/combobox_vertical/default";
1785 rel1.offset: 0 -2; 1786 rel1.offset: 0 -2;
1786 rel2.offset: 0 -1; 1787 rel2.offset: 0 -1;
1787 } 1788 }
1789 desc { "disabled";
1790 inherit: "default";
1791 image.normal: "vertical_separated_bar_disabled.png";
1792 }
1788 } 1793 }
1789 } 1794 }
1790 programs { 1795 programs {
@@ -1830,12 +1835,14 @@ group { name: "elm/button/base/combobox_vertical/default";
1830 action: STATE_SET "disabled" 0.0; 1835 action: STATE_SET "disabled" 0.0;
1831 target: "icon_clip"; 1836 target: "icon_clip";
1832 target: "event"; 1837 target: "event";
1838 target: "select_line";
1833 } 1839 }
1834 program { name: "button_state_enabled"; 1840 program { name: "button_state_enabled";
1835 signal: "elm,state,enabled"; source: "elm"; 1841 signal: "elm,state,enabled"; source: "elm";
1836 action: STATE_SET "default" 0.0; 1842 action: STATE_SET "default" 0.0;
1837 target: "icon_clip"; 1843 target: "icon_clip";
1838 target: "event"; 1844 target: "event";
1845 target: "select_line";
1839 } 1846 }
1840 } 1847 }
1841} 1848}
diff --git a/data/themes/img/vertical_separated_bar_disabled.png b/data/themes/img/vertical_separated_bar_disabled.png
new file mode 100644
index 000000000..3db2fdd48
--- /dev/null
+++ b/data/themes/img/vertical_separated_bar_disabled.png
Binary files differ