[EGIT] [apps/terminology] master 01/01: fix scroll after resize
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=b4c91eee470e7b25a1e262be78c87400f7597c2a
commit b4c91eee470e7b25a1e262be78c87400f7597c2a
Author: Boris Faure bill...@gmail.com
Date: Sat Aug 8 16:40:05 2015 +0200
fix scroll after resize
---
src/bin/termpty.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 1845172..1ed4cff 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -781,6 +781,10 @@ termpty_backscroll_adjust(Termpty *ty, int *scroll)
Termsave *ts;
ts = BACKLOG_ROW_GET(ty, backlog_y);
+if (*scroll = screen_y)
+ {
+ return;
+ }
if (!ts-cells || backlog_y = (int)ty-backsize)
{
*scroll = ty-backlog_beacon.screen_y;
@@ -1036,8 +1040,8 @@ termpty_resize(Termpty *ty, int new_w, int new_h)
termpty_backlog_unlock();
- ty-backlog_beacon.backlog_y = 0;
- ty-backlog_beacon.screen_y = 0;
+ ty-backlog_beacon.backlog_y = 1;
+ ty-backlog_beacon.screen_y = 1;
return;
--
[EGIT] [core/elementary] master 01/01: Add a no-wrap mode to the Entry Style Default test
davemds pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2772f6cf53f476b1423a7e709898796e3700dad7
commit 2772f6cf53f476b1423a7e709898796e3700dad7
Author: Dave Andreoli d...@gurumeditation.it
Date: Sat Aug 8 17:08:45 2015 +0200
Add a no-wrap mode to the Entry Style Default test
I'm trying to reproduce an issue, not spotted by this,
but can still be usefull.
---
src/bin/test_entry.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index 6abf1ec..faa2f5d 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -990,6 +990,17 @@ ent_bt_def_style_markup(void *data, Evas_Object *obj, void
*event_info EINA_UNUS
elm_object_text_set(en, default_style_text);
}
+static void
+ent_bt_def_style_wrap(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *en = data;
+
+ if (elm_check_state_get(obj))
+ elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
+ else
+ elm_entry_line_wrap_set(en, ELM_WRAP_WORD);
+}
+
void
test_entry_style_default(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
@@ -1009,6 +1020,7 @@ test_entry_style_default(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, v
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(en, default_style_text);
elm_entry_editable_set(en, EINA_TRUE);
+ elm_entry_line_wrap_set(en, ELM_WRAP_WORD);
elm_box_pack_end(bx, en);
evas_object_show(en);
@@ -1040,6 +1052,12 @@ test_entry_style_default(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, v
elm_box_pack_end(vbx, o);
evas_object_show(o);
+ o = elm_check_add(win);
+ elm_object_text_set(o, no wrap);
+ evas_object_smart_callback_add(o, changed, ent_bt_def_style_wrap, en);
+ elm_box_pack_end(vbx, o);
+ evas_object_show(o);
+
evas_object_show(win);
}
--
[EGIT] [core/enlightenment] master 01/01: e - randr - handle lid close screen turnoff correctly again
raster pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=019b6641a3b2da5a69d9b68c750599527db8c072
commit 019b6641a3b2da5a69d9b68c750599527db8c072
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Sun Aug 9 00:22:16 2015 +0900
e - randr - handle lid close screen turnoff correctly again
this USED to work until i made things like auto-clone work without
config and so on and that broke turning off closed lid screens. it
also works when i suspend while lid is closed and resume (i can only
test with lid open as i need to open lid to unsuspend).
---
src/bin/e_randr2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c
index 078748f..c1f6e5f 100644
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@@ -429,7 +429,7 @@ _config_apply(E_Randr2 *r, E_Config_Randr2 *cfg)
printf(RRR: ... priority = %i\n, cs-priority);
_config_really_apply(s, cs);
}
-else if (!cs)
+else if ((!cs) (!_screen_closed(s)))
{
printf(RRR: ... no config found...\n);
cs2 = NULL;
@@ -872,7 +872,7 @@ _screen_config_do(E_Randr2_Screen *s)
Eina_List *cloneset;
printf(RRR: screen do '%s'\n, s-info.name);
- if (_config_do_recurse 20)
+ if (_config_do_recurse 5)
{
ERR(screen config loop!);
return;
--
[EGIT] [apps/terminology] master 01/01: Correct rewrite of splittable container
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=93c7deeb3e67c95e307c72770209bd54708e4ff5
commit 93c7deeb3e67c95e307c72770209bd54708e4ff5
Author: godfath3r galatsan...@gmail.com
Date: Sat Aug 8 12:05:04 2015 +0200
Correct rewrite of splittable container
Reviewers: billiob
Differential Revision: https://phab.enlightenment.org/D2933
---
src/bin/win.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/bin/win.c b/src/bin/win.c
index 3a91d90..8bd625e 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -915,11 +915,9 @@ _term_container_is_splittable(Term_Container *tc,
Eina_Bool is_horizontal)
{
int w = 0, h = 0, c_w = 0, c_h = 0;
Term *tm;
- Evas_Object *o;
- o = tc-get_evas_object(tc);
- evas_object_geometry_get(o, NULL, NULL, w, h);
tm = tc-term_first(tc);
+ evas_object_geometry_get(tm-bg, NULL, NULL, w, h);
evas_object_textgrid_cell_size_get(termio_textgrid_get(tm-termio),
c_w, c_h);
if (is_horizontal)
--
