summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-11-27 06:39:46 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-11-27 06:39:46 +0000
commit9d611987b4d01d0cd00928c10ef5d082ec4f8125 (patch)
tree4aa09de88b660ca6128d6bd22c49cc8b46e1f98c
parentb3c6aa70123b8de73eed693b7da6b1685ce78389 (diff)
ecore: fix ecore_evas_sdl window size.ecore-1.2
Patch by Alexey Yakovenko <wakeroid@gmail.com> fixing ticket #1790. SVN revision: 79734
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog3
-rw-r--r--src/lib/ecore_evas/ecore_evas_sdl.c8
3 files changed, 12 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 3db7a4b2..0c29dfe1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,3 +52,4 @@ Doyoun Kang <wayofmine@gmail.com> <doyoun.kang@samsung.com>
52Haifeng Deng <haifeng.deng@samsung.com> 52Haifeng Deng <haifeng.deng@samsung.com>
53Jérémy Zurcher <jeremy@asynk.ch> 53Jérémy Zurcher <jeremy@asynk.ch>
54Vikram Narayanan <vikram186@gmail.com> 54Vikram Narayanan <vikram186@gmail.com>
55Alexey Yakovenko <wakeroid@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index c0c5ce67..abe99524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -674,3 +674,6 @@
674 674
675 * Properly reschedule call to curl. 675 * Properly reschedule call to curl.
676 676
6772012-11-27 Alexey Yakovenko
678
679 * Fix ecore_evas_sdl window resize bug.
diff --git a/src/lib/ecore_evas/ecore_evas_sdl.c b/src/lib/ecore_evas/ecore_evas_sdl.c
index d2503fe0..3ef1fae9 100644
--- a/src/lib/ecore_evas/ecore_evas_sdl.c
+++ b/src/lib/ecore_evas/ecore_evas_sdl.c
@@ -135,6 +135,8 @@ _ecore_evas_sdl_event_video_resize(void *data __UNUSED__, int type __UNUSED__, v
135 135
136 ee->w = e->w; 136 ee->w = e->w;
137 ee->h = e->h; 137 ee->h = e->h;
138 ee->req.w = e->w;
139 ee->req.h = e->h;
138 140
139 evas_output_size_set(ee->evas, e->w, e->h); 141 evas_output_size_set(ee->evas, e->w, e->h);
140 evas_output_viewport_set(ee->evas, 0, 0, e->w, e->h); 142 evas_output_viewport_set(ee->evas, 0, 0, e->w, e->h);
@@ -274,6 +276,8 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
274 int rmethod; 276 int rmethod;
275 277
276 if ((w == ee->w) && (h == ee->h)) return; 278 if ((w == ee->w) && (h == ee->h)) return;
279 ee->req.w = w;
280 ee->req.h = h;
277 ee->w = w; 281 ee->w = w;
278 ee->h = h; 282 ee->h = h;
279 283
@@ -324,6 +328,8 @@ static void
324_ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int w, int h) 328_ecore_evas_move_resize(Ecore_Evas *ee, int x __UNUSED__, int y __UNUSED__, int w, int h)
325{ 329{
326 if ((w == ee->w) && (h == ee->h)) return; 330 if ((w == ee->w) && (h == ee->h)) return;
331 ee->req.w = w;
332 ee->req.h = h;
327 ee->w = w; 333 ee->w = w;
328 ee->h = h; 334 ee->h = h;
329 335
@@ -464,6 +470,8 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu
464 if (w < 1) w = 1; 470 if (w < 1) w = 1;
465 if (h < 1) h = 1; 471 if (h < 1) h = 1;
466 ee->visible = 1; 472 ee->visible = 1;
473 ee->req.w = w;
474 ee->req.h = h;
467 ee->w = w; 475 ee->w = w;
468 ee->h = h; 476 ee->h = h;
469 477