Commit: ab0a7f99209b50c00a1f69851283590a7912532c - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: ab0a7f99209b50c00a1f69851283590a7912532c (tree)
• Time: 2013-11-10 17:22:15
• Author: Muneyuki Noguchi <nogu.dev@gmai...>
• Commiter: Muneyuki Noguchi

Log Message

Use gtk_widget_queue_draw() to redraw buttons.

* gtk2/candwin/horizontal-gtk.c

- (button_clicked, uim_cand_win_gtk_set_index):

Use gtk_widget_queue_draw() for redraw buttons instead of
gtk_widget_unmap() and gtk_widget_map()
because gtk_widget_unmap() and gtk_widget_map() are
only for use in widget implementations
and we can avoid warnings in GTK+3.

* gtk2/immodule/uim-cand-win-horizontal-gtk.c

- (button_clicked, uim_cand_win_horizontal_gtk_set_index):

Ditto.

Change Summary

• modified: gtk2/candwin/horizontal-gtk.c
• modified: gtk2/immodule/uim-cand-win-horizontal-gtk.c

Incremental Difference

--- a/gtk2/candwin/horizontal-gtk.c
+++ b/gtk2/candwin/horizontal-gtk.c
@@ -349,8 +349,7 @@ button_clicked(GtkEventBox *button, GdkEventButton *event, gpointer data)
   prev_selected = cwin->selected;
   if (prev_selected) {
     GtkWidget *label = gtk_bin_get_child(GTK_BIN(prev_selected->button));
-    gtk_widget_unmap(label);
-    gtk_widget_map(label);
+    gtk_widget_queue_draw(label);
   }
 
   for (i = 0; i < (gint)cwin->buttons->len; i++) {
@@ -364,8 +363,7 @@ button_clicked(GtkEventBox *button, GdkEventButton *event, gpointer data)
     if (p == button) {
       GtkWidget *label = gtk_bin_get_child(GTK_BIN(button));
       idx = idxbutton->cand_index_in_page;
-      gtk_widget_unmap(label);
-      gtk_widget_map(label);
+      gtk_widget_queue_draw(label);
       cwin->selected = idxbutton;
       break;
     }
@@ -1040,12 +1038,10 @@ uim_cand_win_gtk_set_index(UIMCandidateWindow *cwin, gint index)
     prev_selected = (gpointer)cwin->selected;
     if (prev_selected && prev_index != cwin->candidate_index) {
       label = gtk_bin_get_child(GTK_BIN(prev_selected->button));
-      gtk_widget_unmap(label);
-      gtk_widget_map(label);
+      gtk_widget_queue_draw(label);
     }
     label = gtk_bin_get_child(GTK_BIN(idxbutton->button));
-    gtk_widget_unmap(label);
-    gtk_widget_map(label);
+    gtk_widget_queue_draw(label);
     cwin->selected = idxbutton;
 
     /* show subwin */

--- a/gtk2/immodule/uim-cand-win-horizontal-gtk.c
+++ b/gtk2/immodule/uim-cand-win-horizontal-gtk.c
@@ -298,8 +298,7 @@ button_clicked(GtkEventBox *button, GdkEventButton *event, gpointer data)
   prev_selected = horizontal_cwin->selected;
   if (prev_selected) {
     GtkWidget *label = gtk_bin_get_child(GTK_BIN(prev_selected->button));
-    gtk_widget_unmap(label);
-    gtk_widget_map(label);
+    gtk_widget_queue_draw(label);
   }
 
   for (i = 0; i < (gint)horizontal_cwin->buttons->len; i++) {
@@ -313,8 +312,7 @@ button_clicked(GtkEventBox *button, GdkEventButton *event, gpointer data)
     if (p == button) {
       GtkWidget *label = gtk_bin_get_child(GTK_BIN(button));
       idx = idxbutton->cand_index_in_page;
-      gtk_widget_unmap(label);
-      gtk_widget_map(label);
+      gtk_widget_queue_draw(label);
       horizontal_cwin->selected = idxbutton;
       break;
     }
@@ -454,12 +452,10 @@ uim_cand_win_horizontal_gtk_set_index(UIMCandWinHorizontalGtk *horizontal_cwin,
     prev_selected = (gpointer)horizontal_cwin->selected;
     if (prev_selected && prev_index != cwin->candidate_index) {
       label = gtk_bin_get_child(GTK_BIN(prev_selected->button));
-      gtk_widget_unmap(label);
-      gtk_widget_map(label);
+      gtk_widget_queue_draw(label);
     }
     label = gtk_bin_get_child(GTK_BIN(idxbutton->button));
-    gtk_widget_unmap(label);
-    gtk_widget_map(label);
+    gtk_widget_queue_draw(label);
     horizontal_cwin->selected = idxbutton;
 
     /* show subwin */