From d746a787b29ecc7408da0359bf4ba9c967f76355 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 20 Feb 2001 18:32:09 +0000 Subject: [PATCH] selection box there now only when icon selected... :) SVN revision: 4269 --- .../default/selections/file.bits.db | Bin 159744 -> 159744 bytes src/icons.c | 64 +++++++++--------- src/view.c | 9 +++ 3 files changed, 41 insertions(+), 32 deletions(-) diff --git a/data/config/appearance/default/selections/file.bits.db b/data/config/appearance/default/selections/file.bits.db index c25108c6457e4e5932ab1d5df69e2711214652a3..0b065b0b32380bc310f82a254768b5e2c70709e8 100644 GIT binary patch delta 298 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 diff --git a/src/icons.c b/src/icons.c index 9c5b04c88..ed8da7a25 100644 --- a/src/icons.c +++ b/src/icons.c @@ -201,20 +201,22 @@ e_icon_update(E_Icon *icon) { icon->current.icon = icon->info.icon.normal; } - if (((icon->current.icon) && (icon->previous.icon) && - (strcmp(icon->current.icon, icon->previous.icon))) || - (!icon->current.icon) || (!icon->previous.icon)) + if ((!icon->current.state.selected) && (icon->obj.sel_icon)) { - if (icon->obj.icon) - { - int iw, ih; - - evas_set_image_file(icon->view->evas, icon->obj.icon, icon->current.icon); - evas_get_image_size(icon->view->evas, icon->obj.icon, &iw, &ih); - evas_set_image_fill(icon->view->evas, icon->obj.icon, 0, 0, iw, ih); - evas_resize(icon->view->evas, icon->obj.icon, iw, ih); - icon->previous.x = icon->current.x - 1; - } + printf("no\n"); + ebits_hide(icon->obj.sel_icon); + ebits_free(icon->obj.sel_icon); + icon->obj.sel_icon = NULL; + } + if (icon->obj.icon) + { + int iw, ih; + + evas_set_image_file(icon->view->evas, icon->obj.icon, icon->current.icon); + evas_get_image_size(icon->view->evas, icon->obj.icon, &iw, &ih); + evas_set_image_fill(icon->view->evas, icon->obj.icon, 0, 0, iw, ih); + evas_resize(icon->view->evas, icon->obj.icon, iw, ih); + icon->previous.x = icon->current.x - 1; } if (!icon->obj.filename) { @@ -232,7 +234,7 @@ e_icon_update(E_Icon *icon) icon->previous.visible = icon->current.visible - 1; obj_new = 1; } - if (!icon->obj.sel_icon) + if ((!icon->obj.sel_icon) && (icon->current.state.selected)) { icon->obj.sel_icon = ebits_load(PACKAGE_DATA_DIR"/data/config/appearance/default/selections/file.bits.db"); if (icon->obj.sel_icon) @@ -240,6 +242,7 @@ e_icon_update(E_Icon *icon) ebits_add_to_evas(icon->obj.sel_icon, icon->view->evas); ebits_set_layer(icon->obj.sel_icon, 9); ebits_set_color_class(icon->obj.sel_icon, "Selected BG", 100, 200, 255, 255); + obj_new = 1; } } if (obj_new) @@ -282,25 +285,22 @@ e_icon_update(E_Icon *icon) } } - if (icon->current.visible != icon->previous.visible) + if (icon->current.visible) { - if (icon->current.visible) - { - evas_show(icon->view->evas, icon->obj.icon); - evas_show(icon->view->evas, icon->obj.filename); - evas_show(icon->view->evas, icon->obj.sel1); - evas_show(icon->view->evas, icon->obj.sel2); - ebits_show(icon->obj.sel_icon); - } - else - { - evas_hide(icon->view->evas, icon->obj.icon); - evas_hide(icon->view->evas, icon->obj.filename); - evas_hide(icon->view->evas, icon->obj.sel1); - evas_hide(icon->view->evas, icon->obj.sel2); - ebits_hide(icon->obj.sel_icon); - } + evas_show(icon->view->evas, icon->obj.icon); + evas_show(icon->view->evas, icon->obj.filename); + evas_show(icon->view->evas, icon->obj.sel1); + evas_show(icon->view->evas, icon->obj.sel2); + if (icon->obj.sel_icon) ebits_show(icon->obj.sel_icon); } - + else + { + evas_hide(icon->view->evas, icon->obj.icon); + evas_hide(icon->view->evas, icon->obj.filename); + evas_hide(icon->view->evas, icon->obj.sel1); + evas_hide(icon->view->evas, icon->obj.sel2); + if (icon->obj.sel_icon) ebits_hide(icon->obj.sel_icon); + } + icon->previous = icon->current; icon->changed = 0; } diff --git a/src/view.c b/src/view.c index 0a57eced7..e18356b49 100644 --- a/src/view.c +++ b/src/view.c @@ -598,9 +598,18 @@ e_view_handle_fs(EfsdEvent *ev) icon->info.icon.clicked = strdup(PACKAGE_DATA_DIR"/data/icons/file/default.db:/icon/clicked"); } icon->changed = 1; + icon->view->changed = 1; } } break; + case EFSD_CMD_READLINK: + printf("Readlink event %i\n", + ev->efsd_reply_event.command.efsd_file_cmd.id); + if (ev->efsd_reply_event.status == SUCCESS) + { + printf("target is %s\n", (char*)ev->efsd_reply_event.data); + } + break; case EFSD_CMD_CLOSE: break; case EFSD_CMD_SETMETA: