Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_iconbox.c etk_popup_window.c
Log Message:
* [Etk_Iconbox] The steps of the scrolled-view is now adapted to the size of
the model's cell.
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_iconbox.c 6 Oct 2006 17:04:14 -0000 1.17
+++ etk_iconbox.c 8 Oct 2006 10:30:05 -0000 1.18
@@ -212,6 +212,11 @@
return;
iconbox->current_model = model;
+
etk_range_increments_set(etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)),
+ model->width * 0.75, model->width * 3.0);
+
etk_range_increments_set(etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)),
+ model->height * 0.75, model->height * 3.0);
+
etk_signal_emit_by_name("scroll_size_changed", ETK_OBJECT(iconbox->grid),
NULL);
etk_widget_redraw_queue(iconbox->grid);
}
@@ -824,7 +829,8 @@
etk_widget_show(iconbox->grid);
iconbox->models = NULL;
- iconbox->current_model = etk_iconbox_model_new(iconbox);
+ iconbox->current_model = NULL;
+ etk_iconbox_current_model_set(iconbox, etk_iconbox_model_new(iconbox));
iconbox->num_icons = 0;
iconbox->first_icon = NULL;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_popup_window.c 8 Oct 2006 10:04:54 -0000 1.16
+++ etk_popup_window.c 8 Oct 2006 10:30:05 -0000 1.17
@@ -373,8 +373,6 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_down.timestamp < _etk_popup_window_popup_timestamp)
- return;
evas_event_feed_key_down(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_down.keyname,
event_info.key_down.key, event_info.key_down.string, NULL,
event_info.key_down.timestamp, NULL);
@@ -386,8 +384,6 @@
{
if (!_etk_popup_window_focused_window)
return;
- if (event_info.key_up.timestamp < _etk_popup_window_popup_timestamp)
- return;
evas_event_feed_key_up(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas,
event_info.key_up.keyname,
event_info.key_up.key, event_info.key_up.string, NULL,
event_info.key_up.timestamp, NULL);
@@ -400,9 +396,6 @@
Etk_Popup_Window *pop;
int px, py;
- /*if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp)
- return;*/
-
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
{
@@ -422,12 +415,6 @@
Etk_Popup_Window *pop;
Etk_Bool pointer_over_window = ETK_FALSE;
- if (event_info.mouse_up.timestamp < _etk_popup_window_popup_timestamp)
- {
- printf("Up Timestamps: %d %d\n", event_info.mouse_up.timestamp,
_etk_popup_window_popup_timestamp);
- return;
- }
-
/* If the user clicks on a popped window, we feed the event */
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
for ( ; pop; pop = pop->popped_child)
@@ -445,7 +432,7 @@
}
/* Otherwise, we pop down the popup windows */
- if (!pointer_over_window
+ if (!pointer_over_window && event_info.mouse_up.timestamp >=
_etk_popup_window_popup_timestamp
&& (event_info.mouse_up.timestamp - _etk_popup_window_popup_timestamp)
>= ETK_POPUP_WINDOW_MIN_POP_TIME)
{
pop =
ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents)));
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
