Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_filedialog.c ewl_filedialog.h
Log Message:
- fix the initial menu placement
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_filedialog.c 26 Apr 2006 03:18:10 -0000 1.24
+++ ewl_filedialog.c 23 May 2006 20:17:01 -0000 1.25
@@ -101,15 +101,8 @@
ewl_dialog_has_separator_set(EWL_DIALOG(fd), FALSE);
ewl_widget_hide(EWL_DIALOG(fd)->action_area);
- fd->menu_float = ewl_floater_new();
- ewl_container_child_append(EWL_CONTAINER(fd), fd->menu_float);
- ewl_object_fill_policy_set(EWL_OBJECT(fd->menu_float),
- EWL_FLAG_FILL_FILL);
- ewl_widget_internal_set(EWL_WIDGET(fd->menu_float), TRUE);
-
fd->menu = ewl_menu_new();
ewl_button_label_set(EWL_BUTTON(fd->menu), " ");
- ewl_container_child_append(EWL_CONTAINER(fd->menu_float), fd->menu);
ewl_widget_show(fd->menu);
menu = ewl_menu_new();
@@ -118,24 +111,24 @@
ewl_widget_show(menu);
o = ewl_menu_item_new();
- ewl_button_label_set(EWL_BUTTON(o), "Column view");
+ ewl_button_label_set(EWL_BUTTON(o), "Icon view");
ewl_container_child_append(EWL_CONTAINER(menu), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_filedialog_cb_column_view, fd);
+ ewl_filedialog_cb_icon_view, fd);
ewl_widget_show(o);
o = ewl_menu_item_new();
- ewl_button_label_set(EWL_BUTTON(o), "Icon view");
+ ewl_button_label_set(EWL_BUTTON(o), "List view");
ewl_container_child_append(EWL_CONTAINER(menu), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_filedialog_cb_icon_view, fd);
+ ewl_filedialog_cb_list_view, fd);
ewl_widget_show(o);
o = ewl_menu_item_new();
- ewl_button_label_set(EWL_BUTTON(o), "List view");
+ ewl_button_label_set(EWL_BUTTON(o), "Column view");
ewl_container_child_append(EWL_CONTAINER(menu), o);
ewl_callback_append(o, EWL_CALLBACK_CLICKED,
- ewl_filedialog_cb_list_view, fd);
+ ewl_filedialog_cb_column_view, fd);
ewl_widget_show(o);
o = ewl_menu_item_new();
@@ -483,13 +476,21 @@
if (event->button == 3)
{
- ewl_floater_position_set(EWL_FLOATER(fd->menu_float),
- event->x, event->y);
- ewl_widget_show(fd->menu_float);
+ Ewl_Menu *menu;
+ Ewl_Embed *emb;
+ int x, y;
+
+ emb = ewl_embed_widget_find(w);
+ ewl_embed_window_position_get(emb, &x, &y);
+
+ menu = EWL_MENU(fd->menu);
+ ewl_window_move(EWL_WINDOW(menu->base.popup),
+ x + event->x, y + event->y);
+ ewl_widget_show(fd->menu);
ewl_callback_call(EWL_WIDGET(fd->menu),
EWL_CALLBACK_FOCUS_IN);
- ewl_object_state_remove(EWL_OBJECT(fd->menu_float),
+ ewl_object_state_remove(EWL_OBJECT(fd->menu),
EWL_FLAG_STATE_PRESSED);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_filedialog.h 12 Apr 2006 00:29:04 -0000 1.14
+++ ewl_filedialog.h 23 May 2006 20:17:01 -0000 1.15
@@ -37,7 +37,6 @@
{
Ewl_Dialog dialog; /**< The dialog base class */
Ewl_Widget *fp; /**< Ewl_Filepicker */
- Ewl_Widget *menu_float; /**< Floater to hold the menu */
Ewl_Widget *menu; /**< The menu */
};
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
