Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_combobox_entry.c
Log Message:
[Etk_Combobox] Patch from Sander van Grieken <[EMAIL PROTECTED]> to fix focus /
popup on combo box.
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_combobox_entry.c 8 Oct 2007 13:32:42 -0000 1.12
+++ etk_combobox_entry.c 10 Apr 2008 16:50:13 -0000 1.13
@@ -134,7 +134,8 @@
Etk_Widget *etk_combobox_entry_new(void)
{
return etk_widget_new(ETK_COMBOBOX_ENTRY_TYPE, "theme-group",
"combobox_entry",
- "focusable", ETK_TRUE, "focus-on-click", ETK_TRUE, NULL);
+ "focusable", ETK_TRUE, "focus-on-click", ETK_FALSE, NULL);
+ // focus-on-click set to false, to allow subwidgets to be focused
}
/**
@@ -954,7 +955,7 @@
"visible", ETK_TRUE, "internal", ETK_TRUE, NULL);
combobox_entry->button = etk_widget_new(ETK_TOGGLE_BUTTON_TYPE,
"theme-group", "button", "theme-parent", combobox_entry,
- "visible", ETK_TRUE, "repeat-mouse-events", ETK_TRUE, "focusable",
ETK_FALSE, "internal", ETK_TRUE, NULL);
+ "visible", ETK_TRUE, "repeat-mouse-events", ETK_FALSE, "focusable",
ETK_FALSE, "internal", ETK_TRUE, NULL);
etk_object_data_set(ETK_OBJECT(combobox_entry->button),
"_Etk_Combobox_Entry_Button::Combobox_Entry", combobox_entry);
etk_widget_parent_set(combobox_entry->hbox, ETK_WIDGET(combobox_entry));
@@ -1295,8 +1296,12 @@
if (!(combobox_entry = ETK_COMBOBOX_ENTRY(data)))
return ETK_TRUE;
-
- etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(combobox_entry->button));
+ // dont pop up on whole widget, let toggle button (and on cursor up/down
inside entry part) handle this
+ //etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(combobox_entry->button));
+
+ /* NOTE:
+ * somehow this callback gets fired many times when popping up the popup
window
+ */
return ETK_TRUE;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
