On Mon, 28 Nov 2011 20:56:09 -0800 "Enlightenment SVN" <[email protected]> wrote:
> Log: > elementary/button - Setting the text after button is disabled then the text > does not showed up with disabled status. > fixed it. > > > > Author: hermet > Date: 2011-11-28 20:56:08 -0800 (Mon, 28 Nov 2011) > New Revision: 65668 > Trac: http://trac.enlightenment.org/e/changeset/65668 > > Modified: > trunk/elementary/data/themes/widgets/button.edc > > Modified: trunk/elementary/data/themes/widgets/button.edc > =================================================================== > --- trunk/elementary/data/themes/widgets/button.edc 2011-11-29 > 03:47:51 UTC (rev 65667) +++ > trunk/elementary/data/themes/widgets/button.edc 2011-11-29 04:56:08 > UTC (rev 65668) @@ -89,8 +89,6 @@ } > description { state: "disabled" 0.0; > inherit: "default" 0.0; > - color: 0 0 0 128; > - color3: 0 0 0 0; > } > description { state: "disabled_visible" 0.0; > inherit: "default" 0.0; > @@ -230,8 +228,12 @@ > new Float:vl; > get_state(PART:"elm.swallow.content", st, 30, vl); > if (!strcmp(st, "icononly")) > - set_state(PART:"elm.swallow.content", "visible", 0.0); > - set_state(PART:"elm.text", "visible", 0.0); > + set_state(PART:"elm.swallow.content", "visible", 0.0); > + get_state(PART:"elm.text", st, 30, vl); > + if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible"))) > + set_state(PART:"elm.text", "disabled_visible", 0.0); > + else > + set_state(PART:"elm.text", "visible", 0.0); > } > } > program { name: "text_hide"; > @@ -244,6 +246,11 @@ > if (!strcmp(st, "visible")) > set_state(PART:"elm.swallow.content", "icononly", 0.0); > set_state(PART:"elm.text", "default", 0.0); > + get_state(PART:"elm.text", st, 30, vl); > + if (!strcmp(st, "default") || (!strcmp(st, "visible"))) > + set_state(PART:"elm.text", "default", 0.0); > + else > + set_state(PART:"elm.text", "disabled", 0.0); > } > } > program { name: "icon_show"; > @@ -268,43 +275,35 @@ > program { name: "disable"; > signal: "elm,state,disabled"; > source: "elm"; > - action: STATE_SET "disabled" 0.0; > - target: "button_image"; > - target: "over1"; > - target: "over2"; > - target: "disabler"; > - after: "disable_text"; > - } > - program { name: "disable_text"; > script { > new st[31]; > new Float:vl; > + set_state(PART:"button_image", "disabled", 0.0); > + set_state(PART:"over1", "disabled", 0.0); > + set_state(PART:"over2", "disabled", 0.0); > + set_state(PART:"disabler", "disabled", 0.0); > get_state(PART:"elm.text", st, 30, vl); > - if (!strcmp(st, "visible")) > - set_state(PART:"elm.text", "disabled_visible", 0.0); > + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) > + set_state(PART:"elm.text", "disabled_visible", 0.0); > else > - set_state(PART:"elm.text", "disabled", 0.0); > + set_state(PART:"elm.text", "disabled", 0.0); > } > } > program { name: "enable"; > signal: "elm,state,enabled"; > source: "elm"; > - action: STATE_SET "default" 0.0; > - target: "button_image"; > - target: "over1"; > - target: "over2"; > - target: "disabler"; > - after: "enable_text"; > - } > - program { name: "enable_text"; > script { > new st[31]; > new Float:vl; > + set_state(PART:"button_image", "visible", 0.0); > + set_state(PART:"over1", "visible", 0.0); > + set_state(PART:"over2", "visible", 0.0); > + set_state(PART:"disabler", "visible", 0.0); > get_state(PART:"elm.text", st, 30, vl); > - if (!strcmp(st, "disabled_visible")) > - set_state(PART:"elm.text", "visible", 0.0); > + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) > + set_state(PART:"elm.text", "visible", 0.0); > else > - set_state(PART:"elm.text", "default", 0.0); > + set_state(PART:"elm.text", "default", 0.0); > } > } > } > @@ -891,8 +890,6 @@ > } > description { state: "disabled" 0.0; > inherit: "default" 0.0; > - color: 0 0 0 128; > - color3: 0 0 0 0; > } > description { state: "disabled_visible" 0.0; > inherit: "default" 0.0; > @@ -1024,8 +1021,12 @@ > new Float:vl; > get_state(PART:"elm.swallow.content", st, 30, vl); > if (!strcmp(st, "icononly")) > - set_state(PART:"elm.swallow.content", "visible", 0.0); > - set_state(PART:"elm.text", "visible", 0.0); > + set_state(PART:"elm.swallow.content", "visible", 0.0); > + get_state(PART:"elm.text", st, 30, vl); > + if (!strcmp(st, "disabled") || (!strcmp(st, "disabled_visible"))) > + set_state(PART:"elm.text", "disabled_visible", 0.0); > + else > + set_state(PART:"elm.text", "visible", 0.0); > } > } > program { name: "text_hide"; > @@ -1038,6 +1039,11 @@ > if (!strcmp(st, "visible")) > set_state(PART:"elm.swallow.content", "icononly", 0.0); > set_state(PART:"elm.text", "default", 0.0); > + get_state(PART:"elm.text", st, 30, vl); this is wrong. > + if (!strcmp(st, "default") || (!strcmp(st, "visible"))) > + set_state(PART:"elm.text", "default", 0.0); > + else > + set_state(PART:"elm.text", "disabled", 0.0); > } > } > program { name: "icon_show"; > @@ -1062,43 +1068,35 @@ > program { name: "disable"; > signal: "elm,state,disabled"; > source: "elm"; > - action: STATE_SET "disabled" 0.0; > - target: "button_image"; > - target: "over1"; > - target: "over2"; > - target: "disabler"; > - after: "disable_text"; > - } > - program { name: "disable_text"; > script { > new st[31]; > new Float:vl; > + set_state(PART:"button_image", "disabled", 0.0); > + set_state(PART:"over1", "disabled", 0.0); > + set_state(PART:"over2", "disabled", 0.0); > + set_state(PART:"disabler", "disabled", 0.0); > get_state(PART:"elm.text", st, 30, vl); > - if (!strcmp(st, "visible")) > - set_state(PART:"elm.text", "disabled_visible", 0.0); > + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) > + set_state(PART:"elm.text", "disabled_visible", 0.0); > else > - set_state(PART:"elm.text", "disabled", 0.0); > + set_state(PART:"elm.text", "disabled", 0.0); > } > } > program { name: "enable"; > signal: "elm,state,enabled"; > source: "elm"; > - action: STATE_SET "default" 0.0; > - target: "button_image"; > - target: "over1"; > - target: "over2"; > - target: "disabler"; > - after: "enable_text"; > - } > - program { name: "enable_text"; > script { > new st[31]; > new Float:vl; > + set_state(PART:"button_image", "visible", 0.0); > + set_state(PART:"over1", "visible", 0.0); > + set_state(PART:"over2", "visible", 0.0); > + set_state(PART:"disabler", "visible", 0.0); > get_state(PART:"elm.text", st, 30, vl); > - if (!strcmp(st, "disabled_visible")) > - set_state(PART:"elm.text", "visible", 0.0); > + if (!strcmp(st, "visible") || !strcmp(st, "disabled_visible")) > + set_state(PART:"elm.text", "visible", 0.0); > else > - set_state(PART:"elm.text", "default", 0.0); > + set_state(PART:"elm.text", "default", 0.0); > } > } > } > > > ------------------------------------------------------------------------------ > All the data continuously generated in your IT infrastructure > contains a definitive record of customers, application performance, > security threats, fraudulent activity, and more. Splunk takes this > data and makes sense of it. IT sense. And common sense. > http://p.sf.net/sfu/splunk-novd2d > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
