[uim] r7172 committed - * gtk2/immodule/uim-cand-win-horizontal-gtk.c...

[codesite-noreply]

Revision: 7172
Author:   ek.kato
Date:     Fri Jul  1 07:57:02 2011
Log:      * gtk2/immodule/uim-cand-win-horizontal-gtk.c
  - (button_clicked) : Adjust x when resetting the highlight.
  - (uim_cand_win_horizontal_gtk_set_index) : Ditto.
http://code.google.com/p/uim/source/detail?r=7172

Modified:
 /trunk/gtk2/immodule/uim-cand-win-horizontal-gtk.c

=======================================
--- /trunk/gtk2/immodule/uim-cand-win-horizontal-gtk.c	Fri Jul  1 07:27:47  
2011
+++ /trunk/gtk2/immodule/uim-cand-win-horizontal-gtk.c	Fri Jul  1 07:57:02  
2011
@@ -246,8 +246,10 @@
     /* FIXME */
     ;
 #else
+    gint x;
+    get_layout_x(GTK_LABEL(label), &x);
     gdk_draw_layout_with_colors(label->window,
-                     label->style->black_gc, 0, 0,
+                     label->style->black_gc, x, 0,
                      GTK_LABEL(label)->layout,
                      &label->style->text[GTK_STATE_NORMAL],
                      &label->style->bg[GTK_STATE_NORMAL]);
@@ -376,12 +378,13 @@
 void
 uim_cand_win_horizontal_gtk_set_index(UIMCandWinHorizontalGtk  
*horizontal_cwin, gint index)
 {
-  gint new_page;
+  gint new_page, prev_index;
   UIMCandWinGtk *cwin;

   g_return_if_fail(UIM_IS_CAND_WIN_HORIZONTAL_GTK(horizontal_cwin));
   cwin = UIM_CAND_WIN_GTK(horizontal_cwin);

+  prev_index = cwin->candidate_index;
   if (index >= (gint) cwin->nr_candidates)
     cwin->candidate_index = 0;
   else
@@ -407,15 +410,16 @@

     idxbutton = g_ptr_array_index(horizontal_cwin->buttons, pos);
     prev_selected = (gpointer)horizontal_cwin->selected;
-    if (prev_selected) {
+    if (prev_selected && prev_index != cwin->candidate_index) {
       label = gtk_bin_get_child(GTK_BIN(prev_selected->button));

 #if GTK_CHECK_VERSION(2, 90, 0)
       /* FIXME */
 #else
       if (GTK_LABEL(label)->layout) {
+        get_layout_x(GTK_LABEL(label), &x);
         gdk_draw_layout_with_colors(label->window,
-                     label->style->black_gc, 0, 0,
+                     label->style->black_gc, x, 0,
                      GTK_LABEL(label)->layout,
                      &label->style->text[GTK_STATE_NORMAL],
                      &label->style->bg[GTK_STATE_NORMAL]);