From 29c56a53f6e31a073063c11fc89f148bdbfb1f14 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Sun, 30 Aug 2009 18:34:39 +0000 Subject: [PATCH] Now you can enlarge everything! SVN revision: 42113 --- data/themes/default.edc | 97 ++++++++++++++++++---------- src/modules/everything/e_mod_main.c | 4 +- src/modules/everything/e_mod_main.h | 7 +- src/modules/everything/evry.c | 43 ++++++++---- src/modules/everything/evry_config.c | 41 ++++++------ 5 files changed, 122 insertions(+), 70 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index 07fe0917a..c2555399e 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -26598,11 +26598,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); type: RECT; description { state: "default" 0.0; visible: 0; - min: 416 118; + min: 436 118; } description { state: "composite" 0.0; visible: 0; - min: 516 218; + min: 536 218; } } part { name: "frame"; @@ -26635,21 +26635,16 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } part { name: "bg"; description { state: "default" 0; - min: 416 118; - max: 416 118; - rel1 { - to: "frame"; - relative: 0.5 0.0; - } - rel2 { - to: "frame"; - relative: 0.5 1.0; - } image { normal: "bt_base2.png"; border: 7 7 5 5; } } + description { state: "composite" 0; + inherit: "default" 0.0; + rel1.offset: 50 50; + rel2.offset: -50 -51; + } } part { name: "border_bg"; mouse_events: 0; @@ -26683,8 +26678,6 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); type: RECT; clip_to: "clip"; description { state: "default" 0; - min: 600 110; - align: 0.0 0.0; color: 255 255 255 255; rel1 { offset: 8 5; @@ -26695,28 +26688,35 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); to: "bg"; } } - description { state: "wide" 0; - inherit: "default" 0.0; - align: 1.0 0.0; - } } part { name: "e.swallow.subject_selector"; type: SWALLOW; clip_to: "selector_frame"; description { state: "default" 0; rel1 { + relative: 0.0 0.0; offset: 0 2; to: "selector_frame"; } rel2 { - relative: 0 1; - offset: 199 -2; - to: "selector_frame"; + relative: 0.5 1.0; + offset: -1 -2; + to_y: "selector_frame"; } } description { state: "wide" 0; inherit: "default" 0.0; visible: 0; + rel1 { + relative: -0.5 0.0; + offset: 0 2; + to: "selector_frame"; + } + rel2 { + relative: -0.5 1.0; + offset: 0 -2; + to: "selector_frame"; + } } } part { name: "e.swallow.action_selector"; @@ -26724,15 +26724,27 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); clip_to: "selector_frame"; description { state: "default" 0; rel1 { - relative: 1 0; + relative: 0.5 0; offset: 0 2; - to_y: "selector_frame"; - to_x: "e.swallow.subject_selector"; + to: "selector_frame"; } rel2 { - offset: 199 -2; - to_y: "selector_frame"; - to_x: "e.swallow.subject_selector"; + relative: 1.0 1.0; + offset: -1 -2; + to: "selector_frame"; + } + } + description { state: "wide" 0; + inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: 0 2; + to: "selector_frame"; + } + rel2 { + relative: 0.5 1.0; + offset: -1 -2; + to: "selector_frame"; } } } @@ -26740,21 +26752,31 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); type: SWALLOW; clip_to: "selector_frame"; description { state: "default" 0; + visible: 0; rel1 { - relative: 1 0; + relative: 1.5 0.0; offset: 0 2; - to_y: "selector_frame"; - to_x: "e.swallow.action_selector"; + to: "selector_frame"; } rel2 { - offset: 199 -2; - to_y: "selector_frame"; - to_x: "e.swallow.action_selector"; + relative: 1.5 1.0; + offset: -1 -2; + to: "selector_frame"; } } description { state: "wide" 0; inherit: "default" 0.0; visible: 1; + rel1 { + relative: 0.5 0.0; + offset: 0 2; + to: "selector_frame"; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -2; + to: "selector_frame"; + } } } part { name: "over1"; @@ -26793,6 +26815,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); target: "selector_frame"; target: "e.swallow.object_selector"; target: "e.swallow.subject_selector"; + target: "e.swallow.action_selector"; } program { name: "object_selector_show"; signal: "e,state,object_selector_show"; @@ -26803,6 +26826,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); target: "selector_frame"; target: "e.swallow.object_selector"; target: "e.swallow.subject_selector"; + target: "e.swallow.action_selector"; } program { name: "composite_mode"; signal: "e,state,composited"; @@ -26811,6 +26835,7 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); target: "win"; target: "frame"; target: "shadow"; + target: "bg"; } } } @@ -27041,7 +27066,9 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); } /* offset to main popup */ data.item: "offset_y" "-2"; + data.item: "offset_x" "20"; data.item: "offset_composite_y" "-52"; + data.item: "offset_composite_x" "20"; data.item: "shaped" "1"; parts { @@ -27049,11 +27076,11 @@ MIMEBASE("application/x-font-bdf","icon_mime_font_generic.png", ".BDF", 128); type: RECT; description { state: "default" 0.0; visible: 0; - min: 380 255; + min: 400 255; } description { state: "composite" 0.0; visible: 0; - min: 480 305; + min: 500 305; } } part { name: "frame"; diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c index c05c46685..fae1ccae8 100644 --- a/src/modules/everything/e_mod_main.c +++ b/src/modules/everything/e_mod_main.c @@ -207,8 +207,8 @@ _config_init() evry_conf->version = CONFIG_VERSION; evry_conf->rel_x = 50.0; evry_conf->rel_y = 50.0; - evry_conf->width = 400; - evry_conf->height = 350; + evry_conf->width = 0; + evry_conf->height = 0; evry_conf->scroll_animate = 0; evry_conf->scroll_speed = 0.08; evry_conf->hide_input = 0; diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index f08411595..bc6dc703a 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -32,12 +32,15 @@ struct _Config int hide_list; int quick_nav; - + + const char *cmd_terminal; + + /* not saved data */ Eina_List *plugins; Eina_List *actions; Eina_List *views; - const char *cmd_terminal; + int min_w, min_h; }; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 163dfdc9c..cbbd9f2b9 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -147,7 +147,6 @@ evry_show(E_Zone *zone, const char *params) if (params) win->plugin_dedicated = EINA_TRUE; - _evry_selector_subjects_get(params); _evry_selector_activate(selectors[0]); @@ -441,11 +440,12 @@ evry_plugin_async_update(Evry_Plugin *p, int action) static Evry_List_Window * _evry_list_win_new(E_Zone *zone) { - int x, y, mw, mh; + int x, y, w, mw, mh; Evry_List_Window *list_win; E_Popup *popup; Evas_Object *o; const char *offset_y; + const char *offset_x; if (!evry_conf->views) return NULL; @@ -470,20 +470,30 @@ _evry_list_win_new(E_Zone *zone) edje_object_signal_emit(o, "e,state,composited", "e"); edje_object_message_signal_process(o); edje_object_calc_force(o); + offset_x = edje_object_data_get(o, "offset_composite_x"); offset_y = edje_object_data_get(o, "offset_composite_y"); } else - offset_y = edje_object_data_get(o, "offset_y"); - + { + offset_x = edje_object_data_get(o, "offset_x"); + offset_y = edje_object_data_get(o, "offset_y"); + } + edje_object_size_min_calc(o, &mw, &mh); - + if (mh == 0) mh = 200; if (mw == 0) mw = win->popup->w / 2; - x = (win->popup->x + win->popup->w / 2) - (mw / 2); + evry_conf->min_h = mh; + if (evry_conf->height > mh) + mh = evry_conf->height; + + /* x = (win->popup->x + win->popup->w / 2) - (mw / 2); */ + x = win->popup->x + (offset_x ? atoi(offset_x) : 0); y = (win->popup->y + win->popup->h) + (offset_y ? atoi(offset_y) : 0); - - e_popup_move_resize(popup, x, y, mw, mh); + + w = win->popup->w - (offset_x ? atoi(offset_x) : 0)*2; + e_popup_move_resize(popup, x, y, w, mh); o = list_win->o_main; evas_object_move(o, 0, 0); @@ -571,9 +581,14 @@ _evry_window_new(E_Zone *zone) edje_object_size_min_calc(o, &mw, &mh); + evry_conf->min_w = mw; + + if (evry_conf->width > mw) + mw = evry_conf->width; + x = (zone->w / 2) - (mw / 2); y = (zone->h / 2) - (mh / 2); - + e_popup_move_resize(popup, x, y, mw, mh); o = win->o_main; @@ -1264,9 +1279,15 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event) if ((len == 1) && (isspace(s->input[0])) && (_evry_view_toggle(s, s->input + 1))) - _evry_update(s, 0); + { + /* space at the beginning is trigger */ + _evry_update(s, 0); + } else if (isspace(*ev->compose)) - _evry_update(s, 0); + { + /* do not update matches on space */ + _evry_update(s, 0); + } else _evry_update(s, 1); } diff --git a/src/modules/everything/evry_config.c b/src/modules/everything/evry_config.c index ad99a433a..374ecf646 100644 --- a/src/modules/everything/evry_config.c +++ b/src/modules/everything/evry_config.c @@ -61,9 +61,9 @@ _fill_data(E_Config_Dialog_Data *cfdata) Eina_List *l; Evry_Plugin *p; - /* cfdata->scroll_animate = evry_conf->scroll_animate; - * cfdata->height = evry_conf->height; - * cfdata->width = evry_conf->width; */ + /* cfdata->scroll_animate = evry_conf->scroll_animate; */ + cfdata->height = evry_conf->height; + cfdata->width = evry_conf->width; cfdata->hide_list = evry_conf->hide_list; cfdata->hide_input = evry_conf->hide_input; cfdata->quick_nav = evry_conf->quick_nav; @@ -111,9 +111,9 @@ _evry_cb_plugin_sort(const void *data1, const void *data2) static int _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { - /* evry_conf->width = cfdata->width; - * evry_conf->height = cfdata->height; - * evry_conf->scroll_animate = cfdata->scroll_animate; */ + /* evry_conf->scroll_animate = cfdata->scroll_animate; */ + evry_conf->width = cfdata->width; + evry_conf->height = cfdata->height; evry_conf->hide_input = cfdata->hide_input; evry_conf->hide_list = cfdata->hide_list; evry_conf->quick_nav = cfdata->quick_nav; @@ -227,20 +227,21 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial e_widget_list_object_append(o, of, 1, 1, 0.5); - /* ob = e_widget_label_add(evas, _("Popup Width")); - * e_widget_framelist_object_append(of, ob); - * ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), - * 300, 800, 5, 0, NULL, - * &(cfdata->width), 200); - * e_widget_framelist_object_append(of, ob); - * - * ob = e_widget_label_add(evas, _("Popup Height")); - * e_widget_framelist_object_append(of, ob); - * ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), - * 200, 800, 5, 0, NULL, - * &(cfdata->height), 200); - * e_widget_framelist_object_append(of, ob); - * e_widget_list_object_append(o, of, 1, 1, 0.5); */ + of = e_widget_framelist_add(evas, _("Size"), 0); + ob = e_widget_label_add(evas, _("Popup Width")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), + evry_conf->min_w, 800, 5, 0, NULL, + &(cfdata->width), 200); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_label_add(evas, _("Popup Height")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), + evry_conf->min_h, 800, 5, 0, NULL, + &(cfdata->height), 200); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.5); /* of = e_widget_framelist_add(evas, _("Scroll Settings"), 0); * ob = e_widget_check_add(evas, _("Scroll Animate"),