[E-devel] [E-Devel][PATCH] A few more fixes in e_fm
This patch fixes a few thing after the changes made to an icon selection
mechanism:
1) last selected icon and range selection pointers are reset after icons
are freed for a a specific path (refresh, going to another path etc)
2) When no icons selected - pressing Up/Left selects the last icon and
Down/Right the first.
3) Order of range selected icons (Shift+...) is kept from first to last
(for ex. when opening simultaneously a few files)
>From e431224ebb2159da537c09cd9f0d2369ca03d163 Mon Sep 17 00:00:00 2001
From: Yossi Kantor
Date: Sun, 6 Oct 2013 10:35:23 +0200
Subject: [PATCH] 1) efm fix: last_selection resets when icons are freed 2)
When no icon is selected select first on Right/Down press
or last on Left/Up keypress 3) Maintain order in range
selection from first to last.
---
src/bin/e_fm.c | 132 +++-
1 file changed, 74 insertions(+), 58 deletions(-)
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 5b97052..1cb03ac 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -89,6 +89,7 @@ struct _E_Fm2_Smart_Data
E_Fm2_Icon *last_selected;
E_Fm2_Icon *range_selected;
+ E_Fm2_Icon *range_select_anchor;
Eina_List *selected_icons;
Eina_List *icons_place;
Eina_List *queue;
@@ -4294,6 +4295,8 @@ _e_fm2_icons_free(Evas_Object *obj)
ic->inserted = EINA_FALSE;
_e_fm2_icon_free(ic);
}
+ sd->last_selected = NULL;
+ sd->range_selected = NULL;
eina_list_free(sd->icons_place);
sd->icons_place = NULL;
sd->tmp.last_insert = NULL;
@@ -5426,20 +5429,21 @@ _e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *
sd = evas_object_smart_data_get(obj);
if (!sd) return NULL;
if (!sd->icons) return NULL;
+
+ l = eina_list_data_find_list(sd->icons, (sd->range_selected) ?
+ sd->range_selected :
+ sd->last_selected);
+
+ if (!next) return eina_list_data_get(l);
+
+ if (!l) return (next == 1) ? eina_list_data_get(sd->icons) :
+eina_list_last_data_get(sd->icons);
view_mode = _e_fm2_view_mode_get(sd);
if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
(view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
(view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
custom = 1;
-
- l = eina_list_data_find_list(sd->icons, (sd->range_selected) ?
- sd->range_selected :
- sd->last_selected);
-
- if (!l) return eina_list_data_get(sd->icons);
-
- if (!next) return eina_list_data_get(l);
ic_next = NULL;
@@ -5470,16 +5474,8 @@ _e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *
}
else
{
-if (next == 1)
- {
- if (!eina_list_next(l)) return NULL;
- ic_next = eina_list_data_get(eina_list_next(l));
- }
-else if (next == -1)
- {
- if (!eina_list_prev(l)) return NULL;
- ic_next = eina_list_data_get(eina_list_prev(l));
- }
+ic_next = eina_list_data_get((next == 1) ? eina_list_next(l) :
+ eina_list_prev(l));
}
return ic_next;
@@ -5543,26 +5539,31 @@ _e_fm2_icon_sel_down(Evas_Object *obj, Eina_Bool add)
if (!sd->icons) return;
ic = (sd->range_selected) ? sd->range_selected : sd->last_selected;
- if (!ic) ic = eina_list_data_get(sd->icons);
-
- ic_down = ic;
-
- EINA_LIST_FOREACH(sd->icons, l, ic2)
+
+ if (ic)
{
-int dx = (ic2->x - ic->x);
-int dy = (ic2->y - ic->y);
-
-if ((dy > 0) && (abs(dy) > abs(dx)))
- {
- dist = abs(dx)+abs(dy);
- if (dist < min)
- {
- min = dist;
- ic_down = ic2;
- }
- }
+ ic_down = ic;
+ EINA_LIST_FOREACH(sd->icons, l, ic2)
+ {
+int dx = (ic2->x - ic->x);
+int dy = (ic2->y - ic->y);
+
+if ((dy > 0) && (abs(dy) > abs(dx)))
+ {
+ dist = abs(dx)+abs(dy);
+ if (dist < min)
+ {
+ min = dist;
+ ic_down = ic2;
+ }
+ }
+ }
+ }
+ else
+ {
+ic_down = eina_list_data_get(sd->icons);
}
-
+
if ((!add) || ic_down->sd->config->selection.single)
{
_e_fm2_icon_desel_any(obj);
@@ -5590,27 +5591,32 @@ _e_fm2_icon_sel_up(Evas_Object *obj, Eina_Bool add)
if (!sd->icons) return;
ic = (sd->range_selected) ? sd->range_selected : sd->last_selected;
- if (!ic) ic = eina_list_data_get(sd->icons);
-
- ic_down = ic;
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check."
Yes there was a misunderstanding. I agree. But I didn't disagree on Tom's request and revert. I agree on him(lack of commit message) and you. I just wondered one of the sentence in his revert comment. "I'm the only maintainer of. " "this commit looks wrong. evas_textblock_cursor_format_is_visible_get should verify there's a format node..." So I replied on the revert mail. "If so, why do you leave the evas_textblock_cursor_format_is_visible_get() to return NULL if you think it must verify the fnode?" Because the function is totally considered to return NULL. That's all. -Regards, Hermet- -Original Message- From: "Cedric BAIL" To: "Enlightenment developer list"; Cc: Sent: 2013-10-07 (μ) 08:45:45 Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check." Hello, I think there is a misunderstanding here. One is describing what the patch does, the other want to know how to reproduce the bug that require this patch to be applied. In fact this has been a mistake we have been quite often in the past. Having commit message that basically duplicate the content of the code instead of explaining why are doing the change in the first place. Maybe we should formalize what we expect in a commit message so that this kind of misunderstanding doesn't happen (and also in 3 years from now, we will be able to figure out why we did do that). Cedric On Sun, Oct 6, 2013 at 2:08 PM, ChunEon Park @naver.com> wrote: > I don't agree that commit message bad. > > but fundamental problem is your maintained function. > > If you wanna blame to me, then please fix the function first. (if you really > think you are the textblock maintainer) > > > -Regards, Hermet- > > -Original Message- > From: "Tom Hacohen"@samsung.com> > To: @lists.sourceforge.net>; > Cc: > Sent: 2013-10-04 (κΈ) 21:59:15 > Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock > - null check." > > On 04/10/13 13:09, ChunEon Park wrote: >> it shouldn't be in. maybe. >> >> but you made the function to return NULL. >> >> and then you want to know reason by other people? >> > > Maybe it should, maybe it shouldn't the point is, I don't know. You are > now trying to explain yourself in the ML, why not explain what you were > trying to fix in the commit message itself? > > I didn't do anything, you did this commit. I have no idea what you are > talking about, what NULL I was returning and what reasons you are > talking about. > > As Sachiel said: explain what you were trying to do in the commit > message so people can actually review and understand what you were > trying to do. > > As for this commit: please explain what you mean and why you added this > fix, but this is unrelated to the discussion at hand. The discussion is > about the bad commit message that made it impossible for me to review > your patch. > > -- > Tom. > > > -- > October Webinars: Code for Performance > Free Intel webinars can help you accelerate application performance. > Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from > the latest Intel processors and coprocessors. See abstracts and register > > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > -- > October Webinars: Code for Performance > Free Intel webinars can help you accelerate application performance. > Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from > the latest Intel processors and coprocessors. See abstracts and register > > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Cedric BAIL -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- October Webinars: Code for Performance Free Intel webinars can help you
[E-devel] Weekly news from the automated build and QA front
Hello. *** Newsflash *** Ne statistical data proves that New research paper unvails that looking at potential problems early in the development and release process cuts down time spent on debugging aftterwards. Suggestions have been made that developers should have a look at these potential problems and either fix them or mark as incorrect. *** This should give everyone an overview over what has happened in the last week regarding our continuous integration builds, unit tests and coverage as well as all static analyser runs and things like address-sanitizer. The numbers in parentheses reflect the values from last week to give you a trend. CI: o Added terminology builds for every SCM change as well as after every elm build. o Overall build statistic: 5.94% (4.51%) failed and 94.06% (95.49%) succeeded. https://build.enlightenment.org/ clang scan-build: o EFL scan-build reports 504 (507) issues. https://build.enlightenment.org/job/nightly_efl_clang_x86_64/lastSuccessfu lBuild/artifact/scan-build/build/ Exactness: o The edje exactness builds are working now. Elm exactness still failing. o Problems with icons and paths (file selector widget) o Still waiting for the first successful run on jenkins Unit tests: o 271 (271) unit tests for efl and none failing Coverage: o EFL total coverage is at 25.7% (25.7%) lines and 28.5% (28.5%) functions https://build.enlightenment.org/view/Test%20Coverage/ Coverity: o Added terminology on the request of Boris Faure o EFL: Outstanding defects 452 (455) with a density of 0.85 (0.86). 5 defects fixed since last build and 1 added. o Elm: Outstanding defects 30 (22) with a density of 0.14 (0.10). 1 defects fixed since last build and 9 added. o E: Outstanding defects 199 (202) with a density of 0.73 (0.72). 3 defects fixed since last build and 0 added. o Terminology: Outstanding defects 22 (22) with a density of 0.35 (0.35). 0 defects fixed since last build and 0 added. If anybody wants to see something added here let me know and be my guest. regards Stefan Schmidt -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Weekly news from the automated build and QA front
On 10/07/2013 09:25 AM, Stefan Schmidt wrote: > Hello. > > *** Newsflash *** > Ne statistical data proves that ... that you should read through a mail again before sending it. regards Stefan Schmidt -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Weekly news from the automated build and QA front
On 10/07/2013 09:34 AM, Stefan Schmidt wrote: > On 10/07/2013 09:25 AM, Stefan Schmidt wrote: >> Hello. >> >> *** Newsflash *** >> Ne statistical data proves that > > ... that you should read through a mail again before sending it. > > regards > Stefan Schmidt LMAO dh -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: don't create border menu when border menu already exists
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8a28ad9bb9d062381230401efbf96e0c2fde21ac
commit 8a28ad9bb9d062381230401efbf96e0c2fde21ac
Author: Mike Blumenkrantz
Date: Mon Oct 7 10:12:54 2013 +0100
don't create border menu when border menu already exists
fixes crash from activating multiple bindings simultaneously which result
in border menu being triggered
---
src/bin/e_border.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 8afc399..43cc261 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3890,6 +3890,7 @@ e_border_act_menu_begin(E_Border *bd,
{
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
+ if (bd->border_menu) return;
if (ev)
e_int_border_menu_show(bd, ev->canvas.x, ev->canvas.y, key,
ev->timestamp);
else
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check."
On 07/10/13 09:14, ChunEon Park wrote: > Yes there was a misunderstanding. I agree. > > But I didn't disagree on Tom's request and revert. > I agree on him(lack of commit message) and you. I'm glad you agree with that, as that was the only thing I was arguing about. > > I just wondered one of the sentence in his revert comment. > > "I'm the only maintainer of." > "this commit looks wrong. evas_textblock_cursor_format_is_visible_get should > verify there's a format node..." Clarification: to whoever is reading this email, this is a *HUGE* misquote. Full commit message: " I'm sorry, but those kind of commit messages are unacceptable for code I'm the only maintainer of. It's bad enough that to have them in the project in general, but this I won't accept. I wanted to review this commit, but the lack of explanation about what you are trying to fix and why you think this is the good fix prevents me from doing my job. However, without really looking too much into it, this commit looks wrong. evas_textblock_cursor_format_is_visible_get should verify there's a format node... Please come up with a better commit message and re-commit. " When reading this in context it's pretty obvious that: 1. I wrote the "I'm the only maintainer of" regarding the commit message, not the code. 2. I asked you to explain why you think it's right, and what it breaks. 3. I explicitly said I didn't look too much into it, but just from skimming (without checking), it doesn't look right. To avoid confusion: let's make this thread about the culture and the commit message and just submit a patch to the ML with a better explanation or commit a fix with better explanation (former is better). I never questioned the fix, I just said it's impossible for me to know if it's correct. -- Tom. > > So I replied on the revert mail. > > "If so, > why do you leave the evas_textblock_cursor_format_is_visible_get() to return > NULL if you think it must verify the fnode?" > > Because the function is totally considered to return NULL. > > That's all. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check."
OK, again to clarify this, I don't wanna arguing about commit message. Even I didn't oppose and mentioned about it in the replies. I agree on the more descrive commit msg also. My first asking was this, "is this right the evas_textblock_cursor_format_is_visible_get() cares the NULL returning?" because you mentioned evas_textblock_cursor_format_is_visible_get() should verify there's a format node... I just expecting you confirm it simply. And depend on the answer, my patch(second version) to be made again. -Regards, Hermet- -Original Message- From: "Tom Hacohen" To: ; Cc: Sent: 2013-10-07 (μ) 18:43:24 Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check." On 07/10/13 09:14, ChunEon Park wrote: > Yes there was a misunderstanding. I agree. > > But I didn't disagree on Tom's request and revert. > I agree on him(lack of commit message) and you. I'm glad you agree with that, as that was the only thing I was arguing about. > > I just wondered one of the sentence in his revert comment. > > "I'm the only maintainer of." > "this commit looks wrong. evas_textblock_cursor_format_is_visible_get should > verify there's a format node..." Clarification: to whoever is reading this email, this is a *HUGE* misquote. Full commit message: " I'm sorry, but those kind of commit messages are unacceptable for code I'm the only maintainer of. It's bad enough that to have them in the project in general, but this I won't accept. I wanted to review this commit, but the lack of explanation about what you are trying to fix and why you think this is the good fix prevents me from doing my job. However, without really looking too much into it, this commit looks wrong. evas_textblock_cursor_format_is_visible_get should verify there's a format node... Please come up with a better commit message and re-commit. " When reading this in context it's pretty obvious that: 1. I wrote the "I'm the only maintainer of" regarding the commit message, not the code. 2. I asked you to explain why you think it's right, and what it breaks. 3. I explicitly said I didn't look too much into it, but just from skimming (without checking), it doesn't look right. To avoid confusion: let's make this thread about the culture and the commit message and just submit a patch to the ML with a better explanation or commit a fix with better explanation (former is better). I never questioned the fix, I just said it's impossible for me to know if it's correct. -- Tom. > > So I replied on the revert mail. > > "If so, > why do you leave the evas_textblock_cursor_format_is_visible_get() to return > NULL if you think it must verify the fnode?" > > Because the function is totally considered to return NULL. > > That's all. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: Revert "evas/textblock - null check."
On 07/10/13 11:48, ChunEon Park wrote: > OK, again to clarify this, > > I don't wanna arguing about commit message. > Even I didn't oppose and mentioned about it in the replies. > > I agree on the more descrive commit msg also. > > My first asking was this, > "is this right the evas_textblock_cursor_format_is_visible_get() cares the > NULL returning?" > because you mentioned evas_textblock_cursor_format_is_visible_get() should > verify there's a format node... > > I just expecting you confirm it simply. > And depend on the answer, my patch(second version) to be made again. Yes, as discussed and clarified on IRC. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: elm_spinner.c: call _value_set after resetting spin timer.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=bc37f138f9595b2e4586105c616d53da637c96c0 commit bc37f138f9595b2e4586105c616d53da637c96c0 Author: Daniel Juyung Seo Date: Mon Oct 7 23:38:28 2013 +0900 elm_spinner.c: call _value_set after resetting spin timer. There is a chance that spin timer is deleted in _value_set() by any chance. So reset the spin timer and call _value_set after that. Special thanks to Shilpa. --- src/lib/elm_spinner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index 6abeb23..6f91eeb 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -297,9 +297,9 @@ _spin_value(void *data) real_speed = sd->spin_speed > 0 ? sd->round : -sd->round; } - if (_value_set(data, sd->val + real_speed)) _label_write(data); sd->interval = sd->interval / 1.05; ecore_timer_interval_set(sd->spin_timer, sd->interval); + if (_value_set(data, sd->val + real_speed)) _label_write(data); return ECORE_CALLBACK_RENEW; } --
[EGIT] [core/elementary] master 01/01: elm_cnp.c: removed unused pointer value and initialized some local variables.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8ade252f622e98c897287be219dae61ca863261f
commit 8ade252f622e98c897287be219dae61ca863261f
Author: Daniel Juyung Seo
Date: Tue Oct 8 00:03:05 2013 +0900
elm_cnp.c: removed unused pointer value and initialized some local
variables.
This fixes coverity CID 1102548, 1102553, and 1102554.
---
src/lib/elm_cnp.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index f6b3599..97696a4 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -2370,7 +2370,7 @@ _wl_elm_drag_start(Evas_Object *obj, Elm_Sel_Format
format EINA_UNUSED, const ch
{
Ecore_Evas *ee;
Evas_Object *icon = NULL;
- int x, y, x2 = 0, y2 = 0, x3, y3, w, h;
+ int x, y, x2 = 0, y2 = 0, x3, y3, w = 0, h = 0;
const char *types[1] = { 0, };
_wl_elm_dnd_init();
@@ -2465,12 +2465,11 @@ static Eina_Bool
_wl_dnd_enter(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
Ecore_Wl_Event_Dnd_Enter *ev;
- Dropable *drop;
int i = 0;
ev = event;
- if ((drop = _wl_dropable_find(ev->win)))
+ if (_wl_dropable_find(ev->win))
_wl_dropable_all_set(ev->win, 0, 0, EINA_FALSE);
if ((!ev->num_types) || (!ev->types)) return ECORE_CALLBACK_PASS_ON;
--
[EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=ea7087c3ad6d24341159602dc95829daa0fa5557 commit ea7087c3ad6d24341159602dc95829daa0fa5557 Author: Daniel Juyung Seo Date: Tue Oct 8 00:08:19 2013 +0900 elm_cnp.c: Did a subtle code cleanup. savedtypes.imgfile should not be null logically or this function should have been returned in advance. --- src/lib/elm_cnp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index 97696a4..5d02dcc 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -2775,7 +2775,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data) sdata.data = entrytag; drop->dropcb(drop->cbdata, drop->obj, &sdata); ecore_wl_dnd_drag_end(ecore_wl_input_get()); -if (savedtypes.imgfile) free(savedtypes.imgfile); +free(savedtypes.imgfile); savedtypes.imgfile = NULL; } else if (drop->types & ELM_SEL_FORMAT_IMAGE) @@ -2784,7 +2784,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char *data) sdata.data = (char *)savedtypes.imgfile; drop->dropcb(drop->cbdata, drop->obj, &sdata); ecore_wl_dnd_drag_end(ecore_wl_input_get()); -if (savedtypes.imgfile) free(savedtypes.imgfile); +free(savedtypes.imgfile); savedtypes.imgfile = NULL; } } --
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
the more important thing to note is that free(NULL) is a totally valid no-op, but for some reason people keep if() checking it... On Mon, 07 Oct 2013 08:08:08 -0700 Daniel Juyung Seo wrote: > seoz pushed a commit to branch master. > > http://git.enlightenment.org/core/elementary.git/commit/?id=ea7087c3ad6d24341159602dc95829daa0fa5557 > > commit ea7087c3ad6d24341159602dc95829daa0fa5557 > Author: Daniel Juyung Seo > Date: Tue Oct 8 00:08:19 2013 +0900 > > elm_cnp.c: Did a subtle code cleanup. > > savedtypes.imgfile should not be null logically or this function should > have been returned in advance. > --- > src/lib/elm_cnp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c > index 97696a4..5d02dcc 100644 > --- a/src/lib/elm_cnp.c > +++ b/src/lib/elm_cnp.c > @@ -2775,7 +2775,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char > *data) > sdata.data = entrytag; > drop->dropcb(drop->cbdata, drop->obj, &sdata); > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > -if (savedtypes.imgfile) free(savedtypes.imgfile); > +free(savedtypes.imgfile); > savedtypes.imgfile = NULL; > } > else if (drop->types & ELM_SEL_FORMAT_IMAGE) > @@ -2784,7 +2784,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, char > *data) > sdata.data = (char *)savedtypes.imgfile; > drop->dropcb(drop->cbdata, drop->obj, &sdata); > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > -if (savedtypes.imgfile) free(savedtypes.imgfile); > +free(savedtypes.imgfile); > savedtypes.imgfile = NULL; > } > } > -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
On 07/10/13 16:19, Michael Blumenkrantz wrote: > the more important thing to note is that free(NULL) is a totally valid no-op, > but for some reason people keep if() checking it... > Yeah, ever since c89 (apparently, I thought only c99). However it's a legacy reason, probably buggy implementations in the past or something. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
On Mon, 07 Oct 2013 16:32:54 +0100 Tom Hacohen wrote: > On 07/10/13 16:19, Michael Blumenkrantz wrote: > > the more important thing to note is that free(NULL) is a totally valid > > no-op, but for some reason people keep if() checking it... > > > > Yeah, ever since c89 (apparently, I thought only c99). However it's a > legacy reason, probably buggy implementations in the past or something. > > -- > Tom. > I don't think any wayland-related dnd code was written before c89 became standard and universally available... -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: music control: add Clementine
quaker pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e860facf4eb30a57883569cadf897f9ec5375d5
commit 8e860facf4eb30a57883569cadf897f9ec5375d5
Author: q66
Date: Mon Oct 7 18:16:42 2013 +0200
music control: add Clementine
---
src/modules/music-control/e_mod_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/modules/music-control/e_mod_main.c
b/src/modules/music-control/e_mod_main.c
index bd57d13..3dbd279 100644
--- a/src/modules/music-control/e_mod_main.c
+++ b/src/modules/music-control/e_mod_main.c
@@ -12,6 +12,7 @@ const Player music_player_players[] =
{
{"gmusicbrowser", "org.mpris.MediaPlayer2.gmusicbrowser"},
{"Banshee", "org.mpris.MediaPlayer2.banshee"},
+ {"Clementine", "org.mpris.MediaPlayer2.clementine"},
{"Audacious", "org.mpris.MediaPlayer2.audacious"},
{"VLC", "org.mpris.MediaPlayer2.vlc"},
{"BMP", "org.mpris.MediaPlayer2.bmp"},
--
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
You're right. There are 40 instances of "if (xx) free(xx);" in elementary. I can clean them up as well :) My latest hobby is to clean up codes. It's just annoying. Daniel Juyung Seo (SeoZ) On Tue, Oct 8, 2013 at 12:19 AM, Michael Blumenkrantz < michael.blumenkra...@gmail.com> wrote: > the more important thing to note is that free(NULL) is a totally valid > no-op, but for some reason people keep if() checking it... > > On Mon, 07 Oct 2013 08:08:08 -0700 > Daniel Juyung Seo wrote: > > > seoz pushed a commit to branch master. > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=ea7087c3ad6d24341159602dc95829daa0fa5557 > > > > commit ea7087c3ad6d24341159602dc95829daa0fa5557 > > Author: Daniel Juyung Seo > > Date: Tue Oct 8 00:08:19 2013 +0900 > > > > elm_cnp.c: Did a subtle code cleanup. > > > > savedtypes.imgfile should not be null logically or this function > should have been returned in advance. > > --- > > src/lib/elm_cnp.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c > > index 97696a4..5d02dcc 100644 > > --- a/src/lib/elm_cnp.c > > +++ b/src/lib/elm_cnp.c > > @@ -2775,7 +2775,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, > char *data) > > sdata.data = entrytag; > > drop->dropcb(drop->cbdata, drop->obj, &sdata); > > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > > -if (savedtypes.imgfile) free(savedtypes.imgfile); > > +free(savedtypes.imgfile); > > savedtypes.imgfile = NULL; > > } > > else if (drop->types & ELM_SEL_FORMAT_IMAGE) > > @@ -2784,7 +2784,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, > char *data) > > sdata.data = (char *)savedtypes.imgfile; > > drop->dropcb(drop->cbdata, drop->obj, &sdata); > > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > > -if (savedtypes.imgfile) free(savedtypes.imgfile); > > +free(savedtypes.imgfile); > > savedtypes.imgfile = NULL; > > } > > } > > > > > -- > October Webinars: Code for Performance > Free Intel webinars can help you accelerate application performance. > Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most > from > the latest Intel processors and coprocessors. See abstracts and register > > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
On 07/10/13 16:40, Michael Blumenkrantz wrote: > On Mon, 07 Oct 2013 16:32:54 +0100 > Tom Hacohen wrote: > >> On 07/10/13 16:19, Michael Blumenkrantz wrote: >>> the more important thing to note is that free(NULL) is a totally valid >>> no-op, but for some reason people keep if() checking it... >>> >> >> Yeah, ever since c89 (apparently, I thought only c99). However it's a >> legacy reason, probably buggy implementations in the past or something. >> >> -- >> Tom. >> > > I don't think any wayland-related dnd code was written before c89 became > standard and universally available... > I was blaming fearful people. I'm on your side, and I completely agree with you. Reread what I wrote, and it wasn't obvious from it, but that's what I intended. -- Tom. -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/elementary] master 01/01: elm_cnp.c: Did a subtle code cleanup.
On Tue, 8 Oct 2013 01:33:07 +0900 Daniel Juyung Seo wrote: > You're right. > There are 40 instances of "if (xx) free(xx);" in elementary. > I can clean them up as well :) > My latest hobby is to clean up codes. It's just annoying. > > Daniel Juyung Seo (SeoZ) > > > On Tue, Oct 8, 2013 at 12:19 AM, Michael Blumenkrantz < > michael.blumenkra...@gmail.com> wrote: > > > the more important thing to note is that free(NULL) is a totally valid > > no-op, but for some reason people keep if() checking it... > > > > On Mon, 07 Oct 2013 08:08:08 -0700 > > Daniel Juyung Seo wrote: > > > > > seoz pushed a commit to branch master. > > > > > > > > http://git.enlightenment.org/core/elementary.git/commit/?id=ea7087c3ad6d24341159602dc95829daa0fa5557 > > > > > > commit ea7087c3ad6d24341159602dc95829daa0fa5557 > > > Author: Daniel Juyung Seo > > > Date: Tue Oct 8 00:08:19 2013 +0900 > > > > > > elm_cnp.c: Did a subtle code cleanup. > > > > > > savedtypes.imgfile should not be null logically or this function > > should have been returned in advance. > > > --- > > > src/lib/elm_cnp.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c > > > index 97696a4..5d02dcc 100644 > > > --- a/src/lib/elm_cnp.c > > > +++ b/src/lib/elm_cnp.c > > > @@ -2775,7 +2775,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, > > char *data) > > > sdata.data = entrytag; > > > drop->dropcb(drop->cbdata, drop->obj, &sdata); > > > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > > > -if (savedtypes.imgfile) free(savedtypes.imgfile); > > > +free(savedtypes.imgfile); > > > savedtypes.imgfile = NULL; > > > } > > > else if (drop->types & ELM_SEL_FORMAT_IMAGE) > > > @@ -2784,7 +2784,7 @@ _wl_dropable_data_handle(Wl_Cnp_Selection *sel, > > char *data) > > > sdata.data = (char *)savedtypes.imgfile; > > > drop->dropcb(drop->cbdata, drop->obj, &sdata); > > > ecore_wl_dnd_drag_end(ecore_wl_input_get()); > > > -if (savedtypes.imgfile) free(savedtypes.imgfile); > > > +free(savedtypes.imgfile); > > > savedtypes.imgfile = NULL; > > > } > > > } > > > > > > > coccinelle would be the better choice here -- October Webinars: Code for Performance Free Intel webinars can help you accelerate application performance. Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from the latest Intel processors and coprocessors. See abstracts and register > http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 01/01: Python-EFL: unbreak the build with older Cython versions
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=feb9fb912c27204bb076adeb3c93ca81ae2d33df commit feb9fb912c27204bb076adeb3c93ca81ae2d33df Author: davemds Date: Mon Oct 7 21:18:44 2013 +0200 Python-EFL: unbreak the build with older Cython versions --- efl/elementary/general.pyx | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/efl/elementary/general.pyx b/efl/elementary/general.pyx index 7b1b7c0..cbaca6e 100644 --- a/efl/elementary/general.pyx +++ b/efl/elementary/general.pyx @@ -406,7 +406,7 @@ def language_set(lang not None): """ if isinstance(lang, unicode): lang = PyUnicode_AsUTF8String(lang) -elm_language_set(lang) +elm_language_set(lang) def cache_all_flush(): """cache_all_flush() @@ -436,7 +436,7 @@ def font_properties_get(font not None): if isinstance(font, unicode): font = PyUnicode_AsUTF8String(font) cdef FontProperties ret = FontProperties.__new__() -ret.efp = elm_font_properties_get(font) +ret.efp = elm_font_properties_get(font) return ret @@ -471,8 +471,8 @@ def font_fontconfig_name_get(font_name, style = None): if isinstance(font_name, unicode): font_name = PyUnicode_AsUTF8String(font_name) if isinstance(style, unicode): style = PyUnicode_AsUTF8String(style) fc_name = elm_font_fontconfig_name_get( -font_name, -style if style is not None else NULL +font_name, +style if style is not None else NULL ) ret = _touni(fc_name) --
[E-devel] E Menu fix for dark theme
Hi All,
The attached patch is for the Dark theme in
http://git.enlightenment.org/themes/dark.git/ it fixes E menu's. The
patch came from the version of Dark in enlightenment master, i haven't
looked through the changelogs yet to check for other differences this
one just stops everything from working so i fixed it.
I have tried arc a few times and it doesn't like me hence the patch to
the mailing list.
Cheers
Simon Lees
diff --git a/edje/edc/menu.edc b/edje/edc/menu.edc
index 34d887f..d02bf2b 100644
--- a/edje/edc/menu.edc
+++ b/edje/edc/menu.edc
@@ -193,6 +193,11 @@ group { name: "e/widgets/menu/default/item_bg";
visible: 1;
}
}
+ part { name: "events"; type: RECT;
+ description { state: "default";
+color: 0 0 0 0;
+ }
+ }
}
programs {
program {
@@ -216,7 +221,7 @@ group { name: "e/widgets/menu/default/item_bg";
group { name: "e/widgets/menu/default/icon";
parts {
- part { name: "clip"; type: RECT;
+ part { name: "clip"; type: RECT; mouse_events: 0;
description { state: "default" 0.0;
color: 255 255 255 255;
}
@@ -226,7 +231,6 @@ group { name: "e/widgets/menu/default/icon";
}
part { name: "e.swallow.content"; type: SWALLOW;
clip_to: "clip";
- scale: 1;
description { state: "default" 0.0;
min: 16 16;
rel1.offset: 2 2;
@@ -250,6 +254,11 @@ group { name: "e/widgets/menu/default/icon";
group { name: "e/widgets/menu/default/label";
parts {
+ part { name: "base"; type: RECT;
+ description { state: "default";
+color: 0 0 0 0;
+ }
+ }
part { name: "e.text.label"; type: TEXT; mouse_events: 0;
effect: SHADOW BOTTOM;
scale: 1;
@@ -519,4 +528,4 @@ group { name: "e/widgets/menu/default/radio";
target: "indicator";
}
}
-}
+}
\ No newline at end of file
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/01: music control: add Clementine
On Mon, Oct 7, 2013 at 1:17 PM, q66 wrote:
> quaker pushed a commit to branch master.
>
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e860facf4eb30a57883569cadf897f9ec5375d5
>
> commit 8e860facf4eb30a57883569cadf897f9ec5375d5
> Author: q66
> Date: Mon Oct 7 18:16:42 2013 +0200
>
> music control: add Clementine
> ---
> src/modules/music-control/e_mod_main.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/src/modules/music-control/e_mod_main.c
> b/src/modules/music-control/e_mod_main.c
> index bd57d13..3dbd279 100644
> --- a/src/modules/music-control/e_mod_main.c
> +++ b/src/modules/music-control/e_mod_main.c
> @@ -12,6 +12,7 @@ const Player music_player_players[] =
> {
> {"gmusicbrowser", "org.mpris.MediaPlayer2.gmusicbrowser"},
> {"Banshee", "org.mpris.MediaPlayer2.banshee"},
> + {"Clementine", "org.mpris.MediaPlayer2.clementine"},
> {"Audacious", "org.mpris.MediaPlayer2.audacious"},
> {"VLC", "org.mpris.MediaPlayer2.vlc"},
> {"BMP", "org.mpris.MediaPlayer2.bmp"},
Why are we doing this instead of calling ListNames and installing a
match rule with
member='NameOwnerChanged',arg0namespace='org.mpris.MediaPlayer2'?
If the player is activatable through d-bus
(o.f.d.ListActivatableNames) we could even start the player ourselves.
Lucas De Marchi
--
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 01/01: Elementary: Make inheriting from scrollable a responsibility for the user.
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=6299a6c8ae824d4d99e2dad3a937e82d50414763 commit 6299a6c8ae824d4d99e2dad3a937e82d50414763 Author: Kai Huuhko Date: Tue Oct 8 09:08:37 2013 +0300 Elementary: Make inheriting from scrollable a responsibility for the user. --- efl/elementary/diskselector.pyx | 56 +++-- efl/elementary/entry.pyx| 58 +++-- efl/elementary/gengrid.pyx | 230 +++- efl/elementary/genlist.pyx | 20 +++- efl/elementary/genlist_item.pxi | 10 +- efl/elementary/genlist_widget.pxi | 2 +- efl/elementary/list.pyx | 71 ++- efl/elementary/photocam.pyx | 22 efl/elementary/scroller.pxd | 47 +--- efl/elementary/scroller.pyx | 75 +--- examples/elementary/test_conform.py | 24 ++-- examples/elementary/test_entry.py | 41 +++ examples/elementary/test_gengrid.py | 7 +- 13 files changed, 176 insertions(+), 487 deletions(-) diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx index 9537d0f..ed06a46 100644 --- a/efl/elementary/diskselector.pyx +++ b/efl/elementary/diskselector.pyx @@ -55,6 +55,20 @@ Default text parts of the diskselector items that you can use for are: .. note:: The "scroll,anim,*" and "scroll,drag,*" signals are only emitted by user intervention. +Scollable Interface +=== + +This widget supports the scrollable interface. + +If you wish to control the scolling behaviour using these functions, +inherit both the widget class and the +:py:class:`Scrollable` class +using multiple inheritance, for example:: + +class ScrollableGenlist(Genlist, Scrollable): +def __init__(self, canvas, *args, **kwargs): +Genlist.__init__(self, canvas) + """ @@ -99,7 +113,6 @@ cdef extern from "Elementary.h": from object_item cimport ObjectItem, _object_item_callback, \ _object_item_to_python, _object_item_list_to_python -from scroller cimport * cdef class DiskselectorItem(ObjectItem): @@ -329,47 +342,6 @@ cdef class Diskselector(Object): def __get__(self): return elm_diskselector_display_item_num_get(self.obj) -property bounce: -"""Bouncing behaviour when the scrolled content reaches an edge. - -Tell the internal scroller object whether it should bounce or not -when it reaches the respective edges for each axis. - -.. seealso:: :py:attr:`elementary.scroller.Scroller.bounce` - -:type: (bool h_bounce, bool v_bounce) - -""" -def __set__(self, bounce): -h_bounce, v_bounce = bounce -elm_scroller_bounce_set(self.obj, h_bounce, v_bounce) -def __get__(self): -cdef Eina_Bool h_bounce, v_bounce -elm_scroller_bounce_get(self.obj, &h_bounce, &v_bounce) -return (h_bounce, v_bounce) - -property scroller_policy: -"""The scrollbar policy. - -This sets the scrollbar visibility policy for the given scroller. -ELM_SCROLLER_POLICY_AUTO means the scrollbar is made visible if it -is needed, and otherwise kept hidden. ELM_SCROLLER_POLICY_ON turns -it on all the time, and ELM_SCROLLER_POLICY_OFF always keeps it off. -This applies respectively for the horizontal and vertical scrollbars. - -Both are disabled by default, i.e., are set to ELM_SCROLLER_POLICY_OFF. - -:type: tuple of Elm_Scroller_Policy - -""" -def __get__(self): -cdef Elm_Scroller_Policy h_policy, v_policy -elm_scroller_policy_get(self.obj, &h_policy, &v_policy) -return (h_policy, v_policy) -def __set__(self, policy): -h_policy, v_policy = policy -elm_scroller_policy_set(self.obj, h_policy, v_policy) - def clear(self): """clear() diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx index f342d85..056a0a5 100644 --- a/efl/elementary/entry.pyx +++ b/efl/elementary/entry.pyx @@ -39,6 +39,20 @@ Other features include password mode, filtering of inserted text with :py:func:`markup_filter_append()` and related functions, inline "items" and formatted markup text. +Scollable Interface +=== + +This widget supports the scrollable interface. + +If you wish to control the scolling behaviour using these functions, +inherit both the widget class and the +:py:class:`Scrollable` class +using multiple inheritance, for example:: + +class ScrollableGenlist(Genlist, Scrollable): +def __init__(self, canvas, *args, **kwargs): +Genlist.__init__(self, canvas) + Formatted text == @@ -632,7 +646,6 @@ cdef extern from "Elementary.h": Eina_Bool elm_cnp_selection_get(Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, Elm_Drop_Cb datacb, void *udata) f
[EGIT] [core/elementary] master 01/01: ctxpopup: fix elm_object_content_unset didn't unpack content from box
seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=0de4b6d2c3d7261f67383cd92e0b7a3453c5fa6b commit 0de4b6d2c3d7261f67383cd92e0b7a3453c5fa6b Author: deasung.kim Date: Tue Oct 8 15:41:06 2013 +0900 ctxpopup: fix elm_object_content_unset didn't unpack content from box Reviewers: seoz Reviewed By: seoz Differential Revision: https://phab.enlightenment.org/D261 --- ChangeLog | 3 +++ NEWS | 1 + src/lib/elc_ctxpopup.c | 1 + 3 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index a9ab155..7891a1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1680,3 +1680,6 @@ handle styles at all (so styles were broken with the given namespace). +2013-10-08 Daesung Kim (ad960009) + +* ctxpopup : fix elm_object_content_unset didn't unpack content from box diff --git a/NEWS b/NEWS index e40f674..bff325a 100644 --- a/NEWS +++ b/NEWS @@ -296,6 +296,7 @@ Fixes: * Fix the layout to swallow the contents again when theme is changed. * elm_player breaks theme due to poor namespacing * elm_popup breaks theme due to poor namespacing + * ctxpopup: fix elm_object_content_unset didn't unpack content from box Removals: diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c index 32ad8a4..4431cfa 100644 --- a/src/lib/elc_ctxpopup.c +++ b/src/lib/elc_ctxpopup.c @@ -857,6 +857,7 @@ _elm_ctxpopup_smart_content_unset(Eo *obj, void *_pd, va_list *list) content = sd->content; if (!content) goto end; + elm_box_unpack(sd->box, content); sd->content = NULL; sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; --
