Re: [E-devel] EO compositing "leaking" interfaces
That's part of the problem I described in https://phab.enlightenment.org/T8184 and specifically mentioned this. Eo is doing nothing wrong, it's working as designed, it's the new restrictions that were added only to Eolian that are wrong and made things inconsistent. Eo doesn't even have a concept of interfaces internally so doing what you are suggesting will involve some code (specifically saving the interfaces on the classes and using them). Eo also has the debug binary, so it can easily be added for eo_debug, just someone needs to do it. I still maintain however, that the correct thing to do is to unbreak eolian and revert compositing to how it was.. -- Tom On 24/10/2019 01:48, Lauro Moura wrote: > Talking today about some examples using the new API we came up with the > following situation: > > ``` > Eo *_screen = efl_add(EFL_UI_TEXT_CLASS, ...); > ... > Efl_Text_Cursor_Cursor *cursor = efl_text_cursor_get(_screen, > EFL_TEXT_CURSOR_GET_TYPE_MAIN); > ``` > > The call seems to succeed in C but it is a compilation error in C#, as > `Efl.Text_Cursor` is not in the inheritance/interface tree of `Efl.Ui.Text`. > > What seems to be happening is: > > * `Efl.Ui.Text` composites with `Efl.Text_Interactive` and `Efl.Text_Markup` > * `Efl.Ui.Text` internally uses `Efl.Ui.Internal.Text.Interactive` as a > composite > * `Efl.Ui.Internal.Text.Interactive` implements `Efl.Text_Interactive`. > * This satisfies `composite_attach` requirement and will forward the > `efl_text_interactive` calls to the composite object. > * `Efl.Ui.Internal.Text.Interactive` *also extends* `Efl.Text_Cursor` > through `Efl.Canvas.Text` > > Given this, C code seems them to be able to call `Efl.Text_Cursor` methods > on the `Efl.Ui.Text` instance through its composite, even though > `Efl.Ui.Text` has no idea `Efl.Text_Cursor` exists. > > This may work in C (but should it?) as we just pass `Eo*` around and do the > actual checks at runtime, but for strongly typed languages like C# this > means the generator has no way to know text cursor methods would be > available through composition and trying a similar code would lead to > compilation errors. > > Shouldn't Eo somehow (debug build if too expensive?) intercept these calls > and emit a warning to avoid such usage? > > (For this particular case, a fix could be making `Efl.Ui.Text` declare > `Efl.Text_Cursor` as a composite, right?) > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: mild: also add tab selector on tab line
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=bd9bdaeaeaad6ba7d5d95c7f063620dc03aa1fee commit bd9bdaeaeaad6ba7d5d95c7f063620dc03aa1fee Author: Boris Faure Date: Sat Oct 26 21:35:59 2019 +0200 mild: also add tab selector on tab line --- data/themes/mild.edc | 258 ++- 1 file changed, 254 insertions(+), 4 deletions(-) diff --git a/data/themes/mild.edc b/data/themes/mild.edc index 7559035..bd5f63c 100644 --- a/data/themes/mild.edc +++ b/data/themes/mild.edc @@ -647,6 +647,254 @@ collections { target: "tabtitle"; } + program { +signal: "tab_btn,on"; source: "terminology"; +action: STATE_SET "on" 0.0; +target: "tab_btn_clip"; +target: "tab_btn_bg"; +target: "terminology.tab_btn"; + } + program { +signal: "tab_btn,off"; source: "terminology"; +action: STATE_SET "default" 0.0; +target: "tab_btn_clip"; +target: "tab_btn_bg"; +target: "terminology.tab_btn"; + } + part { name: "tab_btn_clip"; type: RECT; +description { state: "default" 0.0; + color: 255 255 255 0; + visible: 0; +} +description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; +} + } + part { name: "tab_btn_bg"; +mouse_events: 0; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "terminology.tab_btn"; + rel2.to: "terminology.tab_btn"; + image.normal: "tab_bg_r0.png"; + image.border: 0 2 4 4; + fill.smooth: 0; + visible: 0; + fixed: 1 1; +} +description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; +} + } + part { name: "tab_btn_glow_r0"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r0"; + rel2.to: "tab_btn_r0"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_glow_r1"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r1"; + rel2.to: "tab_btn_r1"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_glow_r2"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r2"; + rel2.to: "tab_btn_r2"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_glow_r3"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r3"; + rel2.to: "tab_btn_r3"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_r0"; type: RECT; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "terminology.tab_btn"; + rel2.to: "terminology.tab_btn"; + rel1.relative: 0.05 0.05; + rel2.relative: 0.45 0.45; +
Re: [E-devel] git.enlightenment.org
Trying to access git.enlightenment.org it says that the host key has changed. Is it right? Can I just remove the old key and hope it will find the right one? Massimo Maiurana Mike Blumenkrantz ha scritto il 23/10/19 alle 15:02: > Hi, > > Is there any ETA for when phabricator will be accessible again? I've been > trying to recall some details for a ticket I was investigating, and it > would be nice to know whether it's worth retaining my existing context or > switching to something new if this is looking to be a longer-term issue. > > > No rush, > Mike > > On Sun, Oct 20, 2019 at 2:53 PM Carsten Haitzler > wrote: > >> On Sun, 20 Oct 2019 20:09:59 +0200 Boris Faure said: >> >>> >>> Did anyone changed something on the server? >>> It seems that I can't push anymore as it's asking for a password on >>> g...@git.enlightenment.org and not using my key. >> >> the server went down again... or more specifically got into "major massive >> lag >> mode" where things lang/hang for minutes. >> >> i shut down all the services after managing to get an ssh session to work >> and >> have tarred up everything and am copying over to e5 now. i have switched >> dns to >> point to e5 in the meantime. i don't know when it'll be back. i'm treating >> this >> as an emergency to try get things back up but on e5 ASAP. >> >> -- >> - Codito, ergo sum - "I code, therefore I am" -- >> Carsten Haitzler - ras...@rasterman.com >> >> >> >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: default.edc: it's way better with some background!
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2ff19839816b3187ef539d748958861974e7467d commit 2ff19839816b3187ef539d748958861974e7467d Author: Boris Faure Date: Sat Oct 26 19:02:13 2019 +0200 default.edc: it's way better with some background! --- data/themes/default.edc | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index a7c4226..af1f8e9 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1340,12 +1340,14 @@ collections { signal: "tab_btn,on"; source: "terminology"; action: STATE_SET "on" 0.0; target: "tab_btn_clip"; +target: "tab_btn_bg"; target: "terminology.tab_btn"; } program { signal: "tab_btn,off"; source: "terminology"; action: STATE_SET "default" 0.0; target: "tab_btn_clip"; +target: "tab_btn_bg"; target: "terminology.tab_btn"; } part { name: "tab_btn_clip"; type: RECT; @@ -1359,6 +1361,24 @@ collections { color: 255 255 255 255; } } + part { name: "tab_btn_bg"; +mouse_events: 0; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "terminology.tab_btn"; + rel2.to: "terminology.tab_btn"; + image.normal: "tab_bg_r0.png"; + image.border: 0 2 4 4; + fill.smooth: 0; + visible: 0; + fixed: 1 1; +} +description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; +} + } part { name: "tab_btn_glow_r0"; clip_to: "tab_btn_clip"; description { state: "default" 0.0; @@ -1694,7 +1714,6 @@ collections { visible: 1; } } - /*TODO boris */ part { name: "tabright"; type: RECT; mouse_events: 0; description { state: "default" 0.0; --
[EGIT] [apps/terminology] master 01/02: main: change prototype for main_new()
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=c130c6f683ae1a552f6411813937e9dbcb824124 commit c130c6f683ae1a552f6411813937e9dbcb824124 Author: Boris Faure Date: Sat Oct 26 18:13:25 2019 +0200 main: change prototype for main_new() --- src/bin/controls.c | 2 +- src/bin/main.h | 2 +- src/bin/win.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/controls.c b/src/bin/controls.c index 279fea3..255eb6b 100644 --- a/src/bin/controls.c +++ b/src/bin/controls.c @@ -101,7 +101,7 @@ _cb_ct_new(void *data, void *_event EINA_UNUSED) { Controls_Ctx *ctx = data; - main_new(ctx->win, ctx->term); + main_new(ctx->term); } static void diff --git a/src/bin/main.h b/src/bin/main.h index 1a961d4..e870b32 100644 --- a/src/bin/main.h +++ b/src/bin/main.h @@ -4,7 +4,7 @@ #include "config.h" Config * main_config_get(void); -void main_new(Evas_Object *win, Evas_Object *term); +void main_new(Evas_Object *term); void main_new_with_dir(Evas_Object *win, Evas_Object *term, const char *wdir); void main_split_h(Evas_Object *win, Evas_Object *term, const char *cmd); void main_split_v(Evas_Object *win, Evas_Object *term, const char *cmd); diff --git a/src/bin/win.c b/src/bin/win.c index 05fdd34..387331b 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -3668,8 +3668,7 @@ _cb_close(void *data, } void -main_new(Evas_Object *_win EINA_UNUSED, - Evas_Object *term) +main_new(Evas_Object *term) { Term *tm; --
[EGIT] [apps/terminology] master 02/02: default.edc: move tab selector on the tab line
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=1195c022f35306808f81ce5abc3bde949a82d5ec commit 1195c022f35306808f81ce5abc3bde949a82d5ec Author: Boris Faure Date: Sat Oct 26 18:18:03 2019 +0200 default.edc: move tab selector on the tab line --- ChangeLog.theme | 5 + data/themes/default.edc | 250 ++-- data/themes/mild.edc| 14 ++- src/bin/win.c | 119 --- 4 files changed, 323 insertions(+), 65 deletions(-) diff --git a/ChangeLog.theme b/ChangeLog.theme index a6acf98..2b2ba8d 100644 --- a/ChangeLog.theme +++ b/ChangeLog.theme @@ -9,6 +9,11 @@ Changes since 1.5.0: * In group "terminology/background", add signals "tab,bell,on" and "tab,bell,off" from "terminology" to set bell status on tab if there is a tab. + * In group "terminology/background", change signals "tabcount,go", + "tabcount,prev", "tabcount,next" to "tab,go", "tab,prev" and "tab,next" + respectively. + * In group "terminology/background", add signal "tab,new" from "terminology" + to create a new tab. Changes since 1.2.0: diff --git a/data/themes/default.edc b/data/themes/default.edc index c98e91d..a7c4226 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -629,15 +629,19 @@ collections { } program { signal: "mouse,clicked,1"; source: "tabcount_ev"; -action: SIGNAL_EMIT "tabcount,go" "terminology"; +action: SIGNAL_EMIT "tab,go" "terminology"; + } + program { +signal: "mouse,clicked,3"; source: "tabcount_ev"; +action: SIGNAL_EMIT "tab,new" "terminology"; } program { signal: "mouse,wheel,0,1"; source: "tabcount_ev"; -action: SIGNAL_EMIT "tabcount,prev" "terminology"; +action: SIGNAL_EMIT "tab,prev" "terminology"; } program { signal: "mouse,wheel,0,-1"; source: "tabcount_ev"; -action: SIGNAL_EMIT "tabcount,next" "terminology"; +action: SIGNAL_EMIT "tab,next" "terminology"; } program { signal: "tabcount,off"; source: "terminology"; @@ -1332,6 +1336,233 @@ collections { target: "tabtitle"; target: "tabclose"; } + program { +signal: "tab_btn,on"; source: "terminology"; +action: STATE_SET "on" 0.0; +target: "tab_btn_clip"; +target: "terminology.tab_btn"; + } + program { +signal: "tab_btn,off"; source: "terminology"; +action: STATE_SET "default" 0.0; +target: "tab_btn_clip"; +target: "terminology.tab_btn"; + } + part { name: "tab_btn_clip"; type: RECT; +description { state: "default" 0.0; + color: 255 255 255 0; + visible: 0; +} +description { state: "on" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; +} + } + part { name: "tab_btn_glow_r0"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r0"; + rel2.to: "tab_btn_r0"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_glow_r1"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r1"; + rel2.to: "tab_btn_r1"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; +} + } + part { name: "tab_btn_glow_r2"; +clip_to: "tab_btn_clip"; +description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tab_btn_r2"; + rel2.to: "tab_btn_r2"; + rel1.offset: -4 -4; + rel2.offset: 3 3; + image { + normal: "cr_glow.png"; + border: 9 9 9 9; + } + color: 51 153 255 32; +} +description { state: "over" 0.0; + inherit: "defau
[EGIT] [core/efl] feature/themes/flat 01/01: TH - comment unused signals
raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=99ae858eaaf8f300451a54ed9294138ebd071fa1 commit 99ae858eaaf8f300451a54ed9294138ebd071fa1 Author: Carsten Haitzler (Rasterman) Date: Sat Oct 26 14:22:08 2019 +0100 TH - comment unused signals --- data/elementary/themes/edc/elm/scroller.edc | 16 1 file changed, 16 insertions(+) diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index e7228699de..8d14c72249 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -376,6 +376,14 @@ group { name: "elm/scroller/base/default"; action: DRAG_VAL_PAGE 0.0 1.0; target: "elm.dragable.vbar"; } +// program { signal: "elm,action,show,up"; source: "elm"; +// } +// program { signal: "elm,action,show,down"; source: "elm"; +// } +// program { signal: "elm,action,hide,up"; source: "elm"; +// } +// program { signal: "elm,action,hide,down"; source: "elm"; +// } // program { signal: "elm,action,scroll"; source: "elm"; // } // program { signal: "elm,loop_y,set"; source: "elm"; @@ -570,6 +578,14 @@ group { name: "elm/scroller/base/default"; action: DRAG_VAL_PAGE 1.0 0.0; target: "elm.dragable.hbar"; } +// program { signal: "elm,action,show,left"; source: "elm"; +// } +// program { signal: "elm,action,show,right"; source: "elm"; +// } +// program { signal: "elm,action,hide,left"; source: "elm"; +// } +// program { signal: "elm,action,hide,right"; source: "elm"; +// } // program { signal: "elm,action,scroll"; source: "elm"; // } // program { signal: "elm,loop_x,set"; source: "elm"; --
[EGIT] [core/efl] feature/themes/flat 01/01: TH - format
raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=e23f916bae68e38500c611cddd0c3463f2019376 commit e23f916bae68e38500c611cddd0c3463f2019376 Author: Carsten Haitzler (Rasterman) Date: Sat Oct 26 14:19:51 2019 +0100 TH - format --- data/elementary/themes/edc/elm/scroller.edc | 54 ++--- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index 95278b5142..e7228699de 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -657,61 +657,50 @@ group { name: "elm/scroller/base/default"; } } programs { - program { - signal: "elm,state,disabled"; source: "elm"; + program { signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "color_hbar"; target: "color_vbar"; } - program { - signal: "elm,state,enabled"; source: "elm"; + program { signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; target: "color_hbar"; target: "color_vbar"; } - program { - signal: "mouse,down,1*"; source: "elm.dragable.vbar"; + program { signal: "mouse,down,1*"; source: "elm.dragable.vbar"; action: STATE_SET "clicked" 0.0; target: "elm.dragable.vbar"; target: "color_vbar"; } - program { - signal: "mouse,down,*"; source: "elm.dragable.vbar"; + program { signal: "mouse,down,*"; source: "elm.dragable.vbar"; action: SIGNAL_EMIT "elm,vbar,press" "elm"; } - program { - signal: "mouse,up,1"; source: "elm.dragable.vbar"; + program { signal: "mouse,up,1"; source: "elm.dragable.vbar"; action: STATE_SET "default" 0.0; target: "elm.dragable.vbar"; target: "color_vbar"; } - program { - signal: "mouse,up,*"; source: "elm.dragable.vbar"; + program { signal: "mouse,up,*"; source: "elm.dragable.vbar"; action: SIGNAL_EMIT "elm,vbar,unpress" "elm"; } - program { - signal: "mouse,down,1*"; source: "elm.dragable.hbar"; + program { signal: "mouse,down,1*"; source: "elm.dragable.hbar"; action: STATE_SET "clicked" 0.0; target: "elm.dragable.hbar"; target: "color_hbar"; } - program { - signal: "mouse,down,*"; source: "elm.dragable.hbar"; + program { signal: "mouse,down,*"; source: "elm.dragable.hbar"; action: SIGNAL_EMIT "elm,hbar,press" "elm"; } - program { - signal: "mouse,up,1"; source: "elm.dragable.hbar"; + program { signal: "mouse,up,1"; source: "elm.dragable.hbar"; action: STATE_SET "default" 0.0; target: "elm.dragable.hbar"; target: "color_hbar"; } - program { - signal: "mouse,up,*"; source: "elm.dragable.hbar"; + program { signal: "mouse,up,*"; source: "elm.dragable.hbar"; action: SIGNAL_EMIT "elm,hbar,unpress" "elm"; } - program { - signal: "elm,action,looping,left"; source: "elm"; + program { signal: "elm,action,looping,left"; source: "elm"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; @@ -720,14 +709,12 @@ group { name: "elm/scroller/base/default"; program { name: "looping,left,done"; action: SIGNAL_EMIT "elm,looping,left,done" "elm"; } - program { - signal: "elm,action,looping,left,end"; source: "elm"; + program { signal: "elm,action,looping,left,end"; source: "elm"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; } - program { - signal: "elm,action,looping,right"; source: "elm"; + program { signal: "elm,action,looping,right"; source: "elm"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; @@ -736,14 +723,12 @@ group { name: "elm/scroller/base/default"; program { name: "looping,right,done"; action: SIGNAL_EMIT "elm,looping,right,done" "elm"; } - program { - signal: "elm,action,looping,right,end"; source: "elm"; + program { signal: "elm,action,looping,right,end"; source: "elm"; action: STATE_SET "default" 0.0; transition: LINEAR 0.3; target: "dim_effect"; } - program { - signal: "elm,action,looping,up"; source: "elm"; + program { signal: "elm,action,looping,up"; source: "elm"; action: STATE_SET "effect" 0.0; transition: LINEAR 0.3; target: "dim_effect"; @@ -752,14 +737,12 @@ group { name: "elm/scroller/base/default"; program { name: "looping,up,done"; action: SIGNAL_EMIT "elm,l
[EGIT] [core/efl] feature/themes/flat 01/01: TH - scroller - remove unused script
raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=4b1f3c4e4424fa73c2e66bee12eab6cf35c3a000 commit 4b1f3c4e4424fa73c2e66bee12eab6cf35c3a000 Author: Carsten Haitzler (Rasterman) Date: Sat Oct 26 14:18:28 2019 +0100 TH - scroller - remove unused script --- data/elementary/themes/edc/elm/scroller.edc | 154 1 file changed, 20 insertions(+), 134 deletions(-) diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc index 83a8506b80..95278b5142 100644 --- a/data/elementary/themes/edc/elm/scroller.edc +++ b/data/elementary/themes/edc/elm/scroller.edc @@ -12,74 +12,10 @@ group { name: "elm/scroller/base/default"; data.item: "focus_highlight" "on"; - script { - public loop_x, loop_y; - - public action_on_pos_vbar(val) { - new x, y , w, h, x1, y1 , w1, h1; - - get_geometry(PART:"y_vbar_up", x, y, w, h); - get_geometry(PART:"y_vbar_up_mapper", x1, y1, w1, h1); - - if (((y1 <= y) && (y <= (y1 + h1))) && (0 == get_int(loop_y))) { -//set_state(PART:"arrow1_vbar", "hidden", 0.0); -//set_state(PART:"sb_vbar_a1", "hidden", 0.0); - } else { -//set_state(PART:"arrow1_vbar", "default", 0.0); -//set_state(PART:"sb_vbar_a1", "default", 0.0); - } - - get_geometry(PART:"y_vbar_down", x,y,w, h); - get_geometry(PART:"y_vbar_down_mapper", x1,y1,w1, h1); - - if (((y1 <= (y + h)) && ((y+ h) <= (y1 + h1))) && (0 == get_int(loop_y))) { -//set_state(PART:"arrow2_vbar", "hidden", 0.0); -//set_state(PART:"sb_vbar_a2", "hidden", 0.0); - } else { -//set_state(PART:"arrow2_vbar", "default", 0.0); -//set_state(PART:"sb_vbar_a2", "default", 0.0); - } - - if (val < 10) -timer(0.1,"action_on_pos_vbar", val+1); - } - - public action_on_pos_hbar(val) { - new x, y , w, h, x1, y1 , w1, h1; - - get_geometry(PART:"x_hbar_left", x,y,w, h); - get_geometry(PART:"x_hbar_left_mapper", x1,y1,w1, h1); - - if (((x1 <= x) && (x <= (x1 + w1))) && (0 == get_int(loop_x))) { -//set_state(PART:"arrow1_hbar", "hidden", 0.0); -//set_state(PART:"sb_hbar_a1", "hidden", 0.0); - } else { -//set_state(PART:"arrow1_hbar", "default", 0.0); -//set_state(PART:"sb_hbar_a1", "default", 0.0); - } - - get_geometry(PART:"x_hbar_right", x,y,w, h); - get_geometry(PART:"x_hbar_right_mapper", x1,y1,w1, h1); - - if (((x1 <= (x + w)) && ((x + w) <= (x1 + w1))) && (0 == get_int(loop_x))) { -//set_state(PART:"arrow2_hbar", "hidden", 0.0); -//set_state(PART:"sb_hbar_a2", "hidden", 0.0); - } else { -//set_state(PART:"arrow2_hbar", "default", 0.0); -//set_state(PART:"sb_hbar_a2", "default", 0.0); - } - - if (val < 10) -timer(0.1,"action_on_pos_hbar", val+1); - } - } - parts { program { signal: "load"; source: ""; script { emit("reload", "elm"); -action_on_pos_vbar(0); -action_on_pos_hbar(0); } } @@ -412,8 +348,7 @@ group { name: "elm/scroller/base/default"; max: 0 0; } } - program { - signal: "elm,action,show,vbar"; source: "elm"; + program { signal: "elm,action,show,vbar"; source: "elm"; action: STATE_SET "default" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -422,10 +357,8 @@ group { name: "elm/scroller/base/default"; target: "y_vbar_up"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; - after: "check_pos_vbar"; } - program { - signal: "elm,action,hide,vbar"; source: "elm"; + program { signal: "elm,action,hide,vbar"; source: "elm"; action: STATE_SET "hidden" 0.0; target: "sb_vbar"; target: "sb_vbar_show"; @@ -435,41 +368,20 @@ group { name: "elm/scroller/base/default"; target: "y_vbar_down_mapper"; target: "y_vbar_down"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p1"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p1"; action: DRAG_VAL_PAGE 0.0 -1.0; target: "elm.dragable.vbar"; } - program { - signal: "mouse,down,1*"; source: "sb_vbar_p2"; + program { signal: "mouse,down,1*"; source: "sb_vbar_p2"; action: DRAG_VAL_PAGE 0.0 1.0; target: "elm.dragable.vbar"; } - program { - signal: "elm,action,scroll"; source: "elm"; - script { -action_on_pos_vbar(10); - } - } - program { name: "check_pos_vbar"; - script { -action_on_pos_vbar(10); - } - }
[EGIT] [website/www-content] master 01/01: Wiki page e16 changed with summary [Bump Enlightenment version (E23)] by Carla Sensa
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e649c2d6b438157399c05cf65fa0356fc79ec47c commit e649c2d6b438157399c05cf65fa0356fc79ec47c Author: Carla Sensa Date: Sat Oct 26 04:10:37 2019 -0700 Wiki page e16 changed with summary [Bump Enlightenment version (E23)] by Carla Sensa --- pages/e16.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/e16.txt b/pages/e16.txt index 0ae4608af..98fed2cfc 100644 --- a/pages/e16.txt +++ b/pages/e16.txt @@ -3,7 +3,7 @@ {{page>incl:start-shortcuts}} About E16 -E16 is predecessor of the current E22 Enlightenment Window Manager, which is rather complete rewrite than incremental update of E16. Although most of the current development focus goes to E22, E16 is still under independent active development and some users prefer it to E22. In this sense E16 will keep its name while incrementing the versions from 1.0.0 unlike the mainstream Enlightenment manager, which is likely going to increment its E-suffix number. This page should summarize the link [...] +E16 is predecessor of the current E23 Enlightenment Window Manager, which is rather complete rewrite than incremental update of E16. Although most of the current development focus goes to E23, E16 is still under independent active development and some users prefer it to E23. In this sense E16 will keep its name while incrementing the versions from 1.0.0 unlike the mainstream Enlightenment manager, which is likely going to increment its E-suffix number. This page should summarize the link [...] Download --