fix candidate window blink issue when candidate window is expanded.

Change-Id: I9fdba59a8522a8b11bc3ec498e244f9fb4a2fb64

diff --git a/configure.ac b/configure.ac
index 677800eee1d309517e0996c60229630871791bc1..fe733e76feceb99e8462e62c3c4fc10a6fd1e5fb 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script
 #AC_INIT(scim, 1.4.7, suzhe@tsinghua.org.cn)
-AC_INIT(isf, 2.3.6115, isf@samsung.com)
+AC_INIT(isf, 2.3.6116, isf@samsung.com)
 AC_CONFIG_SRCDIR([ism/src/scim.h])
 m4_pattern_allow([^AS_])
 
@@ -11,7 +11,7 @@ m4_pattern_allow([^AS_])
 # ISF version
 ISF_MAJOR_VERSION=2
 ISF_MINOR_VERSION=3
-ISF_MICRO_VERSION=6115
+ISF_MICRO_VERSION=6116
 
 ISF_VERSION=$ISF_MAJOR_VERSION.$ISF_MINOR_VERSION.$ISF_MICRO_VERSION
 

diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index 8633ed415f4a2b9f0014a3554cff321f43e9ae36..6a276fd5defa82c4bd4a71ef31212b4ec3c844d6 100644 (file)
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -997,6 +997,17 @@ static void ui_candidate_hide (bool bForce, bool bSetVirtualKbd)
     }
 }
 
+static Eina_Bool _move_candidate_window_timer_cb (void *data)
+{
+    evas_object_hide (_more_btn);
+    evas_object_show (_close_btn);
+
+    ui_settle_candidate_window ();
+    flush_memory ();
+
+    return ECORE_CALLBACK_CANCEL;
+}
+
 /**
  * @brief Callback function for more button.
  *
@@ -1011,14 +1022,14 @@ static void ui_candidate_window_more_button_cb (void *data, Evas *e, Evas_Object
 
     _panel_agent->candidate_more_window_show ();
 
-    evas_object_hide (_more_btn);
     evas_object_show (_candidate_area_2);
     evas_object_show (_scroller_bg);
-    evas_object_show (_close_btn);
     ui_candidate_window_adjust ();
 
-    ui_settle_candidate_window ();
-    flush_memory ();
+    /* FIXME : use timer to move candidate window after rendering candidate window which is resized.
+               This code is added for avoiding a flickering problem changing the window size by the EVAS graphic rendering restriction(Retained mode)
+    */
+    ecore_timer_add (0.02, _move_candidate_window_timer_cb, NULL);
 }
 
 /**

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 5903dbfc687441accd102ddb2f9a7ec8f07767a6..f6fb9665d3e35a50af9010f06b1b9757e1dc9daf 100755 (executable)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -1,9 +1,9 @@
-%define _usrdir        /usr
+%define _usrdir /usr
 %define _ugdir  %{_usrdir}/ug
 
 Name:       isf
 Summary:    Input Service Framework
-Version:    2.3.6115
+Version:    2.3.6116
 Release:    1
 Group:      System Environment/Libraries
 License:    LGPL

diff --git a/releasenote.txt b/releasenote.txt
index eb3b61bfaf3364d477977f4e4aed31a6b72706d2..3132e5a38bc6c3b4bc33cb3b00827449a786d001 100644 (file)
--- a/releasenote.txt
+++ b/releasenote.txt
@@ -1,3 +1,8 @@
+ISF 2.3.6116 :
+ 1. [immodule] use ecore_imf API to show or hide for debugging easily.
+ 2. [panel] fix candidate window blink issue when candidate window is expanded.
+
+
 ISF 2.3.6115 :
  1. change boilerplate
  2. [immodule] use dlog for printing error