[uim] r6383 committed - * helper/candwin-gtk.c (uim_cand_win_gtk_create_sub_window)...

[codesite-noreply]

Revision: 6383
Author: ek.kato
Date: Fri May  7 05:42:20 2010
Log: * helper/candwin-gtk.c (uim_cand_win_gtk_create_sub_window)
* gtk/uim-cand-win-gtk.c (uim_cand_win_gtk_create_sub_window)
  - Set max size of sub window.
http://code.google.com/p/uim/source/detail?r=6383

Modified:
 /trunk/gtk/uim-cand-win-gtk.c
 /trunk/helper/candwin-gtk.c

=======================================
--- /trunk/gtk/uim-cand-win-gtk.c       Fri May  7 05:13:55 2010
+++ /trunk/gtk/uim-cand-win-gtk.c       Fri May  7 05:42:20 2010
@@ -852,21 +852,28 @@
   cwin->cursor = *area;
 }

+#define UIM_ANNOTATION_WIN_WIDTH 200
+#define UIM_ANNOTATION_WIN_HEIGHT 230

 static void
 uim_cand_win_gtk_create_sub_window(UIMCandWinGtk *cwin)
 {
   GtkWidget *window, *scrwin, *text_view, *frame;
+  GdkGeometry hints;

   if (cwin->sub_window.window)
     return;

   cwin->sub_window.window = window = gtk_window_new(GTK_WINDOW_POPUP);
-  gtk_window_set_default_size(GTK_WINDOW(window), 200, 200);
+  gtk_window_set_default_size(GTK_WINDOW(window),  
UIM_ANNOTATION_WIN_WIDTH, UIM_ANNOTATION_WIN_HEIGHT);

   frame = gtk_frame_new(NULL);
   gtk_container_set_border_width(GTK_CONTAINER(frame), 0);

+  hints.max_width = UIM_ANNOTATION_WIN_WIDTH;
+  hints.max_height = UIM_ANNOTATION_WIN_HEIGHT;
+  gtk_window_set_geometry_hints(GTK_WINDOW(window), frame, &hints,  
GDK_HINT_MAX_SIZE);
+
   cwin->sub_window.scrolled_window = scrwin =  
gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrwin),
                                 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
=======================================
--- /trunk/helper/candwin-gtk.c Fri May  7 05:13:55 2010
+++ /trunk/helper/candwin-gtk.c Fri May  7 05:42:20 2010
@@ -992,6 +992,7 @@
 uim_cand_win_gtk_create_sub_window(UIMCandidateWindow *cwin)
 {
   GtkWidget *window, *scrwin, *text_view, *frame;
+  GdkGeometry hints;

   if (cwin->sub_window.window)
     return;
@@ -1002,6 +1003,10 @@
   frame = gtk_frame_new(NULL);
   gtk_container_set_border_width(GTK_CONTAINER(frame), 0);

+  hints.max_width = UIM_ANNOTATION_WIN_WIDTH;
+  hints.max_height = UIM_ANNOTATION_WIN_WIDTH;
+  gtk_window_set_geometry_hints(GTK_WINDOW(window), frame, &hints,  
GDK_HINT_MAX_SIZE);
+
   cwin->sub_window.scrolled_window = scrwin =  
gtk_scrolled_window_new(NULL, NULL);
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrwin),
                                  GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);