# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1156600390 0
# Node ID ed771d01239bc8327846e58e4e895fc40becdcc8
# Parent  0387a167f342ee184f7ec7c1eecd7c1b499a5da3
[gaim-migrate @ 17046]
Fine-tuning the mouse-event handling in the combobox.

committer: Tailor Script <tailor@pidgin.im>

diff -r 0387a167f342 -r ed771d01239b console/libgnt/gntcombobox.c
--- a/console/libgnt/gntcombobox.c	Sat Aug 26 12:54:39 2006 +0000
+++ b/console/libgnt/gntcombobox.c	Sat Aug 26 13:53:10 2006 +0000
@@ -2,6 +2,7 @@
 #include "gntcombobox.h"
 #include "gnttree.h"
 #include "gntmarshal.h"
+#include "gntutils.h"
 
 #include <string.h>
 
@@ -39,14 +40,11 @@
 	GntColorType type;
 	int len;
 	
-	if (box->dropdown)
-	{
+	if (box->dropdown && box->selected)
 		text = gnt_tree_get_selection_text(GNT_TREE(box->dropdown));
-		box->selected = gnt_tree_get_selection_data(GNT_TREE(box->dropdown));
-	}
 
 	if (text == NULL)
-		text = g_strdup(text);
+		text = g_strdup("");
 
 	if (gnt_widget_has_focus(widget))
 		type = GNT_COLOR_HIGHLIGHT;
@@ -57,7 +55,7 @@
 
 	if ((len = g_utf8_strlen(text, -1)) > widget->priv.width - 4)
 	{
-		char *s = g_utf8_offset_to_pointer(text, widget->priv.width - 4);
+		char *s = gnt_util_onscreen_width_to_pointer(text, widget->priv.width - 4, NULL);
 		*s = '\0';
 		len = widget->priv.width - 4;
 	}
@@ -106,6 +104,7 @@
 	if (parent->window)
 	{
 		mvwin(parent->window, y, widget->priv.x);
+		wresize(parent->window, height+2, widget->priv.width);
 	}
 
 	gnt_widget_draw(parent);
@@ -180,11 +179,9 @@
 	} else if (event == GNT_LEFT_MOUSE_DOWN) {
 		if (dshowing) {
 			set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
-			gnt_tree_set_selected(GNT_TREE(box->dropdown), box->selected);
 			gnt_widget_hide(box->dropdown->parent);
 		} else {
 			popup_dropdown(GNT_COMBO_BOX(widget));
-			return TRUE;
 		}
 	} else
 		return FALSE;